Refactor inputs
All checks were successful
/ check (push) Successful in 1m11s

Move them to each host's configuration.nix file and keep flake.nix
shorter and cleaner.
This commit is contained in:
Oliver Davies 2025-06-01 00:32:00 +01:00
parent 3437a7479a
commit 22264fb82e
6 changed files with 28 additions and 33 deletions

View file

@ -23,14 +23,7 @@
}; };
outputs = outputs =
{ { nixpkgs, self, ... }@inputs:
agenix,
disko,
nixos-hardware,
nixpkgs,
self,
...
}@inputs:
let let
inherit (self) outputs; inherit (self) outputs;
@ -81,13 +74,6 @@
}; };
modules = [ modules = [
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
]; ];
}; };
@ -99,8 +85,6 @@
}; };
modules = [ modules = [
agenix.nixosModules.default
./hosts/nixedo/configuration.nix ./hosts/nixedo/configuration.nix
]; ];
}; };
@ -112,10 +96,6 @@
}; };
modules = [ modules = [
agenix.nixosModules.default
nixos-hardware.nixosModules.common-gpu-intel
nixos-hardware.nixosModules.lenovo-thinkpad-t480
./hosts/t480/configuration.nix ./hosts/t480/configuration.nix
]; ];
}; };
@ -127,10 +107,6 @@
}; };
modules = [ modules = [
agenix.nixosModules.default
nixos-hardware.nixosModules.common-gpu-intel
nixos-hardware.nixosModules.lenovo-thinkpad-t490
./hosts/t490/configuration.nix ./hosts/t490/configuration.nix
]; ];
}; };
@ -144,10 +120,6 @@
}; };
modules = [ modules = [
agenix.nixosModules.default
disko.nixosModules.disko
inputs.nixos-wsl.nixosModules.default
./hosts/PW05CH3L/configuration.nix ./hosts/PW05CH3L/configuration.nix
]; ];
}; };

View file

@ -1,7 +1,11 @@
{ pkgs, ... }: { inputs, pkgs, ... }:
{ {
imports = [ imports = [
inputs.agenix.nixosModules.default
inputs.disko.nixosModules.disko
inputs.nixos-wsl.nixosModules.default
../common ../common
../../users/opdavies.nix ../../users/opdavies.nix

View file

@ -1,7 +1,14 @@
{ pkgs, ... }: { inputs, pkgs, ... }:
{ {
imports = [ imports = [
inputs.agenix.nixosModules.default
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
../common ../common
./hardware-configuration.nix ./hardware-configuration.nix
./programs.nix ./programs.nix

View file

@ -2,10 +2,12 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ pkgs, ... }: { inputs, pkgs, ... }:
{ {
imports = [ imports = [
inputs.agenix.nixosModules.default
../common ../common
./hardware-configuration.nix ./hardware-configuration.nix
./homelab.nix ./homelab.nix

View file

@ -1,7 +1,11 @@
{ pkgs, ... }: { inputs, pkgs, ... }:
{ {
imports = [ imports = [
inputs.agenix.nixosModules.default
inputs.nixos-hardware.nixosModules.common-gpu-intel
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480
../common ../common
./hardware-configuration.nix ./hardware-configuration.nix

View file

@ -1,5 +1,11 @@
{ inputs, ... }:
{ {
imports = [ imports = [
inputs.agenix.nixosModules.default
inputs.nixos-hardware.nixosModules.common-gpu-intel
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t490
../common ../common
./hardware-configuration.nix ./hardware-configuration.nix