From d9e30cd69e4d58e54ebadeb737db79608943a682 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Mon, 5 May 2025 14:05:08 -0400
Subject: [PATCH] Modularize custom network options, to allow EduRoam wifi to
 work on select devices

---
 hosts/jupiter/services/default.nix            |   2 ++
 modules/system/devices/networking/default.nix |  20 ++++++------------
 .../networking/nameservers/default.nix        |  11 ++++++++++
 .../devices/networking/wireless/default.nix   |   7 ++++++
 modules/system/secrets/networks/default.nix   | Bin 783 -> 784 bytes
 5 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 modules/system/devices/networking/nameservers/default.nix
 create mode 100644 modules/system/devices/networking/wireless/default.nix

diff --git a/hosts/jupiter/services/default.nix b/hosts/jupiter/services/default.nix
index f8518ca3..c9fea6b7 100644
--- a/hosts/jupiter/services/default.nix
+++ b/hosts/jupiter/services/default.nix
@@ -1,6 +1,8 @@
 { config, lib, ... }:
 {
   config = lib.mkIf (!config.system.steamdeck.enable) {
+    networking.useNetworkd = lib.mkForce false;
+
     services.globalprotect.enable = true;
 
     virtualisation.vmware.host.enable = true;
diff --git a/modules/system/devices/networking/default.nix b/modules/system/devices/networking/default.nix
index 05f8513f..8e6944f9 100644
--- a/modules/system/devices/networking/default.nix
+++ b/modules/system/devices/networking/default.nix
@@ -1,25 +1,19 @@
 { config, ... }:
 {
+  imports = [
+    ./nameservers
+    ./wireless
+  ];
+
   networking = {
     useNetworkd = true;
-    dhcpcd.enable = false;
+    dhcpcd.enable = !config.networking.useNetworkd;
     nftables.enable = true;
     firewall.allowPing = false;
-    wireless = {
-      enable = config.system.desktop.enable;
-      userControlled.enable = true;
-    };
-    nameservers = [
-      "2620:fe::11#dns11.quad9.net"
-      "2620:fe::fe:11#dns11.quad9.net"
-      "9.9.9.11#dns11.quad9.net"
-      "149.112.112.11#dns11.quad9.net"
-    ];
   };
 
   services.resolved = {
-    enable = true;
+    enable = config.networking.useNetworkd;
     dnsovertls = "true";
-    fallbackDns = config.networking.nameservers;
   };
 }
diff --git a/modules/system/devices/networking/nameservers/default.nix b/modules/system/devices/networking/nameservers/default.nix
new file mode 100644
index 00000000..ac45eb16
--- /dev/null
+++ b/modules/system/devices/networking/nameservers/default.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+{
+  networking.nameservers = lib.mkIf config.networking.useNetworkd [
+    "2620:fe::11#dns11.quad9.net"
+    "2620:fe::fe:11#dns11.quad9.net"
+    "9.9.9.11#dns11.quad9.net"
+    "149.112.112.11#dns11.quad9.net"
+  ];
+
+  services.resolved.fallbackDns = config.networking.nameservers;
+}
diff --git a/modules/system/devices/networking/wireless/default.nix b/modules/system/devices/networking/wireless/default.nix
new file mode 100644
index 00000000..2bddfeef
--- /dev/null
+++ b/modules/system/devices/networking/wireless/default.nix
@@ -0,0 +1,7 @@
+{ config, ... }:
+{
+  networking.wireless = {
+    enable = config.system.desktop.enable;
+    userControlled.enable = true;
+  };
+}
diff --git a/modules/system/secrets/networks/default.nix b/modules/system/secrets/networks/default.nix
index 790514d4597f3fbc62cd3c47381af2af3c018e9b..e8355d475f766ac0e64be356e54e19c492a74445 100644
GIT binary patch
literal 784
zcmZQ@_Y83kiVO&0xY*cT$Z6haa@62`%;uVyvR{+;o(*YtOnLQV>+@?@4j+7WBJW|6
zO=$l97yEuM`tNhd<;(KNhs!&?xE~zQT@!z3l7q>)Z^^rg^cK_xSU+ES@Ko~8kAD;X
zdDa>~D`K50l_{#ZMdp<4Mvj>oZ&zLM*?vT8UVNJZZ$)oyM`wVK-qr6(F&^<MmEp$Q
zA3dCQ&TvJOtox5MK2LWFNHgBpe!Z2i=KQ?7S{c`WG&b%vyY0|oztwKfx$}SOKWG>(
z<Xl_xdf7F-!<r@nykYPEu70R&P+$;h^nYHDN@47E<#mBKUI<<edeF5)+Ti8U#Fvjg
zN!P`8@7?}FQuE_NzU`aC_%@xNSjHB!-!|Svu;99$+P<%<Zx<HXH~Wcs-j!i@T(#-B
zbKo2y`4dxIC32)!RNPu>{cvHm6VHOP8#$^I)i$X94iLN8xLh&H?$pyJ>C<`a>~kw#
zf6tnKqH52|c{6y7KNu<e{gm#uFWp1uLE|=|hZg@c?v>u}5n0o+;K$9XwCv@DZ@xAs
zt)8q>m3ZwP>$eoIh$OY%rf1SxMJh!L1>#p;v-+f+rlVM_Ua<a9>Jp_RYhPXb&UfQm
z<brRTrYv23t*16!k@Y5L<X1P3{<ST~U&uemVr=O86dNC{vVU9iZlmM!3VdO_=UyIr
zb3e86!in`chVM#GiizL2?D_O;jyv~u(|0p(#-Ba*<m73+{t{ckiD8p<_!-U_yZ)az
znbXcfj>lqChveK-sZaH1PyPO$CGD)t$J#cTxvQEUp1SyY?JxGNp3je`)vlS~*4w^-
zIU(UsoxvIh-K}3af}Ug?Db0uuow}-YO<<4J=W91PB|p9?f7EKz^WeRP*?dmXj;)i6
z7BU$dnV0YT^~`0n@bdL5a$~LaO_vzho)3`yVaeVf|22+Jrz_~w^T&&s{x4uDO%6Kd
z$>5c9^gTcGlY*?1f6p0D+30hYyL$qIRLL(M7jMs5ZZ3P~*M~I(&SlN{H_J7<<fqpS
zAD5X*$HIP#?M(eRIcY^!D?^}eX~X%S9*$?<HeBmk)bYjp7GJ<*k$c<BX1V2TwE_TV
C28@~j

literal 783
zcmZQ@_Y83kiVO&0xFfoF4p*ej{K*a{8rZIxPTaNo+9J2=%2`bny#MzcGjlkd`!p<f
zw{WZ4-G7_wG6R<GtnS(}OYB-q!5S;W$a}078^i^AO>_jmXqYMm2K3LJoLN$PB7og;
z|7pL*ir;G0mxTp3Nd&QGS2Jo!BuhMYNL|#x+^Ugs{fOU<c>PDkr+J^<sNMI+!F;2N
z^TDm5!Z(XvCvGSxnaDUzd230%_@gqJne7YT)=mDS^Xt*ENm=ajB5XFnn{QkW-l7q{
zDKySw)8noj(I57=td5qi{-R&MODJcx(f_7L*}tuSpSj(>&$Lb}_FxrzZq=F3?@~P-
z9MaD6n0#E>@YbugYiCpExdlbckM`>B`_Y=IW1pOIe&Yw(LwY4s-OXRis+>E#?ICOV
zzKg7~+*~TxgP)(t-_chjxY$sT&n`w+bdG7_@$B7y*UwzXQ}8w^H*(gj+CmZDKcU(V
z{}b|lta-j=f5@Hdt{pdxw#>LHT)pFW=X04kH~yWDdLEqhDZEMLLd@T`-LcDdddtQ?
z&p#->?|<dItICr9K4gn+ezbb}!uT&?JC4s^v+CT_AdP=#5<l99^2FZTbMNr3`-WBt
zzglH4Zm^QL%<H%!I^)HehpL<z>t&uSoA~UGSH$}ICsvcDol07?QTU|wstatIO!-{V
z%lNiEc+l1MOKn4BQ>sebx)kqKDi#YpX0A?qdePeWMnKK)TVI~%3Y$#58r-tz^U8}7
zIb2+7ueZzOE&j01J+!OQHuKkQ{{+L&>*m#J9Nlkbm6NiFuR7zWd!0&sZ_b9Tp}*F3
zO?bW}O2aAh(C%-?%}$@#$A15s#Ig^}j*Y)xZnFBkKJ8X>s>I74;|j-u2}cdL7^HdY
zBv)8Z40)=OaIEH_f{(NR_syX~Dtp3<+H=@S)*bzQ{PF80I{P<Np1JqZ;mY9~`+V}W
zzgGHPThI1c<LJ(58crv)UHW&Fv`?A4e=)bCaN9T5be6;uOS@$azaCp4xOe_M9jQmj
zuPd03yK<jzGDthc^iG9qwZny=ONr(?Kb-$`e-}fyjqs*D2EXlCKXUbOc^ZZI0RSF;
Bi0=RZ