From 5c1619f7aa317ef73a16969c167f49158a55b33c Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 15 Sep 2024 17:06:36 +0200 Subject: [PATCH] Update dependencies Also change wifi config to new format --- flake.lock | 30 +++++++++---------- modules/nixos/base/network/mobile.nix | 40 +++++++------------------- secrets/passwords/networks.age | Bin 870 -> 679 bytes 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 3013332e..e8f6020e 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1726301210, - "narHash": "sha256-xXexcOeBxrFaHTelAnVkN5Q2+t8WhOX3DGVT8ZgsLK4=", + "lastModified": 1726405064, + "narHash": "sha256-PeMiTSwhcc2R8MrViJpoQOpT0EoWp0GPb9afqaeVbXk=", "owner": "accentor", "repo": "api", - "rev": "fdd336dcf788060eacd0bdbfc01f7d98d9117627", + "rev": "3f799895d0ad2c43ca00cc98c3e27ba52cff2d1f", "type": "github" }, "original": { @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1726301236, - "narHash": "sha256-RLv2VlJvdXUU2CH8JPD7aRadCjnkQWIYXdKfm1r8z8s=", + "lastModified": 1726405273, + "narHash": "sha256-ZjajFmscdfEk0pTLnQ8ug8BzT/Sm9heaXL1jSenDcHI=", "owner": "accentor", "repo": "web", - "rev": "02edbeb1c20df8f60b24f4e04ded3fe2f8fffc71", + "rev": "90c7f875a81effc061e9d873169ab11281ad1f97", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726062873, - "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", + "lastModified": 1726243404, + "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", + "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "type": "github" }, "original": { @@ -485,11 +485,11 @@ }, "nur": { "locked": { - "lastModified": 1726393490, - "narHash": "sha256-LVGtTtPzF0rxy3nKzegvaLVsTKSM0IMLjfbxnh7FKP0=", + "lastModified": 1726410101, + "narHash": "sha256-7Gg/4kFg7wYNIR89k1nNMIA+5O9832lze+x6sJ87qw4=", "owner": "nix-community", "repo": "NUR", - "rev": "1a4d47c6fc08986702c185ef0409d59dd42269a1", + "rev": "c427237ac81b66f02f796727b876d2b707ca77ad", "type": "github" }, "original": { @@ -603,11 +603,11 @@ ] }, "locked": { - "lastModified": 1726244894, - "narHash": "sha256-kN2mqH/UtNIm7SG/TJhb+46t42duCEcRO91rukzj8Ms=", + "lastModified": 1726404892, + "narHash": "sha256-K3lpy/HAj0krIzcM6YB0F/ioj4bqeah2juBktc9o4Jg=", "owner": "chvp", "repo": "tetris", - "rev": "e965365f5c45b7ac6e2fcb088903f6becbcfca19", + "rev": "d1c32fee9fc5502e2fc3d32671af6fd2d252bfc0", "type": "github" }, "original": { diff --git a/modules/nixos/base/network/mobile.nix b/modules/nixos/base/network/mobile.nix index 30f62282..22b9112c 100644 --- a/modules/nixos/base/network/mobile.nix +++ b/modules/nixos/base/network/mobile.nix @@ -24,43 +24,25 @@ wireless = { enable = true; interfaces = [ wireless-interface ]; - environmentFile = config.age.secrets."passwords/networks.age".path; + secretsFile = config.age.secrets."passwords/networks.age".path; userControlled = { enable = true; group = "network"; }; networks = { - "Public Universal Friend".psk = "@PSK_PUF@"; - AndroidAP.psk = "@PSK_AndroidAP@"; - draadloosnw.psk = "@PSK_draadloosnw@"; - werknet.psk = "@PSK_werknet@"; - Secorima.psk = "@PSK_Secorima@"; - "Mediaraven Guest".psk = "@PSK_Mediaraven@"; - "down".psk = "@PSK_down@"; + "Public Universal Friend".pskRaw = "ext:PSK_PUF"; + AndroidAP.pskRaw = "ext:PSK_AndroidAP"; + draadloosnw.pskRaw = "ext:PSK_draadloosnw"; + werknet.pskRaw = "ext:PSK_werknet"; + Secorima.pskRaw = "ext:PSK_Secorima"; + "down".pskRaw = "ext:PSK_down"; "Zeus WPI" = { - psk = "@PSK_Zeus@"; + pskRaw = "ext:PSK_Zeus"; hidden = true; }; - "Zeus Event 5G".psk = "@PSK_Zeus@"; - "Rode Kruis-Gent (internet)".psk = "@PSK_RKG@"; - "CityStayNet".psk = "@PSK_CityStayNet@"; - eduroam = { - authProtocols = [ "WPA-EAP" ]; - auth = '' - eap=PEAP - identity="@EDUROAM_USER@" - password="@EDUROAM_PASS@" - ''; - extraConfig = '' - phase1="peaplabel=0" - phase2="auth=MSCHAPV2" - group=CCMP TKIP - ca_cert="${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" - altsubject_match="DNS:radius.ugent.be" - ''; - }; - "GUK-huis".psk = "@PSK_GUKhuis@"; - "DasNetwerk".psk = "@PSK_DasNetwerk@"; + "Zeus Event 5G".pskRaw = "ext:PSK_Zeus"; + "Rode Kruis-Gent (internet)".pskRaw = "ext:PSK_RKG"; + "DasNetwerk".pskRaw = "ext:PSK_DasNetwerk"; }; }; }; diff --git a/secrets/passwords/networks.age b/secrets/passwords/networks.age index 6d4431a528a509fa3d803e33ad6d4ce9b52d2a59..01c4d8fddf54cae2045d5712687ecbecfe97f25f 100644 GIT binary patch delta 627 zcmaFHww!f>PJK|Bk(;Thsh4|xS!HUmlXgLAvSE0JiIZ8dfw5^og<(!kx~r?Bwvn-c z0avn7Kt-m1l6#Ivv9phBsBds&ghgPfcVtFE}!Ri(~G&Q4WsL1FnB`q}4j!_zNIOFo;hhw#mRwOy1KdwZa$XUe!l*0 zZf<6QDOKfu6&~g}`pH#Mm7z|hQJ$e0Db5!4!*DxeysZcf63OYzO1{fVefC9_WIbyalx2Bc#X*OGu5@e63fj~Jk5e{T133jyE?6< z`$TDbfaqt2cMWxMu`jnQTOy<)eb%_i(6}Om@mbH!sZ9rN0i4rxGJfB&JvTC2Qm(O-M*Ba9#gx` z`^n$A%GQSjUR;|X^g5tC=TSuJ_gJ+T+Gp$&FKtO~GMQ$nuQa8l+brL+-9NN%>yvNR a)k}VPeE1M1&GGi*^r_F?!``2{`vCx@oB+W9 delta 819 zcmZ3^`iyOYPJM`Tcy?fswv%Uex__Bpn5VCccZF++cSJ#QNoApLg@tpfNn}z|gri@k zFPBMbs)x5xj$4$!w`W0;Uu3>_g++c)Vs=hiQetIjqFGf+SyiS{vU`qUGMBEMLUD11 zZfc5=si~o*La}90l0~{gp1!$-Pl$egfu~=1fp=L^m0M^PS88frerTYdqp4*^ijhgSNo1(AfwMt`TZ&OpiHEU8X_|{su~~YgyN5;k z#E;_jhM|rYIhoEb&WV+Nu9i6-rN;iLg^3k`F7Ej**+s627EYG#-tKOT%mR^e}td*ymK+(yHEZ0 z-CORlo_zLp%U9t8l4bj!?N$4f?BLqD`Ex4Uu4y&*etolDCoBA{XU5?)@8mk`BSjti zg&12LtS7CSqM133P4vjN-uIgi6fl?MPhnh;v?aWo?Rg~E-A|t_pIT_kPPqQQRccL; zSHO~wT&L@+o8Dxd`RDDHJaJj_g6dAOtM}y&2g_VA&gL+xe$M!HMU3v0v;)_kUafz8 zbEBq%by@|VW&)QBHqmZ7`ZKi;ZX`|nR@ zcTI>*%i@+W4W|cQP22RdZ7@a)gWG!LHy0KDH_WdHyG