diff --git a/profiles/homebox/config.nix b/profiles/homebox/config.nix index dc11909..f317651 100644 --- a/profiles/homebox/config.nix +++ b/profiles/homebox/config.nix @@ -3,8 +3,9 @@ flake.nixosConfigurations."homebox" = inputs.nixpkgs.lib.nixosSystem { modules = [ - self.nixosModules.homebox self.nixosModules.default + self.nixosModules.homebox + self.diskoConfigurations.homebox ]; }; @@ -12,11 +13,6 @@ { - imports = [ # Include the results of the hardware scan. - - (import ./disko.nix { device1 = "/dev/nvme0n1"; device2 = "/dev/nvme1n1"; device3 = "/dev/sda"; }) - ]; - config = { services = { diff --git a/profiles/homebox/disko.nix b/profiles/homebox/disko.nix index 2f8d5ba..92a22fd 100644 --- a/profiles/homebox/disko.nix +++ b/profiles/homebox/disko.nix @@ -1,15 +1,10 @@ { ... }: { flake.diskoConfigurations.homebox = { - device1 ? throw "Set this to your disk device, e.g. /dev/sda", - device2, - device3, - ... - }: { disko.devices = { disk = { main = { - device = device1; + device = "/dev/nvme0n1"; type = "disk"; content = { type = "gpt"; @@ -48,7 +43,7 @@ }; }; ssd1 = { - device = device2; + device = "/dev/nvme1n1"; type = "disk"; content = { type = "gpt"; @@ -65,7 +60,7 @@ }; }; hdd1 = { - device = device3; + device = "/dev/sda"; type = "disk"; content = { type = "gpt";