diff --git a/nix/deployments/nixops.nix b/nix/deployments/nixops.nix index 82d6c27..ac295f4 100644 --- a/nix/deployments/nixops.nix +++ b/nix/deployments/nixops.nix @@ -76,8 +76,8 @@ in ../system/svalbard/configuration.nix ../home/programs/flood ]; - networking.wireless.networks.N904.pskRaw = ( - (import ../system/framework/keys.nix).wifi.N904.pskRaw + networking.wireless.networks."ShamblingHalfling 5Ghz-1".pskRaw = ( + (import ../system/framework/keys.nix).wifi."ShamblingHalfling 5Ghz-1".pskRaw ); services.nfs.server.enable = true; diff --git a/nix/system/framework/keys.nix b/nix/system/framework/keys.nix index 58fa4f1..b74630c 100644 --- a/nix/system/framework/keys.nix +++ b/nix/system/framework/keys.nix @@ -9,8 +9,14 @@ }; wifi = { + # These wifi names must match exactly the network names used for + # wpa_supplicant configuration! N904 = { pskRaw = if builtins.pathExists "/home/haak/dotfiles/secrets/wifi/n904/pskRaw.txt" then builtins.readFile "/home/haak/dotfiles/secrets/wifi/n904/pskRaw.txt" else null; }; + + "ShamblingHalfling 5Ghz-1" = { + pskRaw = if builtins.pathExists "/home/haak/dotfiles/secrets/wifi/ShamblingHalfling 5Ghz-1/pskRaw.txt" then builtins.readFile "/home/haak/dotfiles/secrets/wifi/ShamblingHalfling 5Ghz-1/pskRaw.txt" else null; + }; }; } diff --git a/nix/system/svalbard/configuration.nix b/nix/system/svalbard/configuration.nix index 913755d..6cfcc2d 100644 --- a/nix/system/svalbard/configuration.nix +++ b/nix/system/svalbard/configuration.nix @@ -28,6 +28,7 @@ networking.hostId = "f9e8e9e8"; networking.wireless = { enable = true; # Enables wireless support via wpa_supplicant. + userControlled.enable = true; }; networking.nat.externalInterface = "wlo1"; diff --git a/secrets b/secrets index b3f7d52..70b9503 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit b3f7d52bad7b9c7a1bc235f455a8feddf0f5bb7e +Subproject commit 70b9503c98eb2f690a6c7461549ca59be3089db2