Refactor wlan module

2026-01-21 22:11:33 +01:00 · 2025-05-29 22:11:29 +02:00 · 2025-05-29 22:11:29 +02:00 · 091f6a0e91
commit 091f6a0e91
parent cd723b7fe8
2 changed files with 46 additions and 83 deletions
--- a/hosts/fern/secrets.yaml
+++ b/hosts/fern/secrets.yaml
@ -1,43 +1,32 @@
-seb-password: ENC[AES256_GCM,data:G3HaYgGaGJyQuoQHJUYj6df6KAClRy+YlCRHwL8N3QviRWgbalxyU0cgyZzNmcKw0KSPtaqMuixo4+VfhDoTd0MaRDqgViF4Pg==,iv:oWQj47oxjxR3DBHhFwUD/Emj5ziZHwcbXzD69ChRmHU=,tag:xZxssRuv8BBpPFejxoCvNw==,type:str]
-tailscale-auth-key: ENC[AES256_GCM,data:l0VjcJ8gClLJSc72bNm3hbaG686uo0p8m93zDoMR3dx8vuiGgwgmLAUiQQX5J6yK7zJsJ/mLgl9MZ2z3C9E=,iv:uW2l5Z8YuLaSHUGVj8SMZox1gx9OdmBnf7a8QtH+3hY=,tag:kcPLz9vvacs8DEkV7NdaEA==,type:str]
-wlan:
-  WLAN-233151:
-    key: ENC[AES256_GCM,data:o/lkm7M2TyPQ5+NNdBjxi0mtrFg=,iv:Ubj28yyfOqcXQyUs9e0iPq0BscHjfB2vRQd14x8L4Cg=,tag:zilNW8BxOeuGxSuomXo3IA==,type:str]
-  EW90N:
-    key: ENC[AES256_GCM,data:QLd6+Y68HIqHw7NgzBD0+rVIaD+g9LPS+Q==,iv:ZxDzQL6SXcPAxwkqUQN3W6quHTUDEKQY5ahAnKopHGw=,tag:APmwy9XhF5mn8VEQ0OnmXA==,type:str]
-  Fairphone4:
-    key: ENC[AES256_GCM,data:gj9qjPWDvqmv1+PKIKF81c0WQqciMA==,iv:Kg82ZHGCLzPBmEt5G6SK7yzAqEDTVD8MW+OzxG03ZU8=,tag:pEMK12kbbj0V8ubtoaH8wA==,type:str]
-  DSL_EXT:
-    key: ENC[AES256_GCM,data:pv0NAefyLcC82a8yT9U82lqx/wI=,iv:CpP2v9ZGLzVlEU0Tc1Vz0Pa33vuoORshZVKJr3uSBuQ=,tag:STMI58qkz1BkrUDRScq0uA==,type:str]
-  eduroam:
-    password: ENC[AES256_GCM,data:sHIpIA7B+UDr22CZfDvu6tniPf0=,iv:Lk9biaZqC0trXo+RdcpMfaXwmMZH/764RWebtjjDYek=,tag:7cmXRVoqJ45xtTJX/X5AwA==,type:str]
-    cert: ENC[AES256_GCM,data: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,iv:gJctzc0Yp69mZ+dP+97Zs6WYzkZsIg+ATX73GnHkIkY=,tag:pJ2cvOKItgpxN6b1l1gR+A==,type:str]
+seb-password: ENC[AES256_GCM,data:JUmWW1wuVWiRoJc//u09Sv7UXQR7yR9b9hxANBmKEzDPRCeEL0R9Go5lJvffIeBaE9b9Mue2OhzwYqri3he7uaqfT2GPUdZjfw==,iv:oWQj47oxjxR3DBHhFwUD/Emj5ziZHwcbXzD69ChRmHU=,tag:51ncpCWbc4bd6qRO3Cv7iw==,type:str]
+tailscale-auth-key: ENC[AES256_GCM,data:4xRwzt0FLmQLpy6OIKWeouo+0lWEZAvXpSOgwAYojVSKPO3OdV4rpayAOC05TQKhgtN/3AoTsvjLof6wY2c=,iv:uW2l5Z8YuLaSHUGVj8SMZox1gx9OdmBnf7a8QtH+3hY=,tag:Jj3652MPXocHrwhr4hWKLw==,type:str]
+iwd:
+  EW90N.psk: ENC[AES256_GCM,data:wq5soegd7vQBUnIR71XPN06Hz1maJIY3eAUA6Su6X1MEQLfaSUPHYP8xxaGP8DmL,iv:RIh/45UhkyEtjh5Q0FOS63p1RRgLlrRF+QTiFozm4eU=,tag:tV6eVHRs19k+bKyjaAdPmg==,type:str]
+  Fairphone4.psk: ENC[AES256_GCM,data:LMspUmUJSggSa7TvM/KRR2gfcnk88/OXICEZRrZLIF/tCMSiCFPw7mi3fLqF,iv:p80LlUGQkBdeEK63dBDWgWe0n6GtEC2rcn8fToOvD5I=,tag:OWCeGhHACnkrJent/A1t/Q==,type:str]
+  WLAN-233151.psk: ENC[AES256_GCM,data:IDBoXJCGCYPbSzYQ4M0vFNY5ZJ6QzGRhuWL7qvJkARd2gd7Kf2FUDIFvwg==,iv:POBhbAgT3SNqBNqGyv6aWb7RCTB30/UF0+jeLOs8RZk=,tag:pgczpy0CmnyYsYYHjAp1JQ==,type:str]
+  DSL_EXT.psk: ENC[AES256_GCM,data:S4vKzCgcs4PrSw7ZKoqWQprTHDZUmJCruZegcu9hJlnkEFUnnaKCBkAC/w==,iv:5WNg69StrMKqiJdJ4l8AdyvZr/fu1jN8ZN+W+k7VZvY=,tag:oPO3d9pGDLukGA1ZtXSbuw==,type:str]
+  eduroam.8021x: ENC[AES256_GCM,data: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,iv:NfCbkM/zswvdlQ2FhC1/iJMuysPGPE0GG9f2gmonz+k=,tag:7iq3a0I7krGbPWjvGQRa+w==,type:str]
 sops:
-  kms: []
-  gcp_kms: []
-  azure_kv: []
-  hc_vault: []
  age:
    - recipient: age1mpq8m4p7dnxh5ze3fh7etd2k6sp85zdnmp9te3e9chcw4pw07pcq960zh5
      enc: |
        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZZTFYdHA4ektCRkpCMU9S
-        SjBWbnpMZ0tVVEtOaUpJYmNZUFh0VjcrVWxZCjJzM29zOHYwLzNRZHVkRitBNGxC
-        TWR2dzg5UzF2eFdweG1NQUFtaVdDeHcKLS0tIDVxRVp6b2gxVFdTWTFOSzRYZmFV
-        b1hZOTFtaGVwc2JZRlI3VGRqbDVWVG8KAp2kHqHDIN8CRb7EaPADFSp99Y+f4Oub
-        VmrEx9ZI+S7NlunAdzmB2V6I+I2/KMLukOEyOLDy0GPIQEAQ1NSoQg==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPYlhPc0xsdE1ZU3RpSzBI
+        eWdYUFdKL1ovWTJBVEtOclJQelIxTjRPc20wCkdUeU5DZzJXWUlkdWxXM1VPcVFj
+        TkM4ZlllY1lDejdFWnl3Wkp1VEdSbXMKLS0tIFNDc0xOTzhRLzdHQ1RubkllWWFi
+        U1VlTGpjdzlpSzV2QnFtOTNPeGpHOEkKeAIy8xbf1y5PVL1x5B4XHD80gEQ8+wDO
+        UeqaXmITmcLIxgPdVOg7mqaJw/UmKJ3bOJetYnCZOWZ6aV/R1J1EOg==
        -----END AGE ENCRYPTED FILE-----
    - recipient: age1sywwrwse76x8yskrsfpwk38fu2cmyx5s9qkf2pgc68cta0vj9psql7dp6e
      enc: |
        -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0WVlwNWRKcWhZWit3SE5n
-        aTVVeGdnUDJ4dmxtOGNwbjErZHY3bndRMzBZCjRHQjhaMW94VlZQckhxa2gxNHNX
-        di92d3dqdTVaQkMzbU9wOHJxMnAvTlkKLS0tICtGY0s3cGJLN0VJWVZiSHBwQUpw
-        RjZVSDVEM3NoRU82NHhVVHk1UkFKTFkKdn/5Zhj0zcVSDsKfqwcgY2+ADCysMXwm
-        gyTIaGmKhjTbnsvyIe5Anrvqtg3jDsmUnSb2IPjPKuPuaTDt7kil4A==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyTVpkazRqVHdNZVNjZ0VZ
+        Ujk0OXZnZDlpVW14WkFxdUdNaC9mSnE5MERzCkxXKzYzSzVXWFBXV1loV0FlUHZy
+        Y1VaZnI3MmNpUnk4aWdlOWs3MVVlU2MKLS0tIEhucHd4MlVpMGo3a1pQSW1LMlBW
+        NGxZaktVa2V1ZU5JNG5HbWlDaVhnMXcKBHy42a77B2OoXBRJdwdK4D8TQ72aJzey
+        I9uP7+UdbLIabIlpoe2RUd4f9vbfXHzZTD26b0WFQT9kkdKG8jWrzw==
        -----END AGE ENCRYPTED FILE-----
-  lastmodified: "2025-04-17T20:09:08Z"
-  mac: ENC[AES256_GCM,data:FN4u2nBHLkIxfFOEkgHQah6WdFDD58Q7QL+lnp59ALXaCVUK53tPk7snTQ0FQ+qjttEAE/JWOWvt4pq0B/cr8WX2ShDvmvRQaDJUrg2uCinwRaNPj1QDS0cuII8F1Fw4+xPriQu2yi0RGmTQpKfMZoW2z6HtDJP/Q9HbNGF9lrM=,iv:r+Z7m3ewZIJlPSEMfFMfJDBNPQdK8QY9e9qz25l8YlU=,tag:XGYZ5aUJTwtKNjcttxjpmA==,type:str]
-  pgp: []
+  lastmodified: "2025-05-29T17:57:23Z"
+  mac: ENC[AES256_GCM,data:cm7QNzLyDxxGCkjVlBcwYutN4A3NTEaSH/3aVPcOvrsPcUtUzBpIyIsnR7GWErrRICX2nu765Nkt8uQd1RdtMiHvm4F1jB3j7gED2uRKwU0bS+kBnx+tmQx1HCdB4CtHsFW+H3sxJ61Y+06oESZsJrvh5kq9URKfSPb6DHIB/s8=,iv:kB5kCES7TcZ9q/LiyhFzNYMVYa9M8ZwvOv3QnONYMyo=,tag:DTJ25N447vadXb8XekQarw==,type:str]
  unencrypted_suffix: _unencrypted
-  version: 3.9.4
+  version: 3.10.2
--- a/modules/system/wlan.nix
+++ b/modules/system/wlan.nix
@ -5,67 +5,41 @@
  ...
 }:
 let
