Merge branch 'master' of publicgit:nixosHEADmaster

1 files changed, 4 insertions, 12 deletions

diff --git a/users/timmy/wifi.nix b/users/timmy/wifi.nix
index 8c762b0..ab5332f 100644
--- a/users/timmy/wifi.nix
+++ b/users/timmy/wifi.nix
@@ -6,20 +6,12 @@ in {
 	};
 
 	config = lib.mkIf cfg.enable {
-		networking.wireless = {
-			enable = true;  # Enables wireless support via wpa_supplicant.
-			userControlled.enable = true;
-			allowAuxiliaryImperativeNetworks = true;  # Networks defined in aux imperitive networks (/etc/wpa_supplicant.conf)
-		};
-
 		# Load wpa_supplicant.conf secret config
-		sops.secrets.wpa_supplicant-conf = {
-			sopsFile = ./resources/secrets/wpa_supplicant-conf.yaml;
-		};
+		sops.secrets.wpa_supplicant-conf.sopsFile = ./resources/secrets/wpa_supplicant-conf.yaml;
 
-		# Link /etc/wpa_supplicant.conf -> secret config
-		environment.etc."wpa_supplicant.conf" = {
-			source = config.sops.secrets.wpa_supplicant-conf.path;
+		networking.wireless = {
+			enable = true;  # Enables wireless support via wpa_supplicant.
+			_extraSecretConfigs.networks = config.sops.secrets.wpa_supplicant-conf.path;  # Load secret network config via systemd credential
 		};
 	};
 }