Compare commits
10
Commits
086d8651ff
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c9802ffc7 | ||
|
|
5e87128f4b | ||
|
|
6c8449103c | ||
|
|
83836af9b1 | ||
|
|
52d956f169 | ||
|
|
14dc52b584 | ||
|
|
55fc4e90d1 | ||
|
|
fd4c3d9a3d | ||
|
|
6998f64d88
|
||
|
|
9a99024688
|
No files matched your search
Generated
+21
-21
@@ -76,11 +76,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1793355509,
|
||||
"narHash": "sha256-/Zs18x+IW4LuVH0rKxra0WPRgsk0DQsi0Bwkf8sOC5c=",
|
||||
"lastModified": 1794597451,
|
||||
"narHash": "sha256-bUkc9dMpCFiJuuf5Efr7pnCDs5q18aA8zJah+MYZl9w=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "04c6b94fa104bc23650983a4513aea196794d321",
|
||||
"rev": "eb3c90bd715f7a9a28719bb014f53d309ccb2fc8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -96,11 +96,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1792818383,
|
||||
"narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=",
|
||||
"lastModified": 1794251182,
|
||||
"narHash": "sha256-R2sZBXiOJo3HAnvTiVkbbHDJy//JMlAwUKEiPbfqPXk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "24f2190587513b9c2f73db112a17844ae912d965",
|
||||
"rev": "6eb2d33d1d0c95a37ef6443c88e6c1686012ee8b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -131,11 +131,11 @@
|
||||
},
|
||||
"nixUnstable": {
|
||||
"locked": {
|
||||
"lastModified": 1793345420,
|
||||
"narHash": "sha256-e/yiZ31gXRROBDcnOtT3YwDQ73NVG9Cepccbt86LIn8=",
|
||||
"lastModified": 1794495034,
|
||||
"narHash": "sha256-E0hYoioqUtM2XmPPvYYpJgdADF5AW9oOoPSEiM9dTHQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "885ba4d038f10c3d17d7a92e8c3cc185b99c9158",
|
||||
"rev": "2074cc672349f14240fb7ea90d509e0b643e9dd4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -153,11 +153,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1792982269,
|
||||
"narHash": "sha256-5R5CFIKj06qTQevhg/rCFUSAMxfNgdn0oIBL57R7u0Y=",
|
||||
"lastModified": 1794368463,
|
||||
"narHash": "sha256-ncpk0eCCyhU7M7U/PGbtwb1PXqobksBBYbJJ13abV2g=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-wsl",
|
||||
"rev": "e45b24b7df093299072b13bf3144ed0ee340e769",
|
||||
"rev": "05721a428830972f025a8575b1a19c418d422d1b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -211,11 +211,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1793410479,
|
||||
"narHash": "sha256-HzgjxrLY4AEc0044ZuM5CHbLSWLZgDlay1idmzvvpJs=",
|
||||
"lastModified": 1794552581,
|
||||
"narHash": "sha256-qXFIqA6FCcx7XeDzw0ZNlkDT9UiCzrNDwK8RuU8RcHM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fa1373130d5a21c040a47c5dbe1913d59ed91808",
|
||||
"rev": "f1e5c356f35d07e7b71a6b5e6c9338e0b029e0c0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -245,11 +245,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1793052255,
|
||||
"narHash": "sha256-Y/JIHTnMlOabDfyaSBubWGLDIVGihLEUuoMhFvQKaDo=",
|
||||
"lastModified": 1794624949,
|
||||
"narHash": "sha256-3q/hxp/flW1PnV3Dx+H3p8kHGEHJ7251BqVMNsAAB9E=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "60182817ee048ac94b4c68ea76d5ef2e8aac730d",
|
||||
"rev": "11e5885d241743ff0193465d533b20e754bc3ce0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -263,11 +263,11 @@
|
||||
"flake-parts": "flake-parts"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1792669057,
|
||||
"narHash": "sha256-3dBWR7+z35n1Rrg68MghpGEUu9RnlKRzSDrkCzKXj7Q=",
|
||||
"lastModified": 1794081290,
|
||||
"narHash": "sha256-vJCjuYXp06XZ9rufttvv/W3mkzQzefYxEvmmsZfUmvw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-vscode-server",
|
||||
"rev": "442c629540ed1e85cd2aed813a65b7eaa7ff27c5",
|
||||
"rev": "e8aac40ed8d76486859741b1608badeca3475943",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
(deflisten net
|
||||
:initial '{"wifi":{"connected":false,"enabled":false,"icon":"","ssid":"","ip":"","freq":0,"band":"","gen":"","signal":0},"ethernet":{"connected":false,"interface":"","ip":"","speed":""},"usb":{"connected":false,"interface":"","ip":""},"wireguard":[],"vpn":{"up":false,"name":""}}'
|
||||
:initial '{"wifi":{"connected":false,"enabled":false,"icon":"","ssid":"","ip":"","freq":0,"band":"","gen":"","signal":0},"ethernet":{"connected":false,"interface":"","ip":"","speed":""},"usb":{"connected":false,"interface":"","ip":""},"wireguard":[],"vpn":{"up":false,"full":false,"name":""}}'
|
||||
"scripts/net/net")
|
||||
|
||||
(deflisten bt
|
||||
@@ -23,7 +23,7 @@
|
||||
(label
|
||||
:visible {net.vpn.up}
|
||||
:class "net-icon net-active"
|
||||
:tooltip "VPN: ${net.vpn.name}"
|
||||
:tooltip {net.vpn.full ? "VPN: all traffic through ${net.vpn.name}" : "WireGuard: ${net.vpn.name}"}
|
||||
:text "")
|
||||
(label
|
||||
:class "net-icon ${net.wifi.connected ? 'net-active' : 'net-dim'}"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
# Network state for the bar icons and the net panel: wifi, ethernet and USB
|
||||
# tethering. Refreshes on link/address changes and every 30 s (signal level).
|
||||
# tethering. Refreshes on link/address/rule changes and every 30 s (signal level).
|
||||
|
||||
wifi_iface() { awk 'NR > 2 { sub(":", "", $1); print $1; exit }' /proc/net/wireless; }
|
||||
eth_iface() { ip -o link 2>/dev/null | awk '$2 ~ /^en[op]/ { sub(":", "", $2); print $2; exit }'; }
|
||||
@@ -84,7 +84,7 @@ state() {
|
||||
wg_ifaces() {
|
||||
{
|
||||
systemctl list-units --all --plain --no-legend 'wireguard-*.service' 2>/dev/null \
|
||||
| awk '$1 !~ /-peer-/ { sub(/^wireguard-/, "", $1); sub(/\.service$/, "", $1); print $1 }'
|
||||
| awk '$1 !~ /-peer-|-vpn\.service$/ { sub(/^wireguard-/, "", $1); sub(/\.service$/, "", $1); print $1 }'
|
||||
ip -d -o link 2>/dev/null | awk '/ wireguard / { sub(":", "", $2); print $2 }'
|
||||
} | sort -u
|
||||
}
|
||||
@@ -97,10 +97,12 @@ human_bytes() {
|
||||
}
|
||||
|
||||
wg_json() { # prints the "wireguard" array and the "vpn" summary
|
||||
local name up ip rx tx peers endpoint peer_unit peer_script sep="" out="[" vpn_up=false vpn_name=""
|
||||
local name up ip rx tx peers endpoint peer_unit peer_script vpn_able vpn sep="" out="[" vpn_up=false vpn_name="" vpn_full=false
|
||||
while read -r name; do
|
||||
[[ -n $name ]] || continue
|
||||
up=false ip="" rx=0 tx=0 endpoint=""
|
||||
up=false ip="" rx=0 tx=0 endpoint="" vpn_able=false vpn=false
|
||||
[[ $(systemctl show -p LoadState --value "wireguard-$name-vpn.service" 2>/dev/null) == loaded ]] && vpn_able=true
|
||||
systemctl is-active --quiet "wireguard-$name-vpn.service" 2>/dev/null && vpn=true
|
||||
if [[ -d /sys/class/net/$name ]]; then
|
||||
ip -o link show "$name" 2>/dev/null | grep -q '<[^>]*UP' && up=true
|
||||
ip=$(ipv4 "$name")
|
||||
@@ -120,14 +122,15 @@ wg_json() { # prints the "wireguard" array and the "vpn" summary
|
||||
fi
|
||||
if [[ $up == true && $vpn_up == false ]]; then vpn_up=true vpn_name=$name; fi
|
||||
[[ -z $vpn_name ]] && vpn_name=$name
|
||||
out+="$sep{\"name\":\"$(jstr "$name")\",\"up\":$up,\"ip\":\"$ip\",\"rx\":\"$(human_bytes "$rx")\",\"tx\":\"$(human_bytes "$tx")\",\"peers\":\"$(jstr "$peers")\",\"endpoint\":\"$(jstr "$endpoint")\"}"
|
||||
[[ $vpn == true ]] && vpn_full=true vpn_name=$name
|
||||
out+="$sep{\"name\":\"$(jstr "$name")\",\"up\":$up,\"ip\":\"$ip\",\"rx\":\"$(human_bytes "$rx")\",\"tx\":\"$(human_bytes "$tx")\",\"peers\":\"$(jstr "$peers")\",\"endpoint\":\"$(jstr "$endpoint")\",\"vpn_able\":$vpn_able,\"vpn\":$vpn}"
|
||||
sep=,
|
||||
done < <(wg_ifaces)
|
||||
printf '"wireguard":%s],"vpn":{"up":%s,"name":"%s"}' "$out" "$vpn_up" "$(jstr "$vpn_name")"
|
||||
printf '"wireguard":%s],"vpn":{"up":%s,"full":%s,"name":"%s"}' "$out" "$vpn_up" "$vpn_full" "$(jstr "$vpn_name")"
|
||||
}
|
||||
|
||||
refresh() { emit "$(state)"; }
|
||||
_link_events() { exec ip monitor link address; }
|
||||
_link_events() { exec ip monitor link address rule; }
|
||||
|
||||
refresh
|
||||
mux_init
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
# Toggle VPN mode (all traffic through the tunnel) of WireGuard interface $1,
|
||||
# independently of the tunnel itself. Starting it brings the tunnel up.
|
||||
# Needs the polkit rule from modules/nixos/system/network/wireguard.
|
||||
name=$1
|
||||
[[ -n $name ]] || exit 64
|
||||
detach_self "$@"
|
||||
unit=wireguard-$name-vpn.service
|
||||
if systemctl is-active --quiet "$unit"; then
|
||||
systemctl stop "$unit"
|
||||
else
|
||||
systemctl start "$unit"
|
||||
fi
|
||||
@@ -96,12 +96,19 @@
|
||||
(box :orientation "v" :space-evenly false :class "wg-row"
|
||||
(box :orientation "h" :space-evenly false :valign "center"
|
||||
(label :class "wg-name ${wg.up ? 'wg-up' : 'wg-down'}" :halign "start" :hexpand true :text {wg.name})
|
||||
(button
|
||||
:class "net-toggle-btn net-add-btn ${wg.vpn ? 'net-toggle-on' : 'net-toggle-off'}"
|
||||
:visible {wg.vpn_able}
|
||||
:onclick "scripts/net/wg-vpn-toggle ${wg.name}"
|
||||
:tooltip {wg.vpn ? "VPN: all traffic through ${wg.name}" : "VPN off: only the private subnet"}
|
||||
(label :text ""))
|
||||
(button
|
||||
:class "net-toggle-btn ${wg.up ? 'net-toggle-on' : 'net-toggle-off'}"
|
||||
:onclick "scripts/net/wg-toggle ${wg.name}"
|
||||
:tooltip {wg.up ? "Disconnect" : "Connect"}
|
||||
(label :text {wg.up ? "" : ""})))
|
||||
(box :orientation "v" :space-evenly false :visible {wg.up}
|
||||
(netinfo-row :label "Routing" :value {wg.vpn ? "All traffic" : "Private subnet"})
|
||||
(netinfo-row :label "IP" :value {wg.ip})
|
||||
(netinfo-row :label "Peer" :value {wg.endpoint != "" ? "${wg.peers} · ${wg.endpoint}" : wg.peers})
|
||||
(netinfo-row :label "Traffic" :value " ${wg.rx} ${wg.tx}"))
|
||||
|
||||
@@ -21,6 +21,7 @@ let
|
||||
"scripts/net/bt" = mkScript "bt" ./bar/scripts/net/bt [ jq glib ];
|
||||
"scripts/net/bt-toggle" = mkScript "bt-toggle" ./bar/scripts/net/bt-toggle [ bluez ];
|
||||
"scripts/net/wg-toggle" = mkScript "wg-toggle" ./bar/scripts/net/wg-toggle [ ];
|
||||
"scripts/net/wg-vpn-toggle" = mkScript "wg-vpn-toggle" ./bar/scripts/net/wg-vpn-toggle [ ];
|
||||
"scripts/net/wifi-connect" = mkScript "wifi-connect" ./bar/scripts/net/wifi-connect [ eww wpa_supplicant wofi libnotify ];
|
||||
"scripts/sys/gpu" = mkScript "gpu" ./bar/scripts/sys/gpu [ custom.amdgpu_top jq ];
|
||||
"scripts/sys/memory" = mkScript "memory" ./bar/scripts/sys/memory [ ];
|
||||
@@ -52,6 +53,12 @@ in {
|
||||
# graphical session, opens the bar once the daemon answers, and is
|
||||
# restarted on crash. `eww-bar` (packages/eww-bar) does the heavy
|
||||
# lifting; kanshi calls `eww-bar place` to move the bar between outputs.
|
||||
home.activation.ewwReload = lib.hm.dag.entryAfter [ "linkGeneration" ] ''
|
||||
if ${pkgs.systemd}/bin/systemctl --user is-active --quiet eww.service; then
|
||||
run ${ewwBar} reload || true
|
||||
fi
|
||||
'';
|
||||
|
||||
systemd.user.services.eww = {
|
||||
Unit = {
|
||||
Description = "eww daemon and bar";
|
||||
|
||||
@@ -5,6 +5,37 @@
|
||||
(p.syscfg.net.wg.enable == true) &&
|
||||
(p.syscfg.net.wg.pubkey != config.syscfg.net.wg.pubkey);
|
||||
activePeers = builtins.filter isValidPeer config.syscfg.peers;
|
||||
|
||||
isServer = config.syscfg.server ? wireguard && config.syscfg.server.wireguard;
|
||||
vpnPeer = {
|
||||
name = "vpn-helcel";
|
||||
publicKey = "NFBJvYXZC+bd62jhrKnM7/pugidWhgR6+C5qIiUiq3Q=";
|
||||
allowedIPs = [ "10.10.1.0/24" "fd10:10:10::0/64" ];
|
||||
};
|
||||
|
||||
vpnTable = "51820";
|
||||
vpnDown = pkgs.writeShellScript "wg0-vpn-down" ''
|
||||
PATH=${lib.makeBinPath [ pkgs.iproute2 pkgs.wireguard-tools ]}
|
||||
for f in -4 -6; do
|
||||
ip $f rule del pref 31000 2>/dev/null
|
||||
ip $f rule del pref 31001 2>/dev/null
|
||||
ip $f route flush table ${vpnTable} 2>/dev/null
|
||||
done
|
||||
wg set wg0 fwmark off peer ${vpnPeer.publicKey} allowed-ips ${lib.concatStringsSep "," vpnPeer.allowedIPs} 2>/dev/null
|
||||
true
|
||||
'';
|
||||
vpnUp = pkgs.writeShellScript "wg0-vpn-up" ''
|
||||
set -e
|
||||
PATH=${lib.makeBinPath [ pkgs.iproute2 pkgs.wireguard-tools pkgs.procps ]}
|
||||
${vpnDown}
|
||||
sysctl -q net.ipv4.conf.all.src_valid_mark=1
|
||||
wg set wg0 fwmark ${vpnTable} peer ${vpnPeer.publicKey} allowed-ips 0.0.0.0/0,::/0
|
||||
for f in -4 -6; do
|
||||
ip $f route replace default dev wg0 table ${vpnTable}
|
||||
ip $f rule add table main suppress_prefixlength 0 pref 31000
|
||||
ip $f rule add not fwmark ${vpnTable} table ${vpnTable} pref 31001
|
||||
done
|
||||
'';
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (config.syscfg.net.wg.enable) {
|
||||
@@ -18,20 +49,17 @@ in
|
||||
listenPort = 1515;
|
||||
mtu = 1340;
|
||||
peers =
|
||||
if (config.syscfg.server ? wireguard && config.syscfg.server.wireguard) then
|
||||
if isServer then
|
||||
map (p: {
|
||||
name = p.syscfg.hostname;
|
||||
publicKey = p.syscfg.net.wg.pubkey;
|
||||
allowedIPs = [ p.syscfg.net.wg.ip4 p.syscfg.net.wg.ip6 ];
|
||||
}) activePeers
|
||||
else
|
||||
[{
|
||||
allowedIPs = [ "10.10.1.0/24" "fd10:10:10::0/64" ];
|
||||
name = "vpn-helcel";
|
||||
[(vpnPeer // {
|
||||
endpoint = "vpn.helcel.net:1515";
|
||||
publicKey = "NFBJvYXZC+bd62jhrKnM7/pugidWhgR6+C5qIiUiq3Q=";
|
||||
persistentKeepalive = 30;
|
||||
}];
|
||||
})];
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -59,7 +87,23 @@ in
|
||||
Restart = "on-failure";
|
||||
RestartSec = "10s"; # Wait 2 seconds before retrying the domain query
|
||||
};
|
||||
startLimitIntervalSec = 0;
|
||||
startLimitIntervalSec = 0;
|
||||
};
|
||||
|
||||
systemd.services."wireguard-wg0-vpn" = lib.mkIf (!isServer) {
|
||||
description = "WireGuard wg0 - route all traffic";
|
||||
bindsTo = [ "wireguard-wg0.service" ];
|
||||
wants = [ "wireguard-wg0-peer-vpn-helcel.service" ];
|
||||
partOf = [ "wireguard-wg0-peer-vpn-helcel.service" ];
|
||||
after = [ "wireguard-wg0.service" "wireguard-wg0-peer-vpn-helcel.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = vpnUp;
|
||||
ExecStop = vpnDown;
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.checkReversePath = lib.mkIf (!isServer) "loose";
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,9 @@
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.syscfg.server;
|
||||
wg = cfg.wireguard && config.syscfg.net.wg.enable;
|
||||
wgIp4 = builtins.head (lib.splitString "/" config.syscfg.net.wg.ip4);
|
||||
wgIp6 = builtins.head (lib.splitString "/" config.syscfg.net.wg.ip6);
|
||||
in {
|
||||
config = lib.mkIf (cfg.ipfw.enable) {
|
||||
boot.kernel.sysctl = {
|
||||
@@ -27,6 +30,11 @@ in {
|
||||
|
||||
iifname "${srcInt}" tcp dport ${srcPort} counter dnat ip6 to [${dstAddr6}]:${dstPort}
|
||||
iifname "${srcInt}" udp dport ${srcPort} counter dnat ip6 to [${dstAddr6}]:${dstPort}
|
||||
'' + lib.optionalString wg ''
|
||||
iifname "wg0" fib daddr type local ip daddr != ${wgIp4} tcp dport ${srcPort} counter dnat ip to ${dstAddr4}:${dstPort}
|
||||
iifname "wg0" fib daddr type local ip daddr != ${wgIp4} udp dport ${srcPort} counter dnat ip to ${dstAddr4}:${dstPort}
|
||||
iifname "wg0" fib daddr type local ip6 daddr != ${wgIp6} tcp dport ${srcPort} counter dnat ip6 to [${dstAddr6}]:${dstPort}
|
||||
iifname "wg0" fib daddr type local ip6 daddr != ${wgIp6} udp dport ${srcPort} counter dnat ip6 to [${dstAddr6}]:${dstPort}
|
||||
''
|
||||
) cfg.ipfw.ports}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user