diff --git a/hosts/alto/disko.nix b/hosts/alto/disko.nix index 56221a9..6d03018 100644 --- a/hosts/alto/disko.nix +++ b/hosts/alto/disko.nix @@ -1,4 +1,7 @@ +{ inputs, ... }: { + imports = [ inputs.disko.nixosModules.default ]; + disko.devices = { disk.disk1 = { device = "/dev/vda"; diff --git a/hosts/alto/hardware.nix b/hosts/alto/hardware.nix index 8539219..b4dc092 100644 --- a/hosts/alto/hardware.nix +++ b/hosts/alto/hardware.nix @@ -1,9 +1,6 @@ -{ modulesPath, inputs, ... }: +{ modulesPath, ... }: { - imports = [ - inputs.disko.nixosModules.default - "${modulesPath}/profiles/qemu-guest.nix" - ]; + imports = [ "${modulesPath}/profiles/qemu-guest.nix" ]; nixpkgs.hostPlatform = "x86_64-linux"; diff --git a/hosts/fern/disko.nix b/hosts/fern/disko.nix index 4a0923f..ed70991 100644 --- a/hosts/fern/disko.nix +++ b/hosts/fern/disko.nix @@ -1,4 +1,7 @@ +{ inputs, ... }: { + imports = [ inputs.disko.nixosModules.default ]; + disko.devices = { disk.main = { type = "disk"; diff --git a/hosts/fern/hardware.nix b/hosts/fern/hardware.nix index bfbdd8f..d451f07 100644 --- a/hosts/fern/hardware.nix +++ b/hosts/fern/hardware.nix @@ -1,9 +1,6 @@ { inputs, ... }: { - imports = [ - inputs.disko.nixosModules.default - inputs.nixos-hardware.nixosModules.framework-13-7040-amd - ]; + imports = [ inputs.nixos-hardware.nixosModules.framework-13-7040-amd ]; nixpkgs.hostPlatform = "x86_64-linux"; diff --git a/hosts/north/disko.nix b/hosts/north/disko.nix index 4eafc11..6b23be8 100644 --- a/hosts/north/disko.nix +++ b/hosts/north/disko.nix @@ -1,4 +1,7 @@ +{ inputs, ... }: { + imports = [ inputs.disko.nixosModules.default ]; + disko.devices = { disk.main = { type = "disk"; diff --git a/hosts/north/hardware.nix b/hosts/north/hardware.nix index c70c23b..a119e70 100644 --- a/hosts/north/hardware.nix +++ b/hosts/north/hardware.nix @@ -1,7 +1,4 @@ -{ inputs, ... }: { - imports = [ inputs.disko.nixosModules.default ]; - nixpkgs.hostPlatform = "x86_64-linux"; hardware = {