diff --git a/hosts/backwards/modules/network/default.nix b/hosts/backwards/modules/network/default.nix index cbd9d05..619931a 100644 --- a/hosts/backwards/modules/network/default.nix +++ b/hosts/backwards/modules/network/default.nix @@ -1,10 +1,22 @@ +{ config, ... }: { networking = { hostName = "backwards"; networkmanager.enable = false; - wireless.enable = true; + #wireless.networks are defined in the secret `wpa_supplicant.conf` + wireless = { + enable = true; + + secretsFile = config.age.secrets.wireless-network-secrets.path; + + networks = { + "w1-f1_5G" = { + pskRaw = "ext:w1-f1_psk"; + }; + }; + }; defaultGateway = "192.168.50.1"; nameservers = [ "1.1.1.1" ]; @@ -24,9 +36,6 @@ }; age.secrets = { - "wpa_supplicant.conf" = { - file = ../../../../secrets/backwards/wpa_supplicant.conf.age; - path = "/etc/wpa_supplicant.conf"; - }; + "wireless-network-secrets".file = ../../../../secrets/backwards/wireless-network-secrets.age; }; } diff --git a/secrets/backwards/wireless-network-secrets.age b/secrets/backwards/wireless-network-secrets.age new file mode 100644 index 0000000..5d131ae Binary files /dev/null and b/secrets/backwards/wireless-network-secrets.age differ diff --git a/secrets/backwards/wpa_supplicant.conf.age b/secrets/backwards/wpa_supplicant.conf.age deleted file mode 100644 index 7ae2fe4..0000000 Binary files a/secrets/backwards/wpa_supplicant.conf.age and /dev/null differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 0923d5b..b6fd1aa 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -38,7 +38,7 @@ in { "backwards/alex.backwards-codeberg.org.pub.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-git.ppp.pm.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-git.ppp.pm.pub.age".publicKeys = [ backwards alex ]; - "backwards/wpa_supplicant.conf.age".publicKeys = [ backwards alex ]; + "backwards/wireless-network-secrets.age".publicKeys = [ backwards alex ]; "tadpole/root.tadpole.age".publicKeys = [ tadpole alex ]; "tadpole/root.tadpole.pub.age".publicKeys = [ tadpole alex ];