commit 193a1154e89d0f06be188df226d0d6afdf74c60d
parent cc7b9c1ec39ed81f8dd66d5665f1f504e6195cbb
Author: Milutin Popovic <milutin@popovic.xyz>
Date: Sat, 3 Jan 2026 21:16:58 +0000
resolved nm setup
Diffstat:
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/modules/nix_settings.nix b/modules/nix_settings.nix
@@ -6,7 +6,6 @@
nix = {
enable = true;
package = pkgs.nix;
- channel.enable = false;
settings = {
use-xdg-base-directories = true;
experimental-features = [ "nix-command" "flakes" ];
diff --git a/modules/nm.nix b/modules/nm.nix
@@ -3,20 +3,20 @@
sops = {
secrets = {
"networking/gajba" = {};
- "networking/wg0-ponnect_prv" = {};
- "networking/wg0-ponnect_pre" = {};
- "networking/wg0-router_prv" = {};
- "networking/wg0-server_prv" = {};
- "networking/wg0-server_pre" = {};
+ "networking/wg0_ponnect_prv" = {};
+ "networking/wg0_ponnect_pre" = {};
+ "networking/wg0_router_prv" = {};
+ "networking/wg0_server_prv" = {};
+ "networking/wg0_server_pre" = {};
};
templates.wifi = {
content = ''
Gajba=${config.sops.placeholder."networking/gajba"}
- wg0-ponnect_prv=${config.sops.placeholder."networking/wg0-ponnect_prv"}
- wg0-ponnect_pre=${config.sops.placeholder."networking/wg0-ponnect_pre"}
- wg0-router_prv=${config.sops.placeholder."networking/wg0-router_prv"}
- wg0-server_prv=${config.sops.placeholder."networking/wg0-server_prv"}
- wg0-server_pre=${config.sops.placeholder."networking/wg0-server_pre"}
+ wg0_ponnect_prv=${config.sops.placeholder."networking/wg0_ponnect_prv"}
+ wg0_ponnect_pre=${config.sops.placeholder."networking/wg0_ponnect_pre"}
+ wg0_router_prv=${config.sops.placeholder."networking/wg0_router_prv"}
+ wg0_server_prv=${config.sops.placeholder."networking/wg0_server_prv"}
+ wg0_server_pre=${config.sops.placeholder."networking/wg0_server_pre"}
'';
};
};
@@ -123,13 +123,13 @@
};
proxy = { };
wireguard = {
- private-key = "$wg0-ponnect_prv";
+ private-key = "$wg0_ponnect_prv";
};
"wireguard-peer.vadaAF6n58daN9sqQ7o2yUjy8CmKXbXSWzIrzVqHUCs=" = {
allowed-ips = "0.0.0.0/0;::/0;";
endpoint = "ponnect.rs:1194";
persistent-keepalive = "25";
- preshared-key = "$wg0-ponnect_pre";
+ preshared-key = "$wg0_ponnect_pre";
preshared-key-flags = "0";
};
};
@@ -154,7 +154,7 @@
};
proxy = { };
wireguard = {
- private-key = "$wg0-router_prv";
+ private-key = "$wg0_router_prv";
};
"wireguard-peer.M1KoNQqQ3zK4hYnblqwJw34x8R46jAJaJlXJKOKxg2g=" = {
allowed-ips = "0.0.0.0/0;::/0;";
@@ -183,12 +183,12 @@
};
proxy = { };
wireguard = {
- private-key = "$wg0-server_prv";
+ private-key = "$wg0_server_prv";
};
"wireguard-peer.HLNNBQypzLWhWE4UFB2zd7bk9pmAC4iWM8qpDeDGwDw=" = {
allowed-ips = "0.0.0.0/0;::/0;";
endpoint = "213.136.71.18:1194";
- preshared-key = "$wg0-server_pre";
+ preshared-key = "$wg0_server_pre";
preshared-key-flags = "0";
};
diff --git a/modules/packages.nix b/modules/packages.nix
@@ -35,6 +35,7 @@ with pkgs; {
nix
just
htop
+ sops
];
shell = [
diff --git a/secrets.yaml b/secrets.yaml
@@ -1,10 +1,10 @@
networking:
gajba: ENC[AES256_GCM,data:H4K2HIZ/j3N0HHBc0X9g7paNKotXhzxPP14=,iv:uYCw2kMp1skUfeDKXNN0pfhZ/OpWt2igEmrZ8zgdDVs=,tag:l8u+XGCYnCfPazqopbciZA==,type:str]
- wg0-router_prv: ENC[AES256_GCM,data:n1MebQ4/cLAJ2wHfRwG/khYodJguzsMwSq5/Z1GKIf2JlvzpibWem4ugM/g=,iv:vsylHrGJJN81Izj8s5tMz36yKlI7Ir5ky1yGzPIGavk=,tag:l0Ep3Y3VHvHomTgOHo66yw==,type:str]
- wg0-ponnect_prv: ENC[AES256_GCM,data:qRZOCzRM5aLF930Q9wMG4A+OQfHtypzWOWeC7r/OBNd7N+M7pzBOvJb0iLk=,iv:mKbXHRMVgdSPVBIXULAf4Xx1s0GfDFs547dj0xRS3Ho=,tag:VvKzHyBqmKFK4rCdT5QrqQ==,type:str]
- wg0-ponnect_pre: ENC[AES256_GCM,data:HCdXc4nin8ixFoHeRmQ/05hDLSE7NhVbLC1ggwWPxry8bEwWhlxZ26jJaT0=,iv:C+1t2AKMKuTX371qWh6WNCdoLVDRYnAJ2MHqE0syysw=,tag:U09X1B2PDrbQ9pFKubsSGg==,type:str]
- wg0-server_prv: ENC[AES256_GCM,data:5BWcK3IsMGOxcQ3gQO6zDZk4ZFXt9c1E+3bQ4WlS+62HF4RLAsW13ODuJIg=,iv:Qzie7d6J+zwW7xR4OsS8wG4fjoB7LmmP0qxJMHHdI3k=,tag:3T03q41F9GaGexphS+tFsQ==,type:str]
- wg0-server_pre: ENC[AES256_GCM,data:fhnKaLxt/yV64wPa+nML+Fa6FZ8c0iqirSUbXe/FyyTE8ZBCimzvXanizEc=,iv:mY1rJcpy6aG5zm4gUhtvw/h4KHVL3YlOCOPIbJHr4zY=,tag:8+KY5hkwored7TGRJn3fZA==,type:str]
+ wg0_router_prv: ENC[AES256_GCM,data:oL6SF+kKtDY6RnrKcTAbKrJSo/PEqJ4IjcvxmVJkcjGwJy8TsWVZDDrRZXo=,iv:KZEIugslViXmm88gLOFTWbJbdvVLm3C1+REpDc6iFMs=,tag:AvL4tVLrLXWGkdohdlj0/g==,type:str]
+ wg0_ponnect_prv: ENC[AES256_GCM,data:I1kTq9ZddFoRG3Pv35VBmIKuZd7dIzajA444oFQPauIzHrtm8Rz+3OZvGR4=,iv:0GIUzPp5JseuPZg8SegAPAu5hTrWXC7ST0kTwdJFJ88=,tag:t32HSOg4oDWU11LKu892gg==,type:str]
+ wg0_ponnect_pre: ENC[AES256_GCM,data:A48nonw73BPSqaHJ3pqzExGbA0+mDIj4PkHU/79CBecmwh4ENePceyn8BPw=,iv:llqqARthrew/aDu6+f4XVByxqiw1PIOZIiUWU5l7nVY=,tag:NnwAnQZKf1YZs/GZEcRptA==,type:str]
+ wg0_server_prv: ENC[AES256_GCM,data:TThVPPzl89/GkF9wo8Oko/SET/RYDhCYp7LQV2otflOUhEK9JFkIel5eDtE=,iv:mrQrUPjG+5VSPNHTQEr/BD8yBeXKOChFE7hbNwAa8pA=,tag:45umJlm0AJTcpap6rwGhxg==,type:str]
+ wg0_server_pre: ENC[AES256_GCM,data:w8yLoKKFMmfU4iovgIPcJh9Z68+1NRb6G7KM4alUKH48yjKy4zOfH0HgZKc=,iv:rlWbp7Kg1LeTQu9FgXzIoJx0HmVs3Wjl7nG7l6PMMww=,tag:kiG0NOUWCFlYRDcnQ8YeMw==,type:str]
sops:
age:
- recipient: age1u0qxd3jqhmmq0r0n6n8xgwmxcvlh2tptjcwdznw2vfxcje006s7s07w6jq
@@ -16,7 +16,7 @@ sops:
azBYbXd6R2tnSDZxckNVUDN4K1FhS2MKIAJUtmMR8w/2SqT42byp0bN6Dcn0g18P
FUgHv4/BhRooHFj0k8yok6yW63inJ7D0bTMaq7QxO/m6mojOgCIsJw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2026-01-01T01:28:57Z"
- mac: ENC[AES256_GCM,data:TIAxjsmU0f1PvBtHXcPylLp6VJ1VEvvfHoinFVcsogzYJ0EcQ8DYMbThVp1umFgIIQtmDrJqWbI7LKYeKL1fwjw6u4ZNZWAdTPupb1d/E+lPU1svFPVrU3UbF0akzeoM9U6yAUQjZUKZaO3ByR/dAOQCWaXe7fG/8OzkjE1FFpQ=,iv:sqcIdPcaEnLbEh4goDnvl2qt4VLeN3B1XcW35+4ATZc=,tag:3GL7dPik0XpCZ6MLA2ZvmA==,type:str]
+ lastmodified: "2026-01-03T21:12:07Z"
+ mac: ENC[AES256_GCM,data:6X2Ts9sWLgRD/gjleqRIdaeeOkIB+k+UiBxjoY9n+LVPNQU27qSD8bLpoLcqn+IjNtwb6FkWblS3flPnlFc4UEO6E2EgnER+hes1OnLFr1dk/AXlq5AE+WqQEAcbdWs1G7yj9u1rf2Cc+j95johjqiBi8AjowFSEuGZMrNUZcEA=,iv:wBMXEfJncM0SpPM6D+UOC90Hty9wZZe4wSVCgW4iDaU=,tag:kE5bmjHL1xN47HX1lhLDfw==,type:str]
unencrypted_suffix: _unencrypted
version: 3.11.0
