From b8f9d0d00878bf757a969737d0291a016fb31204 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 5 Mar 2024 01:41:36 +0100 Subject: [PATCH] dns64 block --- flake.nix | 10 +++++++--- hardware/gpu/cuda.nix | 4 ++-- hosts/bolle/default.nix | 10 ---------- hosts/eple/default.nix | 10 ---------- hosts/garp/default.nix | 10 ---------- 5 files changed, 9 insertions(+), 35 deletions(-) diff --git a/flake.nix b/flake.nix index 92f0fff..41e4343 100644 --- a/flake.nix +++ b/flake.nix @@ -260,15 +260,19 @@ hidpi = hw.common-hidpi; p1005 = ./hardware/printer/hp-laserjet-p1005.nix; au = ./profiles/auto-upgrade.nix; + dns64 = { config, ... }: { + networking.nameservers = [ "2001:700:1:11::2:51" ]; # dns64.uninett.no + networking.networkmanager.insertNameservers = config.networking.nameservers; # wtf + }; in builtins.mapAttrs (hostname: curried: curried hostname) { #hostname "domain" "system" inputs "state" [ modules ... ] noximilien = mk "pbsds.net" "x86_64-linux" inputs-2311 "22.11" [ au intel ]; brumlebasse = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au amd nspawn ]; nord = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au intel-novga hw.common-cpu-intel-sandy-bridge rocm hidpi ]; sopp = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au intel cuda p1005 ]; - bolle = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au intel ]; - eple = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au intel rocm ]; - garp = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au intel-novga cuda ]; + bolle = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au dns64 intel ]; + eple = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au dns64 intel rocm ]; + garp = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au dns64 intel-novga cuda ]; hasselknippe= mk "pbsds.net" "aarch64-linux" inputs-2311 "23.11" [ hw.pine64-pinebook-pro ]; #gomperud smattkuken skrytebiffen skalkesnerken balleby bingus skjrlaltatjlstad #bergjlot snortheimsmoen ditlefsen skrukkerud podebusk zmaragd makrell alfnes blix urke pytte uddu imdorf rosenqvist diff --git a/hardware/gpu/cuda.nix b/hardware/gpu/cuda.nix index aa24a12..78d7704 100644 --- a/hardware/gpu/cuda.nix +++ b/hardware/gpu/cuda.nix @@ -10,10 +10,10 @@ hardware.opengl.driSupport32Bit = true; nixpkgs.config.openglSupport = true; # why is this not set by hardware.opengl.enable ? - nixpkgs.config.cudaSupport = true; # TODO: TOO SLOW, BREAKS + nixpkgs.config.cudaSupport = true; nixpkgs.config.vdpauSupport = true; nixpkgs.config.vaapiSupport = true; - nixpkgs.config.nvidiaSupport = true; # TODO: slow? used only by zenith + nixpkgs.config.nvidiaSupport = true; nixpkgs.config.allowUnfreePredicate = pkg: lib.any (x: x) [ (lib.hasInfix "nvidia" (lib.toLower (lib.getName pkg))) diff --git a/hosts/bolle/default.nix b/hosts/bolle/default.nix index b9ee890..5f4576d 100644 --- a/hosts/bolle/default.nix +++ b/hosts/bolle/default.nix @@ -27,16 +27,6 @@ # Networking networking.networkmanager.enable = true; - networking.nameservers = [ - "2001:700:1:11::2:51" # dns64.uninett.no - #"129.241.0.200" - #"129.241.0.201" - #"2001:700:300::200" - #"2001:700:300::201" - ]; - - networking.networkmanager.insertNameservers = config.networking.nameservers; # wtf - # TODO: remove? Move? programs.dconf.enable = true; } diff --git a/hosts/eple/default.nix b/hosts/eple/default.nix index 541bf36..5bcd30f 100644 --- a/hosts/eple/default.nix +++ b/hosts/eple/default.nix @@ -30,16 +30,6 @@ # Networking networking.networkmanager.enable = true; - networking.nameservers = [ - "2001:700:1:11::2:51" # dns64.uninett.no - #"129.241.0.200" - #"129.241.0.201" - #"2001:700:300::200" - #"2001:700:300::201" - ]; - - networking.networkmanager.insertNameservers = config.networking.nameservers; # wtf - # TODO: remove? Move? programs.dconf.enable = true; } diff --git a/hosts/garp/default.nix b/hosts/garp/default.nix index 04eb4c4..bcd6e81 100644 --- a/hosts/garp/default.nix +++ b/hosts/garp/default.nix @@ -49,16 +49,6 @@ # Networking networking.networkmanager.enable = true; - networking.nameservers = [ - "2001:700:1:11::2:51" # dns64.uninett.no - #"129.241.0.200" - #"129.241.0.201" - #"2001:700:300::200" - #"2001:700:300::201" - ]; - - networking.networkmanager.insertNameservers = config.networking.nameservers; # wtf - # TODO: remove? Move? programs.dconf.enable = true;