diff --git a/home-manager/becky-dingleberry.nix b/home-manager/becky-dingleberry.nix index 3107f04..ccb3042 100644 --- a/home-manager/becky-dingleberry.nix +++ b/home-manager/becky-dingleberry.nix @@ -360,28 +360,14 @@ in # Total hack, not what HM is for # Manually remove files if deleted here home.activation.nfsRoute = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - /usr/bin/sudo ${pkgs.coreutils}/bin/ln -fs ${ - pkgs.writeTextFile { - name = "nfs-route"; - text = '' - # NFS - 200 nfsroute - ''; - } - } /etc/iproute2/rt_tables.d/20-nfs.conf - /usr/bin/sudo ${pkgs.coreutils}/bin/ln -fs ${pkgs.writeShellScript "nfs-route" '' if [ "$IFACE" = "enp4s0" ]; then - if [ "$(ip route list table nfsroute exact 10.125.248.55 | grep enp4s0 | wc -l)" == "0" ]; then - ip route add 10.125.248.55 via 10.124.248.248 dev enp4s0 table nfsroute + if [ "$(ip route list exact 10.125.248.55 | grep enp4s0 | wc -l)" == "0" ]; then + ip route add 10.125.248.55 via 10.124.248.248 dev enp4s0 fi - if [ "$(ip route list table nfsroute exact 10.125.248.33 | grep enp4s0 | wc -l)" == "0" ]; then - ip route add 10.125.248.33 via 10.124.248.248 dev enp4s0 table nfsroute - fi - - if [ "$(ip rule list from 10.124.248.5 | ${pkgs.gnugrep}/bin/grep nfsroute | ${pkgs.coreutils}/bin/wc -l)" == "0" ]; then - ip rule add from 10.124.248.5 lookup nfsroute + if [ "$(ip route list exact 10.125.248.33 | grep enp4s0 | wc -l)" == "0" ]; then + ip route add 10.125.248.55 via 10.124.248.248 dev enp4s0 fi fi ''} /etc/network/if-up.d/nfs-route @@ -390,16 +376,12 @@ in /usr/bin/sudo ${pkgs.coreutils}/bin/ln -fs ${pkgs.writeShellScript "nfs-route" '' if [ "$IFACE" = "enp4s0" ]; then - if [ "$(ip route list table nfsroute exact 10.125.248.55 | grep enp4s0 | wc -l)" != "0" ]; then - ip route del 10.125.248.55 via 10.124.248.248 dev enp4s0 table nfsroute + if [ "$(ip route list exact 10.125.248.55 | grep enp4s0 | wc -l)" != "0" ]; then + ip route del 10.125.248.55 via 10.124.248.248 dev enp4s0 fi - if [ "$(ip route list table nfsroute exact 10.125.248.33 | grep enp4s0 | wc -l)" != "0" ]; then - ip route del 10.125.248.33 via 10.124.248.248 dev enp4s0 table nfsroute - fi - - if [ "$(ip rule list from 10.124.248.5 | ${pkgs.gnugrep}/bin/grep nfsroute | ${pkgs.coreutils}/bin/wc -l)" != "0" ]; then - ip rule del from 10.124.248.5 lookup nfsroute + if [ "$(ip route list exact 10.125.248.33 | grep enp4s0 | wc -l)" != "0" ]; then + ip route del 10.125.248.33 via 10.124.248.248 dev enp4s0 fi fi ''} /etc/network/if-post-down.d/nfs-route