From c051c5c6c23246a84a2b58f1b1c358661ac08522 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Mon, 9 Mar 2026 23:50:22 -0400 Subject: [PATCH] routing --- flake.lock | 6 +++--- modules/hosts/common/linux/home.nix | 1 - modules/hosts/common/linux/nixroutes.nix | 7 +++++++ modules/hosts/nixos/hetznix01/default.nix | 1 + modules/hosts/nixos/hetznix02/default.nix | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 modules/hosts/common/linux/nixroutes.nix diff --git a/flake.lock b/flake.lock index 85f2c9e..cfb31bf 100644 --- a/flake.lock +++ b/flake.lock @@ -694,11 +694,11 @@ "sops-nix": "sops-nix" }, "locked": { - "lastModified": 1773107095, - "narHash": "sha256-FH96EdivFlkW85eumLrp17EdXLMxlPXk4+6p3eGCzOs=", + "lastModified": 1773114599, + "narHash": "sha256-xPPkXW9mlszorwDVJ3bXQsKVg0wIpiiOCL9kbZlyTjY=", "owner": "genebean", "repo": "private-flake", - "rev": "1e245e3d7fab1dd1466569ed10f4488abf343e38", + "rev": "8d886b681a65ad3e2a102d40a7a34001b6973450", "type": "github" }, "original": { diff --git a/modules/hosts/common/linux/home.nix b/modules/hosts/common/linux/home.nix index 9865123..04428b9 100644 --- a/modules/hosts/common/linux/home.nix +++ b/modules/hosts/common/linux/home.nix @@ -8,7 +8,6 @@ zsh.shellAliases = { nixboot = "sudo nixos-rebuild boot --flake ~/repos/dots && echo 'Time to reboot!'"; nixdiff = "cd ~/repos/dots && nixos-rebuild build --flake . && nvd diff /run/current-system result"; - nixroutes = "cd ~/repos/dots && echo '=== Current Routes ===' && ip route show && ip -6 route show && echo '' && echo '=== New Build Routes ===' && nix eval --apply 'routes: builtins.concatStringsSep \"\\n\" (map (r: r.Destination + \" via \" + r.Gateway) routes)' '.#nixosConfigurations.$(hostname).config.systemd.network.networks.\"10-wan\".routes'"; nixup = "sudo nixos-rebuild switch --flake ~/repos/dots"; uwgconnect = "nmcli dev wifi connect SecureWest password"; uwgforget = "nmcli connection delete SecureWest"; diff --git a/modules/hosts/common/linux/nixroutes.nix b/modules/hosts/common/linux/nixroutes.nix new file mode 100644 index 0000000..e3376e7 --- /dev/null +++ b/modules/hosts/common/linux/nixroutes.nix @@ -0,0 +1,7 @@ +{ config, lib, ... }: +let + hostName = config.networking.hostName; +in { + programs.zsh.shellAliases.nixroutes = + "cd ~/repos/dots && echo '=== Current Routes ===' && ip route show && ip -6 route show && echo '' && echo '=== New Build Routes ===' && nix eval --apply 'routes: builtins.concatStringsSep \"\\\\n\" (map (r: r.Destination + \" via \" + r.Gateway) routes)' '.#nixosConfigurations.${hostName}.config.systemd.network.networks.\"10-wan\".routes' | tr '\\\\n' '\\n'"; +} diff --git a/modules/hosts/nixos/hetznix01/default.nix b/modules/hosts/nixos/hetznix01/default.nix index b16c453..b39565d 100644 --- a/modules/hosts/nixos/hetznix01/default.nix +++ b/modules/hosts/nixos/hetznix01/default.nix @@ -3,6 +3,7 @@ ./hardware-configuration.nix ./disk-config.nix ./post-install + ../../common/linux/nixroutes.nix ]; system.stateVersion = "24.05"; diff --git a/modules/hosts/nixos/hetznix02/default.nix b/modules/hosts/nixos/hetznix02/default.nix index 209e041..b62a34f 100644 --- a/modules/hosts/nixos/hetznix02/default.nix +++ b/modules/hosts/nixos/hetznix02/default.nix @@ -3,6 +3,7 @@ ./hardware-configuration.nix ./disk-config.nix ./post-install + ../../common/linux/nixroutes.nix ]; system.stateVersion = "24.05";