From a34e69564e2f0480dee789a2355b47a1cb2e5565 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 3 Dec 2022 11:59:58 +0100 Subject: [PATCH] serverle: fix wifi with NetworkManager --- nixos/serverle/secrets.yaml | 6 +++--- nixos/serverle/wifi.nix | 9 ++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/nixos/serverle/secrets.yaml b/nixos/serverle/secrets.yaml index ee10752..5099332 100644 --- a/nixos/serverle/secrets.yaml +++ b/nixos/serverle/secrets.yaml @@ -2,7 +2,7 @@ users: felix: password: ENC[AES256_GCM,data:mrG5gb0wbjA2S0sd,iv:86PZWbVR2BkB6+c9KrtnFh1j/kJtiFJXlXEQMFqEmZA=,tag:WUXrp4+/KW+X+wUp0omqdg==,type:str] wifi: - bismarck: ENC[AES256_GCM,data:rvbPxpQ/IcyPXNUOq6F2H7sSpnmO2JGArS0=,iv:cZ5RA62W2G8j3cbxFJk3xZJmqw2jUQvABWIGHJmmVPw=,tag:YpwPSiAdA35PEjD5K6zV2Q==,type:str] + bismarck: ENC[AES256_GCM,data:6mcU+o6GiBelKq5Av2hJdHigf+yyQRO/qXV0DbGeri00CaO1cjjGka86C/t0NAoh8EaJeLPd6lZQspeUTIdqJMleQLhmq1zk1qGw65fvEphCsWkKUsUd6flWODdmll80mmYLpllX6hmZ8I/Of7EVZPn4WEiw4M2HB1UCw5+M0W2H0MJrjlskafbL9+uYtMeoUikXVMTYNAkX3+9+MZi3KzDMEc6JVt1fQZHjXkdeKx+2iVsaXEtXL72Dbj3ihlpA+WRhgZOmrrbablYde71mpzSuQ/yqeTZT+2NCMUmkYaj0dGz4FW0gJMPzjHjji8CopeOK7/CQM/MMWGFJXR2Xdea8X/YdDoVAz34WraGylYzK9e7a1C+s37mekt6c/bvuiQ==,iv:DH0LDw1pZ5m9RScJ3+IhjUb5JroLLOJ3jru7DwCKXv0=,tag:r57fz+W2nEybNqOc8eEDFA==,type:str] borgbackup: password: ENC[AES256_GCM,data:vXa1LO8Akwume5PVsxny59H5FDI+HTo=,iv:RKiriS4VHP3HDMRPS5e3Fz5rsDMpqQpZgC7XFI3hAWU=,tag:XHZNH4cLJzmSuF6k+gJ3cg==,type:str] private_ssh_key: ENC[AES256_GCM,data:GrK7aWNUZymdgCwqemKu/7Ruh7hduHPdStzCf326beBj4sCr2CXYo9HKCIJHSnRrywzT5gqWmcEFew9qo08G4kpxIeqthcpxsIaVYVqRjusT2WL6jiLHsGqMa2R+Vui2NO5ZuGrnTdS6CWxSpno0EjT2rNG29vA8Uhort7iANRVrY20MDpiAfU675yGThOvgR7833KODS0S+cKuKKq7/8qkSgVH4KIGqjGbRsVIlgFAs/eVNHS79NKR2XdU/uBi1ahH4bTvVuV6lJAoBYEwgfiHhuGaBayhqnEzWPyilme26xjZBw/0/itd7fhNnfpdMLnOqx56kQpJMVzOxd6chX3BQawsl42IyFuYbYqPICl1jjEqdHzEFbctgYS/p4iv59l6enw+vDb4T6Toa1fqAvJSiaKltinXjZsO1SqQVCQEdLEMgufn+3VsVXYQ9WHBH9RdqLJ1u79rFYGZtIkkNjJRnREHUISkYVCJrwzphi+p4teNWnMDCq/Is6oFdY2x8lVNRq2mHhoY7iLpCUzZj,iv:FIPsM1k42srkPUbOR5Ex7M3TnDUAYCZshWBGETbZlJE=,tag:1uiiqGjuQK2BB4nVV7h1KQ==,type:str] @@ -33,8 +33,8 @@ sops: a1BjcjVaM01UV0o5bTFTVTE5QUZKMmsKPAGYDf1FVtp4+Z/KUrI6z0aZYEwN1DYa jKtA1IUXrmdaRllN0SfC+YjMXTk7IoJvrjagCv9Zo0zEKasfO8PL4g== -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-10-26T20:55:54Z" - mac: ENC[AES256_GCM,data:FesPb9lTyB8b9PBJkRFibT9uVP+TZnKOESrifW0gHR8Lf1VjAERFnK55GdDoYt3d4q/3PfI14jUXHYnoKM8rFt3KHnWAWQcsxVB5TiiThYvJ0bxu3KmPHOSlmJUFoTYc6if4FA4r0WfawKy2tBgfdMyKIBVHCcDh66Oy6kq/M+w=,iv:w7Vr1KZvBNXv5/8YS4b/srKP9g55/VTpN8tAd28e6sc=,tag:S21j0uWSYFalPeXE73FX+Q==,type:str] + lastmodified: "2022-12-01T22:05:10Z" + mac: ENC[AES256_GCM,data:BGjTt/4Db8vM+hOJoFybwyaBNcsdafe5gFDJT24kl7t+YTbMuVYdBa2tixs2LGA305s/dVfFNw4waYsENZ+rUfY7S4hhty4zG+0vk0QDy21Qrf43GGWe5Eczoz6QqwbxgkwcJTJY/4FoxeEOAI0LrkiC4URSI33eB5Y8r6CqHYE=,iv:iPzXg0OjVjF0i2BdZEYOVGu6NbC5HGnfd1uqxyMVVWU=,tag:zB6oDcjsuNX02SaYZXOFzA==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/nixos/serverle/wifi.nix b/nixos/serverle/wifi.nix index 19cae76..f75b752 100644 --- a/nixos/serverle/wifi.nix +++ b/nixos/serverle/wifi.nix @@ -1,11 +1,6 @@ { config, ... }: { - sops.secrets."wifi/bismarck" = { }; - - networking.wireless = { - environmentFile = config.sops.secrets."wifi/bismarck".path; - networks = { - "Bismarck WLAN".psk = "@PSK_BISMARCK@"; - }; + sops.secrets."wifi/bismarck" = { + path = "/etc/NetworkManager/system-connections/Bismarck WLAN.nmconnection"; }; }