pederbs/config
pederbs
/
config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

move hardware definitions to flake

This commit is contained in:
Peder Bergebakken Sundt 2024-01-11 01:29:12 +01:00
parent dd6e3a903b
commit b3d24c9b2f
5 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flake.nix
View File

@ -187,20 +187,19 @@
ls = imports: { inherit imports; }; ls = imports: { inherit imports; };
hw = nixos-hardware.nixosModules; hw = nixos-hardware.nixosModules;
amd = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-amd ]; amd = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-amd ];
intel = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-intel ]; intel = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-intel ./hardware/gpu/intel.nix ];
intel-novga = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-intel-cpu-only ]; intel-novga = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-intel-cpu-only ];
sandy = hw.common-cpu-intel-sandy-bridge; cuda = ls [ ./hardware/gpu/cuda.nix hw.common-gpu-nvidia-nonprime ];
cuda = hw.common-gpu-nvidia-nonprime; cuda-prime = ls [ ./hardware/gpu/cuda.nix hw.common-gpu-nvidia ];
cuda-prime = hw.common-gpu-nvidia; rocm = ls [ ./hardware/gpu/rocm.nix hw.common-gpu-amd ];
rocm = hw.common-gpu-amd;
hidpi = hw.common-hidpi; hidpi = hw.common-hidpi;
p1005 = ./hardware/printer/hp-laserjet-p1005.nix;
in { in {
# TODO: move nixos-hardware imports to the nixos configs?
#attrpath "hostname" "domain" "system" inputs "state" [ modules ... ] #attrpath "hostname" "domain" "system" inputs "state" [ modules ... ]
noximilien = mk "noximilien" "pbsds.net" "x86_64-linux" inputs-2311 "22.11" [ intel ]; noximilien = mk "noximilien" "pbsds.net" "x86_64-linux" inputs-2311 "22.11" [ intel ];
brumlebasse = mk "brumlebasse" "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ amd ]; brumlebasse = mk "brumlebasse" "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ amd ];
nord = mk "nord" "pbsds.net" "x86_64-linux" inputs-2305 "22.11" [ intel-novga sandy rocm hidpi ]; nord = mk "nord" "pbsds.net" "x86_64-linux" inputs-2305 "22.11" [ intel-novga hw.common-cpu-intel-sandy-bridge rocm hidpi ];
sopp = mk "sopp" "pbsds.net" "x86_64-linux" inputs-2305 "23.05" [ intel cuda ]; sopp = mk "sopp" "pbsds.net" "x86_64-linux" inputs-2305 "23.05" [ intel cuda p1005 ];
bolle = mk "bolle" "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel ]; bolle = mk "bolle" "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel ];
eple = mk "eple" "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel ]; eple = mk "eple" "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel ];
garp = mk "garp" "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel-novga cuda ]; garp = mk "garp" "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ intel-novga cuda ];

2
hosts/garp/default.nix
View File

@ -20,8 +20,6 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../hardware/gpu/cuda.nix
#../../hardware/gpu/intel.nix
../../profiles/auto-upgrade.nix ../../profiles/auto-upgrade.nix
../../profiles/upgrade-diff.nix ../../profiles/upgrade-diff.nix
../../profiles/sshd.nix ../../profiles/sshd.nix

2
hosts/nord/default.nix
View File

@ -15,8 +15,6 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../hardware/gpu/rocm.nix
../../hardware/gpu/intel.nix
../../profiles/auto-upgrade.nix ../../profiles/auto-upgrade.nix
../../profiles/upgrade-diff.nix ../../profiles/upgrade-diff.nix
../../profiles/sshd.nix ../../profiles/sshd.nix

1
hosts/noximilien/default.nix
View File

@ -6,7 +6,6 @@
boot.loader.grub.useOSProber = true; boot.loader.grub.useOSProber = true;
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../hardware/gpu/intel.nix
../../profiles/auto-upgrade.nix ../../profiles/auto-upgrade.nix
../../profiles/upgrade-diff.nix ../../profiles/upgrade-diff.nix
../../profiles/sshd.nix ../../profiles/sshd.nix

3
hosts/sopp/default.nix
View File

@ -22,9 +22,6 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../hardware/gpu/cuda.nix
../../hardware/gpu/intel.nix
../../hardware/printer/hp-laserjet-p1005.nix
../../profiles/auto-upgrade.nix ../../profiles/auto-upgrade.nix
../../profiles/upgrade-diff.nix ../../profiles/upgrade-diff.nix
../../profiles/sshd.nix ../../profiles/sshd.nix