From ec70e431439b9068b90f35841717ffe51e963791 Mon Sep 17 00:00:00 2001
From: "Alexander \"PapaTutuWawa" <papatutuwawa@polynom.me>
Date: Fri, 5 Nov 2021 12:49:58 +0100
Subject: [PATCH] lib: FINALLY (?) FIX THE INTERFACE CONUNDRUM

---
 hosts/mashu.nix           |   8 +++-----
 lib/baseSystem.nix        |   6 ++----
 modules/hardware/wifi.nix | Bin 1363 -> 1212 bytes
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/hosts/mashu.nix b/hosts/mashu.nix
index 357260a..bbe0eee 100644
--- a/hosts/mashu.nix
+++ b/hosts/mashu.nix
@@ -35,15 +35,13 @@
       i18n.enable = true;
       singleUser = "alexander";
       hostName = "mashu";
-      #wireless = true;
+      wireless = true;
+      primaryInterface = "wlp1s0";
       offloading.offload.enable = true;
     };
     hardware = {
       intel.enable = true;
-      wifi = {
-        enable = true;
-        wifiInterface = "wlp1s0";
-      };
+      wifi.enable = true;
       mobile.enable = true;
       surface.enable = true;
     };
diff --git a/lib/baseSystem.nix b/lib/baseSystem.nix
index 733429f..c1dff50 100644
--- a/lib/baseSystem.nix
+++ b/lib/baseSystem.nix
@@ -4,9 +4,7 @@ let
   network = import ./network.nix;
   isVM = config.ptw.system.isVM;
   wireless = config.ptw.system.wireless;
-  wifiInterface = lib.attrByPath [ "ptw" "hardware" "wifi" "wifiInterface" ] "" config;
   primaryInterface = lib.attrByPath [ "ptw" "system" "primaryInterface" ] "" config;
-  primaryInterfaceWrapper = if (wifiInterface != "" && primaryInterface == "") then wifiInterface else primaryInterface;
 in {
   time.timeZone = "Europe/Berlin";
   ostylk.nftables = {
@@ -28,7 +26,7 @@ in {
 
             ct state { established, related } accept
             iif lo accept
-            iif ${primaryInterfaceWrapper} goto non-libvirt
+            iif ${primaryInterface} goto non-libvirt
           '';
       };
     };
@@ -160,7 +158,7 @@ in {
       enable = true;
     };
   } // (if wireless then {
-    wifiInterface = config.ptw.hardware.wifi.wifiInterface;
+    wifiInterface = primaryInterface;
   } else {});
 
   nix.package = pkgs.nixUnstable;
