From 5eb6ac7018a5e9ca93570eb0466e15d6621afcb5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 31 Oct 2025 22:03:38 +0100 Subject: [PATCH] ljkasdjklasdljk --- hosts/default.nix | 7 +++---- hosts/nixos/bjarte/configuration.nix | 1 + hosts/nixos/garp/configuration.nix | 6 ++++++ hosts/nixos/sopp/configuration.nix | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index daf4b1c..58e8d6c 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -76,7 +76,6 @@ let ts2 = ./../profiles/tailscale-outer.nix; tse = ./../profiles/tailscale-exit-node.nix; #rb = ./../profiles/known-hosts; # TODO - nixld = ./../profiles/nix-ld.nix; dns64 = { config, ... }: { networking.nameservers = [ "2001:700:1:11::2:51" ]; # dns64.uninett.no networking.networkmanager.enable = true; @@ -89,11 +88,11 @@ let # 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-241T "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 nixld p1005 ]; - bjarte = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "24.11" [ ts1 nixld ]; + sopp = mk "pbsds.net" "x86_64-linux" input-views.inputs-edge "24.11" [ ts1 au p1005 ]; + 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" [ ts2 au ]; + garp = mk "pbsds.net" "x86_64-linux" input-views.inputs-2505 "24.11" [ 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/bjarte/configuration.nix b/hosts/nixos/bjarte/configuration.nix index d0fa8b9..1b30f48 100644 --- a/hosts/nixos/bjarte/configuration.nix +++ b/hosts/nixos/bjarte/configuration.nix @@ -28,6 +28,7 @@ inputs.nixos-hardware.nixosModules.common-cpu-intel ../../../hardware/gpu/intel.nix + ../../../profiles/nix-ld.nix ../../../profiles/sshd/ts-only.nix #../../../profiles/no-suspend.nix ../../../profiles/oci/podman.nix diff --git a/hosts/nixos/garp/configuration.nix b/hosts/nixos/garp/configuration.nix index c5efe54..be369ae 100644 --- a/hosts/nixos/garp/configuration.nix +++ b/hosts/nixos/garp/configuration.nix @@ -10,6 +10,7 @@ #boot.kernelPackages = pkgs.linuxPackages_latest; #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest; + #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; #hardware.nvidia.modesetting.enable = false; # makes atom behave, but mpv refuses to start # The open source driver does not support Pascal GPUs (1080) @@ -27,6 +28,7 @@ inputs.nixos-hardware.nixosModules.common-cpu-intel-cpu-only ../../../hardware/gpu/cuda.nix + ../../../profiles/nix-ld.nix ../../../profiles/sshd ../../../profiles/nix-cgroups.nix #../../../profiles/no-suspend.nix @@ -39,6 +41,10 @@ # ../../../users/h7x4 # ../../../users/adrlau + # ../../../profiles/mounts/freon-nfs.nix + # ../../../profiles/mounts/reidun-nfs.nix + # ../../../profiles/mounts/meconium-nfs.nix + # ./sftp.nix ../../../profiles/shell.nix diff --git a/hosts/nixos/sopp/configuration.nix b/hosts/nixos/sopp/configuration.nix index 465cec8..09cbf42 100644 --- a/hosts/nixos/sopp/configuration.nix +++ b/hosts/nixos/sopp/configuration.nix @@ -31,8 +31,9 @@ systemd.services."autovt@tty1".enable = false; #boot.kernelPackages = pkgs.linuxPackages_latest; + #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest; + #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; #hardware.nvidia.modesetting.enable = false; # makes atom behave, but mpv refuses to start - hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; # The open source driver does not support Pascal GPUs (1080) # https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/nvidia/pascal/default.nix @@ -50,6 +51,7 @@ ../../../hardware/gpu/intel.nix ../../../hardware/gpu/cuda.nix + ../../../profiles/nix-ld.nix ../../../profiles/sshd ../../../profiles/earlyoom.nix ../../../profiles/no-suspend.nix