From 51001f585b0e29ffb7da15f753837be02bfb8abd Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sun, 24 Dec 2023 23:40:01 +0100 Subject: [PATCH] networking: fix ifsr-apb password --- flake.lock | 38 ++++++++++++++------ hosts/thinkpad/modules/networks/default.nix | 2 ++ hosts/thinkpad/modules/networks/uni.nix | 8 +++++ secrets.nix | 1 + secrets/thinkpad/ifsr-apb-auth.age | Bin 0 -> 657 bytes 5 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 secrets/thinkpad/ifsr-apb-auth.age diff --git a/flake.lock b/flake.lock index bc513dc..ab624f2 100644 --- a/flake.lock +++ b/flake.lock @@ -8,14 +8,15 @@ ], "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1703260116, - "narHash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=", + "lastModified": 1703371241, + "narHash": "sha256-f7ZcabJ5iAH2IRfVuI55xSPZ9TbegFzvFxoKtIPNEn8=", "owner": "ryantm", "repo": "agenix", - "rev": "d0d4ad5be611da43da04321f49684ad72d705c7e", + "rev": "457669db4259ff69d1ac1183aaa6000420940c1f", "type": "github" }, "original": { @@ -81,11 +82,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -134,7 +135,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -179,11 +180,11 @@ ] }, "locked": { - "lastModified": 1703265279, - "narHash": "sha256-5jVtOwyMH1FzclxHrsFWzBdB+VyjUUSu1wyZhZlR6WU=", + "lastModified": 1703368619, + "narHash": "sha256-ZGPMYL7FMA6enhuwby961bBANmoFX14EA86m2/Jw5Jo=", "owner": "nix-community", "repo": "home-manager", - "rev": "07c322a7cff03267fd881adae1afe63367c5d608", + "rev": "a2523ea0343b056ba240abbac90ab5f116a7aa7b", "type": "github" }, "original": { @@ -464,6 +465,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "trucksimulatorbot": { "inputs": { "images": "images", diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix index 740818d..b146eac 100644 --- a/hosts/thinkpad/modules/networks/default.nix +++ b/hosts/thinkpad/modules/networks/default.nix @@ -47,6 +47,8 @@ wireless = { enable = true; userControlled.enable = true; + # sadly broken on my machine + scanOnLowSignal = false; environmentFile = config.age.secrets.wireless.path; networks = { "@HOME_SSID@" = { diff --git a/hosts/thinkpad/modules/networks/uni.nix b/hosts/thinkpad/modules/networks/uni.nix index e739add..04d0b84 100644 --- a/hosts/thinkpad/modules/networks/uni.nix +++ b/hosts/thinkpad/modules/networks/uni.nix @@ -3,8 +3,16 @@ age.secrets = { tud.file = ../../../../secrets/thinkpad/tud.age; agdsn.file = ../../../../secrets/thinkpad/agdsn.age; + ifsr-apb-auth = { + file = ../../../../secrets/thinkpad/ifsr-apb-auth.age; + }; }; networking = { + supplicant."enp0s31f6" = { + userControlled.enable = true; + driver = "wired"; + configFile.path = config.age.secrets.ifsr-apb-auth.path; + }; wireless.networks = { eduroam = { auth = '' diff --git a/secrets.nix b/secrets.nix index 2ea2b0d..3194430 100644 --- a/secrets.nix +++ b/secrets.nix @@ -9,6 +9,7 @@ in "secrets/thinkpad/wireless.age".publicKeys = [ rouven thinkpad ]; "secrets/thinkpad/tud.age".publicKeys = [ rouven thinkpad ]; "secrets/thinkpad/agdsn.age".publicKeys = [ rouven thinkpad ]; + "secrets/thinkpad/ifsr-apb-auth.age".publicKeys = [ rouven thinkpad ]; "secrets/thinkpad/wireguard/dorm/private.age".publicKeys = [ rouven thinkpad ]; "secrets/thinkpad/wireguard/dorm/preshared.age".publicKeys = [ rouven thinkpad ]; "secrets/thinkpad/borg/passphrase.age".publicKeys = [ rouven thinkpad ]; diff --git a/secrets/thinkpad/ifsr-apb-auth.age b/secrets/thinkpad/ifsr-apb-auth.age new file mode 100644 index 0000000000000000000000000000000000000000..153cab03cc731da0c4d76a9abc71e263f2549c70 GIT binary patch literal 657 zcmV;C0&e|bXJsvAZewzJaCB*JZZ23XjD!|Xi7vmZALj}Zb3{zV{K1kZZ>j4R%&i}R5(soSVnY2GiwSsF)>ayOHFS| zOLK5DY-TxDG%->uGdVA3b#7%xY)4mkMNV*HcwsVWZ*vMQJ|J^*Xf0)AGBq_ZIUq$= zdUQEaAZ~AEb4qi1GH*mQQb<*GRaru4bwO%VWH?xGGcr|UXE{SrQCCwlM|ns|3QA-! zacFH?XKFA*L2GhrNLE@kRA)zGOhaQzNmDg3XnHe6I5#;pcU3lP3N0-yAW~;)bz(_5 zOLkLmVMI+vFfv#%S!YyDY)^DGO=(VXWKnG}H*Rk)Z+dED3MGQ?F+xvvK{s0U>9Cf9 zZA4UT$V>$Ct%$Hp7RPCByJpOepK^jC&Lq(HmOheU2GG__6t{vp@km&etC7bcKI? zs>^lI?%UlP#yE$yxU*#On`IKBk?E4$4$BP6j@K%0r*>yat}#wLJ*2kh&E$7%5;RSSP&MsPL2<3yjE;|P%v2+BBbk>DD^W%-+H(&sVelcxi rJPX&fFiqh$bOl<3QCmM%m$%*N0gTe@JB0o{y38WXT9=3|it}