diff --git a/hosts/default.nix b/hosts/default.nix index bd2da40..08a8d91 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -67,10 +67,8 @@ let # TODO: move this to a file or separate flake mkHosts = mk: let - hw = input-views.inputs-edge.nixos-hardware.nixosModules; #vf = input-views.inputs-edge.nixos-vf2.nixosModules; # nspawn = ls [ "${nixos-nspawn}/nspawn-image.nix" { boot.isContainer = true; } ]; - p1005 = ./../hardware/printer/hp-laserjet-p1005.nix; au = ./../profiles/auto-upgrade.nix; ts1 = ./../profiles/tailscale-inner.nix; ts2 = ./../profiles/tailscale-outer.nix; @@ -86,13 +84,13 @@ let #hostname "domain" "system" inputs "state" [ modules ... ] # asgaut = mk "pbsds.net" "riscv64-linux" input-views.inputs-2405 "24.05" [ hw.starfive-visionfive-2 ]; # noximilien = mk "pbsds.net" "x86_64-linux" input-views.inputs-250T "24.11" [ ts1 au tse ]; - noximilien = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "24.11" [ ts1 au tse ]; - nord = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "24.11" [ ts1 au ]; - sopp = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "24.11" [ ts1 au p1005 ]; + noximilien = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "25.05" [ ts1 au tse ]; + nord = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "25.05" [ ts1 au ]; + sopp = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "24.11" [ ts1 au ]; bjarte = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "24.11" [ ts1 ]; bolle = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "24.11" [ ts2 au tse ]; - eple = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "24.11" [ ts1 au tse dns64 ]; - garp = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "24.11" [ ts1 au ]; + eple = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "25.05" [ ts1 au tse dns64 ]; + garp = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "25.05" [ ts1 au ]; # hasselknippe= mk "pbsds.net" "aarch64-linux" input-views.inputs-2405 "24.05" [ ts1 hw.pine64-pinebook-pro ]; # alsaug gomperud smattkuken skrytebiffen skalkesnerken kelfrid balleby bingus skjrlaltatjlstad diff --git a/hosts/nixos/sopp/configuration.nix b/hosts/nixos/sopp/configuration.nix index 09cbf42..fe6d9f1 100644 --- a/hosts/nixos/sopp/configuration.nix +++ b/hosts/nixos/sopp/configuration.nix @@ -50,6 +50,8 @@ inputs.nixos-hardware.nixosModules.common-cpu-intel ../../../hardware/gpu/intel.nix ../../../hardware/gpu/cuda.nix + ../../../hardware/printer/hp-laserjet-p1005.nix + ../../../profiles/nix-ld.nix ../../../profiles/sshd