dns64 block

This commit is contained in:
Peder Bergebakken Sundt 2024-03-05 01:41:36 +01:00
parent 2b0d7d2ab3
commit b8f9d0d008
5 changed files with 9 additions and 35 deletions

View File

@ -260,15 +260,19 @@
hidpi = hw.common-hidpi; hidpi = hw.common-hidpi;
p1005 = ./hardware/printer/hp-laserjet-p1005.nix; p1005 = ./hardware/printer/hp-laserjet-p1005.nix;
au = ./profiles/auto-upgrade.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) { in builtins.mapAttrs (hostname: curried: curried hostname) {
#hostname "domain" "system" inputs "state" [ modules ... ] #hostname "domain" "system" inputs "state" [ modules ... ]
noximilien = mk "pbsds.net" "x86_64-linux" inputs-2311 "22.11" [ au intel ]; 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 ]; 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 ]; 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 ]; 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 ]; 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 intel rocm ]; 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 intel-novga cuda ]; 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 ]; hasselknippe= mk "pbsds.net" "aarch64-linux" inputs-2311 "23.11" [ hw.pine64-pinebook-pro ];
#gomperud smattkuken skrytebiffen skalkesnerken balleby bingus skjrlaltatjlstad #gomperud smattkuken skrytebiffen skalkesnerken balleby bingus skjrlaltatjlstad
#bergjlot snortheimsmoen ditlefsen skrukkerud podebusk zmaragd makrell alfnes blix urke pytte uddu imdorf rosenqvist #bergjlot snortheimsmoen ditlefsen skrukkerud podebusk zmaragd makrell alfnes blix urke pytte uddu imdorf rosenqvist

View File

@ -10,10 +10,10 @@
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
nixpkgs.config.openglSupport = true; # why is this not set by hardware.opengl.enable ? 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.vdpauSupport = true;
nixpkgs.config.vaapiSupport = 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) [ nixpkgs.config.allowUnfreePredicate = pkg: lib.any (x: x) [
(lib.hasInfix "nvidia" (lib.toLower (lib.getName pkg))) (lib.hasInfix "nvidia" (lib.toLower (lib.getName pkg)))

View File

@ -27,16 +27,6 @@
# Networking # Networking
networking.networkmanager.enable = true; 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? # TODO: remove? Move?
programs.dconf.enable = true; programs.dconf.enable = true;
} }

View File

@ -30,16 +30,6 @@
# Networking # Networking
networking.networkmanager.enable = true; 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? # TODO: remove? Move?
programs.dconf.enable = true; programs.dconf.enable = true;
} }

View File

@ -49,16 +49,6 @@
# Networking # Networking
networking.networkmanager.enable = true; 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? # TODO: remove? Move?
programs.dconf.enable = true; programs.dconf.enable = true;