Refactor inputs for external modules

This commit is contained in:
Oliver Davies 2025-04-03 22:43:12 +01:00
parent 5a50cb5c93
commit 88284829ec
2 changed files with 25 additions and 19 deletions

View file

@ -23,7 +23,14 @@
}; };
outputs = outputs =
{ nixpkgs, self, ... }@inputs: {
agenix,
disko,
nixos-hardware,
nixpkgs,
self,
...
}@inputs:
let let
inherit (self) outputs; inherit (self) outputs;
@ -67,7 +74,12 @@
}; };
modules = [ modules = [
inputs.agenix.nixosModules.default agenix.nixosModules.default
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-gpu-intel
nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-hdd
nixos-hardware.nixosModules.system76
./hosts/lemp11/configuration.nix ./hosts/lemp11/configuration.nix
]; ];
@ -81,7 +93,7 @@
}; };
modules = [ modules = [
inputs.agenix.nixosModules.default agenix.nixosModules.default
./hosts/nixedo/configuration.nix ./hosts/nixedo/configuration.nix
]; ];
@ -94,9 +106,9 @@
}; };
modules = [ modules = [
inputs.agenix.nixosModules.default agenix.nixosModules.default
inputs.nixos-hardware.nixosModules.common-gpu-intel nixos-hardware.nixosModules.common-gpu-intel
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480 nixos-hardware.nixosModules.lenovo-thinkpad-t480
./hosts/t480/configuration.nix ./hosts/t480/configuration.nix
]; ];
@ -109,9 +121,9 @@
}; };
modules = [ modules = [
inputs.agenix.nixosModules.default agenix.nixosModules.default
inputs.nixos-hardware.nixosModules.common-gpu-intel nixos-hardware.nixosModules.common-gpu-intel
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t490 nixos-hardware.nixosModules.lenovo-thinkpad-t490
./hosts/t490/configuration.nix ./hosts/t490/configuration.nix
]; ];
@ -127,8 +139,8 @@
}; };
modules = [ modules = [
inputs.agenix.nixosModules.default agenix.nixosModules.default
inputs.disko.nixosModules.disko disko.nixosModules.disko
inputs.nixos-wsl.nixosModules.default inputs.nixos-wsl.nixosModules.default
./hosts/PW05CH3L/configuration.nix ./hosts/PW05CH3L/configuration.nix
@ -143,8 +155,8 @@
}; };
modules = [ modules = [
inputs.agenix.nixosModules.default agenix.nixosModules.default
inputs.disko.nixosModules.disko disko.nixosModules.disko
./hosts/hetznix/configuration.nix ./hosts/hetznix/configuration.nix
]; ];

View file

@ -2,12 +2,6 @@
{ {
imports = [ imports = [
inputs.nixos-hardware.nixosModules.common-cpu-intel
inputs.nixos-hardware.nixosModules.common-gpu-intel
inputs.nixos-hardware.nixosModules.common-pc-laptop
inputs.nixos-hardware.nixosModules.common-pc-laptop-hdd
inputs.nixos-hardware.nixosModules.system76
./hardware-configuration.nix ./hardware-configuration.nix
./hardware.nix ./hardware.nix
./programs.nix ./programs.nix