-  pskSsids = [
-    "WLAN-233151"
-    "EW90N"
-    "Fairphone4"
-    "DSL_EXT"
+  networks = [
+    "EW90N.psk"
+    "Fairphone4.psk"
+    "WLAN-233151.psk"
+    "DSL_EXT.psk"
+    "eduroam.8021x"
  ];
 in
 {
  options.custom.wlan.enable = lib.mkEnableOption "";

  config = lib.mkIf config.custom.wlan.enable (
-    lib.mkMerge [
-      {
-        networking.wireless.iwd = {
-          enable = true;
-          settings = {
-            General.EnableNetworkConfiguration = true;
-            Settings.AutoConnect = true;
-            Network.NameResolvingService = "resolvconf";
-          };
-        };
-
-        environment.systemPackages = [ pkgs.iwgtk ];
-
-        sops = {
-          secrets = {
-            "wlan/eduroam/password" = { };
-            "wlan/eduroam/cert" = { };
+    lib.mkMerge (
+      lib.flatten [
+        {
+          networking.wireless.iwd = {
+            enable = true;
+            settings = {
+              General.EnableNetworkConfiguration = true;
+              Settings.AutoConnect = true;
+              Network.NameResolvingService = "resolvconf";
+            };
          };

-          templates."iwd/eduroam.8021x".content = ''
-            [Security]
-            EAP-Method=PEAP
-            EAP-Identity=anonymous@h-da.de
-            EAP-PEAP-CACert=${config.sops.secrets."wlan/eduroam/cert".path}
-            EAP-PEAP-Phase2-Method=MSCHAPV2
-            EAP-PEAP-Phase2-Identity=sebastian.stork@stud.h-da.de
-            EAP-PEAP-Phase2-Password=${config.sops.placeholder."wlan/eduroam/password"}
-          '';
-        };
-
-        systemd.tmpfiles.rules = [
-          "C /var/lib/iwd/eduroam.8021x - - - - ${config.sops.templates."iwd/eduroam.8021x".path}"
-        ];
-      }
-
-      (lib.mkMerge (
-        lib.forEach pskSsids (ssid: {
-          sops = {
-            secrets."wlan/${ssid}/key" = { };
-            templates."iwd/${ssid}.psk".content = ''
-              [Security]
-              Passphrase=${config.sops.placeholder."wlan/${ssid}/key"}
-            '';
-          };
+          environment.systemPackages = [ pkgs.iwgtk ];
+        }

+        (lib.forEach networks (name: {
+          sops.secrets."iwd/${name}" = { };
+          
          systemd.tmpfiles.rules = [
-            "C /var/lib/iwd/${ssid}.psk - - - - ${config.sops.templates."iwd/${ssid}.psk".path}"
+            "C /var/lib/iwd/${name} - - - - ${config.sops.secrets."iwd/${name}".path}"
          ];
-        })
-      ))
-    ]
+        }))
+      ]
+    )
  );
 }