style: Re-apply style normalisation

Originally this was manually applied with;

```sh
nixpkgs-fmt **.nix && statix fix
```

but I overlooked the fact that `**.nix` would only expand to files in
the root (I should have used `**/*.nix`).

Previous commit adds `nix fmt` support which passes `.` to `nixpkgs-fmt`
(if no other path is explicitly specified when running `nix fmt`).

This commit includes the changes made by running `nix fmt`.
This commit is contained in:
Chris Scutcher 2023-02-07 15:56:08 +00:00
parent a393654c3b
commit ff5127ea0a
No known key found for this signature in database
GPG key ID: 19C0BED130CD39CE
12 changed files with 40 additions and 35 deletions

View file

@ -13,7 +13,7 @@
start = "0"; start = "0";
end = "1M"; end = "1M";
part-type = "primary"; part-type = "primary";
flags = ["bios_grub"]; flags = [ "bios_grub" ];
} }
{ {
type = "partition"; type = "partition";
@ -53,7 +53,7 @@
start = "0"; start = "0";
end = "1M"; end = "1M";
part-type = "primary"; part-type = "primary";
flags = ["bios_grub"]; flags = [ "bios_grub" ];
} }
{ {
type = "partition"; type = "partition";

View file

@ -35,12 +35,12 @@
}; };
# Mountpoints inferred from subvolume name # Mountpoints inferred from subvolume name
"/home" = { "/home" = {
mountOptions = ["compress=zstd"]; mountOptions = [ "compress=zstd" ];
}; };
"/nix" = { "/nix" = {
mountOptions = ["compress=zstd" "noatime"]; mountOptions = [ "compress=zstd" "noatime" ];
}; };
"/test" = {}; "/test" = { };
}; };
}; };
} }

View file

@ -51,7 +51,7 @@
part-type = "primary"; part-type = "primary";
start = "1024MiB"; start = "1024MiB";
end = "100%"; end = "100%";
flags = ["bios_grub"]; flags = [ "bios_grub" ];
content = { content = {
type = "luks"; type = "luks";
name = "crypted"; name = "crypted";

View file

@ -14,7 +14,7 @@
start = "0"; start = "0";
end = "1M"; end = "1M";
part-type = "primary"; part-type = "primary";
flags = ["bios_grub"]; flags = [ "bios_grub" ];
} }
{ {
name = "root"; name = "root";

View file

@ -13,7 +13,7 @@
type = "partition"; type = "partition";
start = "0"; start = "0";
end = "1M"; end = "1M";
flags = ["bios_grub"]; flags = [ "bios_grub" ];
} }
{ {
type = "partition"; type = "partition";

View file

@ -13,7 +13,7 @@
start = "0"; start = "0";
end = "1M"; end = "1M";
part-type = "primary"; part-type = "primary";
flags = ["bios_grub"]; flags = [ "bios_grub" ];
} }
{ {
type = "partition"; type = "partition";
@ -41,7 +41,7 @@
start = "0"; start = "0";
end = "1M"; end = "1M";
part-type = "primary"; part-type = "primary";
flags = ["bios_grub"]; flags = [ "bios_grub" ];
} }
{ {
type = "partition"; type = "partition";

View file

@ -1,8 +1,8 @@
{ { pkgs
pkgs, , lib
lib, , ...
... }:
}: let let
# We just import from the repository for testing here: # We just import from the repository for testing here:
disko = import ../../. { disko = import ../../. {
inherit lib; inherit lib;
@ -41,7 +41,8 @@
}; };
}; };
}; };
in { in
{
imports = [ imports = [
(disko.config cfg) (disko.config cfg)
]; ];

View file

@ -13,7 +13,7 @@
start = "0"; start = "0";
end = "1M"; end = "1M";
part-type = "primary"; part-type = "primary";
flags = ["bios_grub"]; flags = [ "bios_grub" ];
} }
{ {
name = "root"; name = "root";

View file

@ -2,7 +2,7 @@
, makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest , makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
}: }:
let let
linux-bcachefs = pkgs.callPackage ../linux-testing-bcachefs.nix {}; linux-bcachefs = pkgs.callPackage ../linux-testing-bcachefs.nix { };
in in
makeDiskoTest { makeDiskoTest {
disko-config = ../example/bcachefs.nix; disko-config = ../example/bcachefs.nix;
@ -14,11 +14,13 @@ makeDiskoTest {
extraConfig = { extraConfig = {
boot.supportedFilesystems = [ "bcachefs" ]; boot.supportedFilesystems = [ "bcachefs" ];
# disable zfs so we can support latest kernel # disable zfs so we can support latest kernel
nixpkgs.overlays = [(final: super: { nixpkgs.overlays = [
zfs = super.zfs.overrideAttrs(_: { (final: super: {
meta.platforms = []; zfs = super.zfs.overrideAttrs (_: {
meta.platforms = [ ];
}); });
})]; })
];
boot.kernelPackages = pkgs.lib.mkForce (pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux-bcachefs)); boot.kernelPackages = pkgs.lib.mkForce (pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux-bcachefs));
}; };
} }

View file

@ -6,9 +6,11 @@ let
lib = pkgs.lib; lib = pkgs.lib;
makeDiskoTest = (pkgs.callPackage ./lib.nix { inherit makeTest eval-config; }).makeDiskoTest; makeDiskoTest = (pkgs.callPackage ./lib.nix { inherit makeTest eval-config; }).makeDiskoTest;
evalTest = name: configFile: let evalTest = name: configFile:
let
disko-config = import configFile; disko-config = import configFile;
in { in
{
"${name}-tsp-create" = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create disko-config); "${name}-tsp-create" = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create disko-config);
"${name}-tsp-mount" = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount disko-config); "${name}-tsp-mount" = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount disko-config);
}; };

View file

@ -100,7 +100,7 @@
documentation.enable = false; documentation.enable = false;
nix.settings = { nix.settings = {
substituters = lib.mkForce []; substituters = lib.mkForce [ ];
hashed-mirrors = null; hashed-mirrors = null;
connect-timeout = 1; connect-timeout = 1;
}; };