From ce8d4e4208f9241ba24432dca95179edbc18a608 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sat, 3 May 2025 20:38:40 +0200 Subject: [PATCH] Revert "Import disko module in disko.nix files" This reverts commit 0847d834d019ca73aec916667c9c1443e95ec1d0. --- hosts/alto/disko.nix | 3 --- hosts/alto/hardware.nix | 7 +++++-- hosts/fern/disko.nix | 3 --- hosts/fern/hardware.nix | 5 ++++- hosts/north/disko.nix | 3 --- hosts/north/hardware.nix | 5 ++++- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hosts/alto/disko.nix b/hosts/alto/disko.nix index 6d03018..56221a9 100644 --- a/hosts/alto/disko.nix +++ b/hosts/alto/disko.nix @@ -1,7 +1,4 @@ -{ 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 b4dc092..8539219 100644 --- a/hosts/alto/hardware.nix +++ b/hosts/alto/hardware.nix @@ -1,6 +1,9 @@ -{ modulesPath, ... }: +{ modulesPath, inputs, ... }: { - imports = [ "${modulesPath}/profiles/qemu-guest.nix" ]; + imports = [ + inputs.disko.nixosModules.default + "${modulesPath}/profiles/qemu-guest.nix" + ]; nixpkgs.hostPlatform = "x86_64-linux"; diff --git a/hosts/fern/disko.nix b/hosts/fern/disko.nix index ed70991..4a0923f 100644 --- a/hosts/fern/disko.nix +++ b/hosts/fern/disko.nix @@ -1,7 +1,4 @@ -{ 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 d451f07..bfbdd8f 100644 --- a/hosts/fern/hardware.nix +++ b/hosts/fern/hardware.nix @@ -1,6 +1,9 @@ { inputs, ... }: { - imports = [ inputs.nixos-hardware.nixosModules.framework-13-7040-amd ]; + imports = [ + inputs.disko.nixosModules.default + 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 6b23be8..4eafc11 100644 --- a/hosts/north/disko.nix +++ b/hosts/north/disko.nix @@ -1,7 +1,4 @@ -{ 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 f6d5071..c70c23b 100644 --- a/hosts/north/hardware.nix +++ b/hosts/north/hardware.nix @@ -1,4 +1,7 @@ -_: { +{ inputs, ... }: +{ + imports = [ inputs.disko.nixosModules.default ]; + nixpkgs.hostPlatform = "x86_64-linux"; hardware = {