diff --git a/nix/os/devices/sj-srv1/boot.nix b/nix/os/devices/sj-srv1/boot.nix deleted file mode 100644 index 974f788..0000000 --- a/nix/os/devices/sj-srv1/boot.nix +++ /dev/null @@ -1 +0,0 @@ -_: { boot.extraModulePackages = [ ]; } diff --git a/nix/os/devices/sj-srv1/configuration.nix b/nix/os/devices/sj-srv1/configuration.nix index 9f49bd1..5184bd1 100644 --- a/nix/os/devices/sj-srv1/configuration.nix +++ b/nix/os/devices/sj-srv1/configuration.nix @@ -17,10 +17,7 @@ }; } - ../../modules/opinionatedDisk.nix - ./system.nix ./hw.nix - ./boot.nix ]; } diff --git a/nix/os/devices/sj-srv1/hw.nix b/nix/os/devices/sj-srv1/hw.nix index 328266b..ca9158b 100644 --- a/nix/os/devices/sj-srv1/hw.nix +++ b/nix/os/devices/sj-srv1/hw.nix @@ -41,6 +41,9 @@ let ]; in { + imports = [ + ../../modules/opinionatedDisk.nix + ]; hardware.opinionatedDisk = { enable = true; encrypted = false;