From f9b00d30a7ec1ef6ff617a0f2d181170c25af666 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sat, 22 Jun 2024 18:09:39 -0400 Subject: [PATCH] base/networking: updated wifi networks --- .../desktop/cinnamon/default.nix | 2 +- homeManagerModules/desktop/gnome/default.nix | 2 +- nixosModules/base/networking/default.nix | 32 +++++++++++++----- secrets/wifi.age | Bin 1389 -> 1386 bytes 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/homeManagerModules/desktop/cinnamon/default.nix b/homeManagerModules/desktop/cinnamon/default.nix index 139ef9ae..071422e5 100644 --- a/homeManagerModules/desktop/cinnamon/default.nix +++ b/homeManagerModules/desktop/cinnamon/default.nix @@ -34,7 +34,7 @@ terminal = ["" "t"]; home = ["f" "XF86Explorer"]; }; - + "org/cinnamon/desktop/keybindings/wm" = { # TODO: Declaratively disable conflict with panel applet. close = ["F4" "c"]; diff --git a/homeManagerModules/desktop/gnome/default.nix b/homeManagerModules/desktop/gnome/default.nix index 9bb271e0..43c9601c 100644 --- a/homeManagerModules/desktop/gnome/default.nix +++ b/homeManagerModules/desktop/gnome/default.nix @@ -45,7 +45,7 @@ style-panel = 0; unblur-in-overview = true; }; - + "org/gnome/system/location".enabled = true; }; }; diff --git a/nixosModules/base/networking/default.nix b/nixosModules/base/networking/default.nix index 8a8d50d7..3b2d8d55 100644 --- a/nixosModules/base/networking/default.nix +++ b/nixosModules/base/networking/default.nix @@ -21,16 +21,17 @@ config.age.secrets.wifi.path ]; profiles = { - "Dustin’s iPhone" = { + "Dustin's A54" = { connection = { - id = "Dustin’s iPhone"; + id = "Dustin's A54"; type = "wifi"; + uuid = "fc221cbd-b6fd-44e0-8679-5998933b2fff"; }; - wifi.ssid = "Dustin’s iPhone"; + wifi.ssid = "Dustin's A54"; wifi-security = { auth-alg = "open"; key-mgmt = "wpa-psk"; - psk = "$DustinsiPhonePSK"; + psk = "$DustinsA54PSK"; }; }; @@ -38,6 +39,7 @@ connection = { id = "javapatron"; type = "wifi"; + uuid = "bb61beaa-ec07-404c-bbce-5a08ae355de7"; }; wifi.ssid = "javapatron"; wifi-security = { @@ -46,6 +48,19 @@ }; }; + "Taproom Public WiFi" = { + connection = { + id = "Taproom Public WiFi"; + type = "wifi"; + uuid = "d79280e9-4a22-4125-9583-eb7b80abfeb6"; + }; + wifi.ssid = "Taproom Public WiFi"; + wifi-security = { + auth-alg = "open"; + key-mgmt = "wpa-psk"; + }; + }; + Stargate-Discovery = { connection = { id = "Stargate-Discovery"; @@ -59,16 +74,17 @@ }; }; - wattson = { + wallace = { connection = { - id = "wattson"; + id = "wallace"; type = "wifi"; + uuid = "6896b13d-9717-4a8d-8a08-2a97139bf833"; }; - wifi.ssid = "wattson"; + wifi.ssid = "wallace"; wifi-security = { auth-alg = "open"; key-mgmt = "wpa-psk"; - psk = "$wattsonPSK"; + psk = "$wallacePSK"; }; }; diff --git a/secrets/wifi.age b/secrets/wifi.age index ac006f5888688f8c8f5e95ecdab2cd4a1f2d0486..7d8159d4a17e5d15dc52ef7f5e40a7d54cff8012 100644 GIT binary patch literal 1386 zcmZY7%gfsY003|&PNd9%Iv?8@21GZA-Ue~QMduDXj5f5Ks0i>&JT-4CBj@MVCLG`j>ikrG32GjL9P@cX&@e0(VYfUoplCR1c??ZYi+EDTa$5si-K4|7q!<$_m#u3SsD+9JAQgjf zl|l@Z2-Ko5uWR$TLlzl;55x-YWfZ=`BZ=*exuu4tdQXs9h#uz6RN@Et%(5b^ zs+M}-2+@*ZwKpFkRK|zn<-OSI-HQVE(5 z+k}TXb&FQL8Jgy1ImO#bu6tcU)heM1+AAsdxqO1HYl6t3d=mg=uy7R2gH#<4n~W<= z(L7AVgsn|EZq@N5Yt-O+%UUO&mtwgZ^mz>8LJ{vaJA%Tox)IJ9s~fQhAsDJC#0#lD zWHM`A)9bCW#Q_GTikdcAVURXlNC7ttY60$f5sr$BL0ws5Ss^1vmsRdOOOgdc8uQ4W zgB2XCNBCeQ6J`)1tkSlJ*KArLb?$Q!!E z^z`}yhnw2WM^qLs2X?{hA_QX#O8TEh*&{RJ0LTzXbK-)5%h#<~8w(0ZVcClEIA`9< zNwFoGtU{CxuGuQ_dfj3Rv!58nc*YB)pVPV1=$Wvn>f>;w_bWBWT-`aU-8s3j0r*u& z#t5Dnppjiwjm(3`y=qg|M@>rL^O*@-aGmcop(M*nka7LkxfkF4@|P`Jj_!Tw=TAR- zZFlYdV)xc-v*(P*c1|y)w;tbm{>JT;d0^Kk`(AGNk6bu>Zu#DJFS&H_>3<)6^gK6GrlBP|Qv|*kc z;>JWBPH;LAw!xey(Fvl6=%%0pbspSd2lrqif5b5z2=n01_5OnoKfao6md#L~ucC!J z4fjsxb|tMA%KM6O?37IdM38EuxTMTcS12Yd-b{EDYI98u#+$x`Vo9zGdKyJmqs3K3oDeCExFB1cq16<9&Kd2v9|fjrERuS- zkm@L3Z=z_Z$Iu|3sFkL$u1(_(o@Yg|mt#Y3tW08tX?krI7$LQRv(oZ>V2pe;$fV|M z$!l{Q#|ji}n*(=P;aOhgO=M|7X@f#K)e__Y%(%rFygsLJ&QMZpT~qS7GRTVA9HJq! zP6Z^tNC>?dxZVD&W*SD?bCZcku!NZ{0URC?c7g8Iyg>rAF<%(gMx+)DBQv&41zb`d zXWIj1z*E0gyAA2hTi{iLNu^n3OJEAho3T93+e(&DW6jZ1M#XKEaaD^8eD+K|aAv&)w zbdC~97mU|6y-rkYp(tu-)KuVz;`@XxiFjR313RyS%Y`Cz`eP7RfM7-8iXIAu2G0Sg z7ejncl>9m%IwPq&TcK#XyR!HJ9R$O?S+m#yxzg7)1<|#cU1VH=g>8uz>b$dJVcNq8XnVy}a|_Mrny<9_$~f(M ze73GtgCPuOMN|z>X`O*Z@Y^uw_p~HjvDk zI+=k>PQvQdPO7*d-nR?W1f+sYR4Kfl0lrK)vK;{(%Nq~ijx`l0W8SUeNRvznxKJ*a zi<&!?I;&;i^o^wA!MM|?Xjso3*0U;3;yN-#b!_1h&NP@5%C|2c-hbf!L+&2+#O+7V z-5j0SbL{J#i+rn1e?0v*-#A!4U-|Xj*S-la{r=MTn~>;T{OdgZP`vTNosGSR@1DQ%xc5p;)i2+8`M&keXUBHCFP=ON ze!l$&=aaZixp~Wj7bhFRo19fHJ>~8?AnyC{ z@3)RfJM44BiR;JvukU(#*RAU}K6pUc@yFS0u=wYrXJ7rXw*BXAZ(n%t)}eEonEjWI QK7Z$v6u9zL<<4XO0c45en*aa+