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
zcmV+r1MmC*M@dveQdv+`0MUVqaS1npG{rFQT(f*!cKVaO%~Xd$Wa{{}=hoE2!RE+r
z;bJ^hZ@=ii`=b9$!bJ3^<HL7}N(<n?Ev#R{l0Y=h_G7woE}(r-JLjdr%47NQ{b2q{
zeKY2A1(h0U6)ChF%000NnP}~*)J(U;DxP14APsnpeTa!rOfJ>;Vq8dHBzadex8mWJ
z&M~Nh9Y^@gOy#){8v)q2*M$yz&z{{XXxI3GfxR}{K!iWFKD^G){D1H$F`)^qeCwvx
zF2gA_5DixE{j1?4FmNzcGXI{8BynBWBd$@{=n>OW;EK2#FzLl%>EiMmeqD>bx9Axu
z@u3d4vsMnW&yjWpT)#bEG!byuE+)S9CGDYdKZ8ydN!=U=L8`LnLs6U(AIOwN7;GD;
zc-o~q;h}p%44}=i2zy~BuqFFY7SVyHAzD7l<$@c_ZU+aQc<c9SpU8T=sh*e&Gw?DX
z{qko<zGp}*;DNRh;W+<j-gV!M6s&}x_}O}9Yo~GS^@C!olO%d!*6s!NWJ*|KCXIsT
z8!B=na-k4ksn$C3D`qSqb0=`G!eyi)#I5Sl_YT<hS)lf^l%=cIjD2Sz1=$H%^+rgK
zt%S$uAK+>MfQs^6Ut1)<wu8Ge#~&aLRt?VS#_Zo^dC<tOY%%V2$rcyb(@EvcY)1>X
zHSU?&U(Lqk$;&Q}bUhJ~R+B6b0M0W-|B;gkJ~$o>II@Ttoyuk9FPoM3?*wMe9PxdI
z9G$9y;mXnLt@;PGN$1CAeXNj1jfbEEU|{@yFswi=we<*6<Y>foXj@g4s&%YUj5_ny
z*$El(?04dYJdEJ)C^nx76^ONya-jk<GB<a=`sPHl6Q{4JZCyJrHKZ^-&rlusIR}ql
z^<EAvic<3D<D&xqpagYeQpQODN^HgN4+G?IYRUc1GnBDR%?pc=02*}q3`9#wnnpyt
zpMO?>QJn>B{+dN=boolyOhlO?##Z|lxn=Q_VyJ3`08uS<fY13zLCx)e){3Ht^h??f
OP?Hqiwl<nZY_&RP28@~j

literal 783
zcmV+q1MvI+M@dveQdv+`0NfR$oC;YypOZkyfCknzk-EFqqDFgpnu2%@|GdUFK+A3A
zR&Bczg(ltpvwmq%rMY{Gw3-&yTyU&9F<IUPIItHGjWjF~^e8nVQBaSalWBB)$WRA4
zzspX6c>5-M(-RP~7*YjmdjTpKV;JK=Wukxsg(zg##7@{>FXD5{4d&Q=zWhKpu_Qym
zwN(?@a_eERaCDIYmLs)ve;49*9GQoq?S7N|Ec)Wcl4=JZ6b3v~v)I#9v?y1yRbEK4
z<BDt*_&?e@#doXpFMqlcY^yT=g5qoYJNwMrhrTs_DqX>P2W@)H^X_FyKtN{A3^ehn
zfbB|sin)S`&Y*Gw;=L`t_=RaKKVxLivG5(jE_9VgH|rfF&cn9h1$VyD1sw|tB-c~t
z%x}1kauK635e`0FEft(KVaIE`{jZs>3~=pYZCRR{eQ^{G{8cMJ|6p$Ttmm}9RNU7^
zh}kl<nAH<|xciCc9Guwx%Ub7CYVuctB+y*_hPz#+xl0{i=WoFmzW;fi)gu}H@M{*c
z;;WaTU-VYE$DgdK&gD`l{>)+VKUEA}-n`z!y5BK6VETm}(Xcug(+xqWTWILa;Ux)Z
zuN>s2k>=b=Sg(KNI+B*kVxqAV$vdjh1}Oq>3R|WQw&383hWaM3S%PIGUan+Isw6m}
zNSUi<<<UDc*id}?+Vtmb6Ev08Q-q@PsnHm03JNCcw;XPx@UBNyih(_8`rA)nG4rmT
zeJI7hHacu%q7Hj#`A2>ve~oOgwN?7Aije1|S|~zk!n^jzHp|Gq2jA8hrtkwnf&1yQ
zI`gk)+Jj{n>5MaYL2!`8F|;sdODtn}JCRi7Bw)sT!5~aSPxrG`5+uA=a))dNbgsqw
z$K&gyEWfaM%--oh)Wg`mOl~Xnc}~`^2J<Mzxt1tG$SXvTxO9h<oxh_CK@*1d1!n|d
z$fb)NG4;lv5xt+DEE?it>v#jlMGMb@FlNdE?j#DUK+sasVK=$(&+^~80E;{mvb-?+
NJ_Yd#j0#CIR8Ag#i0=RZ