diff --git a/modules/hardware/wifi.nix b/modules/hardware/wifi.nix
index 9ca8724177487e36f5e2310698781e697cd0867e..1073e763cf00479059eaa5fd604e774f98c5adf3 100644
GIT binary patch
literal 1212
zcmV;t1Vj4(M@dveQdv+`0Ax0eL&~s}@tP_$Y&XOt9dYaw!~mWmEUJ8m_s9=v1kX1F
zrrZX8Af|@^2H3#~8r@U3A#2bMZ~YgA+S08b_Vz07iCKX$Q!|)%O>g(Gw_7557bPmV
zRqG_Mz$?_oxVHUahEOF)*29ciGcTLSL8S|u27o5VJQ&Jt2|M<~VXFZ3*+p!mXVI05
z-VKEDe76hSthu>$!gT?mNbB++j+(87VM;%wgID9Ywr38_gc=BqqOA8o$jAe5I#077
ze}E%{CViEKbM|bGu(_6DMxJ3)!12F^$L^(b6>$n`b^rE1*0ke5u>(3oB`_KAt_F+w
z2Np*X?z)Sta2jj`!i+1hK1B=oppJ!$f)Jtr-bzN3L>xB+f{w_wxyXgs;*GKiGzBns
z<F&(n^xKFwt}tr>FJnVJ`^TP~8ceHq1<POK^r||r*mgf$Csp?}jC$pUC0e>0hhP+3
zBmIANgKg$Ug6{l;&4T+!4mL9Cc@{JzIEFd<+axnJG0eNkL(67VC&XE_$}6TU422{+
z@pGcU8VtkrJlV(K@$np#K>_y3z}V*q9V#8q4|g}e--1Rp*ehbWB@LBDd5u}XoW=0R
z1C}Qa44DNv+M@hLd_;`;(B>LikoS&!U@1nDRni^Sy{MZr76Xqd+c2qlB<_evK0etl
zd<!^T%QG?kPE0!&2UZ&X0tHg_w)z8E{iIHvSpt(XV^e7Pr`mn>kVFL(H_;PAd%jD`
z)v^M|Fr@~re281bjW{-^=A9s+M$=cN5bdT^KMH8j+gK+St&ic-ERZzHRBwzDRs)rF
zmE-*?kJEY?bmY`!XJ_e|F9S7cq>x>e$5othrOo61NAMl?&+_{S$%a7re3rDV9mxho
z9fn~%|LuTTmnj59G~g#dal>)&e2x=C3-bpmzklhjQmj%U-)0pSr;UcJ!IfHqS%E6$
z?>j2`WJ4T+LN|}y@_G%)1LO1!2n&0skVQLG!`ops(#{%Bg#NC2x_u7_Qmtm+!hbZ|
zYNZg4e<=ir%a_RQE%Ym68qQJ3?`~#J#c&jrA2P;E%Z$G4R3f}dab-QE6V9!FK0sh$
zmAil#@5}ZVvi3aheV&xDu0NuLxyj0h3(BnL1#3!2&FQD0P3FL^4C!6n13`E((uYs9
z>$CIDi#$@@jgOdP2Zk-1u_cKB&uF&!`PYI$(Jk2QS?g;>w*&>qT!EKJ>F0&cTUAy*
zevmRP(gQ?e6kdNOQ4ECuFd*JmOirm})uexj$r3eYtC91orGMBC&1oU?ednF;?FTn;
z5PXtHi2BS9+ymbhU}M@jItdv(+O<d1Ig>(k2o%G;rJs+N_(mOv**e=JYOOXvcuL5i
zT<+9=5@xRKT_+UU0rx}fGIhgt5J0eN9gmF~mrlZ9{qP8l5%*I^e{55~_rOlzVDZ;i
z2O*R8nYlkqYKNCsSjR8fTA>J_#gQ=0D||+iZqJckB_dY0QCLqkWI-RW!r;fs;Zw<n
z?vjE%P%wA5Vx8eAI^z8kHpO6o)IvwH3(4meEGrj*!^+%Sa)tv;11kGsvVXasd6M}Z
ad9VkkG+JvGtgBlGx)5oi&_T^*aoMzH21#N7

literal 1363
zcmV-Z1+4l2M@dveQdv+`0Jf$51fMn#D+Cb2CtIg?u$sW)H3wo^nGisW<hT@9XM%oO
zOd_d;TT18yPqh(SJ-=Ev7>#zN1_}pzpm7irT0&U=ZCpEbv$0u0dz-`KW907rm^oq-
z-jUWPq}JJ2yIDgPbnJ68nLkW@El=LS+j5ibq3s8*HHv&b*)$FJyw0xMrE3EvP(F>3
z<~530bBmLuT5E*4k(v9HRt12vzszyx916m?c9x?wCLy?Ee#X|y^OFvAt$2<Fr32qz
zh&|Lsx_-vMRZ9wt;ciGN0I~2B77oK-ku_g&!In4`wd`bk5E`U(V&;-45Nfyc9KAmQ
zV<vI5#BgV3UPWd+|G}YrM^j*FL%3s099TBAXQanLHzYy0z3K=|nYdDktO2PSx8#hD
zxpkFPFmj{{#xHNgRod^izc_DbyL6_`B*BLu%nK@l=HvG)YeXPderbDznGbr3=;d`f
z?wSaKBz6HDKm0W@D918UmkYUU3m)#CMIMbtW{2O`tP*E(mLhpYpg?`P84!V&J-By2
zE54OJ>=t!PzFz?ouLfL$S1<_3B=3wQf}i<3PA)<7G+@_DS}E2zQXGTCI{ZHAg1=>X
z7ca&3pNyr_b-!l>I~{2vG|IqyocQ-&LcAPWV>#={=Jy~{0<!84VBb+cJUxH>|FaJV
z4cVXkzQ0!vEYz*jIO-P|b}7tpPxRFhMmu{fXz-0z0ZN~jUE~_}d#w@j^b|McM+9(L
zRL1|(1|o8q5jJV3*(mzusFBF~<@><###>Ot0~HrZf^nVMDtOly0h3PL^rJ$4E#!?8
zBH1x*L#{&hfg^Jea_l@ahWbpk<K@B5{g4KnMq@ThaoVtV_l#O<1XhueP+lr@t%&Jo
zpP5F8S&Z@bt-qC7!+K{7s%Ai4ik||Ua@K9%An=Vzcjgd)sCO(SS%(uKt!2=!*pq@w
z<GC@HzAKMpkdC%hw=Z&2rq&`Tm#?@qLC;bYxEwz^E2eZ}x%Q>`e}Ri6Ee^k3OrcTr
zHywp#96+9GU((j%N|)oBfXwIu;6vcXwh)}y;(8n-B13*J2FTF){hy9GIMUvQqNKF3
z6nYf$)W2gJ;VPy<XGLCs_i><gi$_UNA0)uwL!4>)c4%r~6v7qh=irm%4;znNfgW^Q
zcQOV8V`3e3i14-B3;a4VTmN$c3h5|J(7Jc^p<TJKn&GMXvVVtzf+0Tt6kf|79x**1
z&kJ{Oo0n!&g7;r!!Fl2%O+vJElyFdtd)@YI5k4{-;ZvD9$@+hNQ#M5LXLbC4qaFWS
zLOC=MY3Ij)yWEKT*n6f=Fq&}7!hL%I^|9D}28nK_OMT=)ht7+p=W6!ERM3Si&oo>h
zzJ>K#_CgJ&g2zRA7l#2wcK`+F0*jDrqA|NwiVORB8by9f_@2>mY@iw1kR#rs5Z&!Q
z7(8U83|v)-(^p@u4q-8JfhHBl+^QpT%SpiJr)3q6m=cW}l4up*AFm@5;aw3K^rLZg
z-293E_mBtbzGe#>F=BrcwnQ-i1VF&evov%(@3q6S#_I2S*Rq|}F8x7!a67;TcBBYH
zmHy5~^A+o=TIy~MkKxB^;7*`5um!n=*<)nVvxZ#u&*cB?L8F49kZL9N+9u%oDt#=F
za1{WKY2-pSF>$U4bdm{jeYd1$@-Zohd*X_-me$(e7uX+^2n1DD_b-P2V?`TnqHOgW
z9KoH+nfqK&`8;`38n}j5#|f-wwf5(*naJla9<rE6p@go_LHH8_1y_es)*ct_L1)-_
VfLwr_JEr&6nM21VLwH&Xz>=fZlF$GE