From b365acc40361084ca2febe832f7e8add36a309c6 Mon Sep 17 00:00:00 2001
From: Antoine Vaure <antoine.vaure@allegrodvt.com>
Date: Tue, 21 Apr 2026 11:14:21 +0200
Subject: [PATCH 1/4] better rm to trash conversion

---
 home/fish.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/home/fish.nix b/home/fish.nix
index 6b09ff5..f4fafa1 100644
--- a/home/fish.nix
+++ b/home/fish.nix
@@ -66,6 +66,17 @@
       ffsum.body = ''
         ${pkgs.ffmpeg}/bin/ffmpeg -hide_banner -v error $argv[..-2] -i $argv[-1] -map 0:v -f md5 -
       '';
+      rm.body = ''
+        if which trash >/dev/null
+          trash $argv
+        else
+          if test $TRASH_MESSAGE_PRINTED != 1 
+            echo (set_color blue)"trash-cli not installed ! falling back to using unforgiving rm"
+            set TRASH_MESSAGE_PRINTED 1
+          end
+          rm $argv
+        end
+      '';
     };
 
     shellAliases = {
@@ -74,7 +85,6 @@
       grep = "grep --color=auto";
       diff = "diff --color=auto";
       dev = "nix develop -c fish";
-      rm = "trash";
       del = "rm -rf";
       rsyncp = "rsync --info=progress2 --no-inc-recursive";
       ffmpeg = "ffmpeg -hide_banner";

From 03c111430bd676670c38510c1dbe845492dc5e6c Mon Sep 17 00:00:00 2001
From: Antoine Vaure <antoine.vaure@allegrodvt.com>
Date: Tue, 21 Apr 2026 11:15:10 +0200
Subject: [PATCH 2/4] add config for ipva02; same as ipva01

---
 flake.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flake.nix b/flake.nix
index 6b11bd6..5c60048 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,6 +75,7 @@
          programs.fish.loginShellInit = "source ${pkgs.nix}/etc/profile.d/nix.fish";
          })
       ];
+      homeConfigurations."anvaure@msm-lnx-ipva-02" = homeConfigurations."anvaure@msm-lnx-ipva-01";
       homeConfigurations."anvaure@msm-lnx-demo-01" = homeConfigurations."anvaure@msm-lnx-ipva-01";
 
       nixosConfigurations.basado = osConfig [

From f55198f27b074b7d96f67598b5a2be29c70a78b2 Mon Sep 17 00:00:00 2001
From: Antoine Vaure <antoine.vaure@allegrodvt.com>
Date: Tue, 21 Apr 2026 11:14:21 +0200
Subject: [PATCH 3/4] better rm to trash conversion

---
 home/fish.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/home/fish.nix b/home/fish.nix
index 6b09ff5..5fa2182 100644
--- a/home/fish.nix
+++ b/home/fish.nix
@@ -66,6 +66,21 @@
       ffsum.body = ''
         ${pkgs.ffmpeg}/bin/ffmpeg -hide_banner -v error $argv[..-2] -i $argv[-1] -map 0:v -f md5 -
       '';
+      rm.body = ''
+        if type -q trash
+          trash $argv
+        else
+          if not test $TRASH_MESSAGE_PRINTED
+            echo (set_color blue)"trash-cli not installed! Falling back to using unforgiving rm"(set_color reset)
+            set -gx TRASH_MESSAGE_PRINTED 1
+          end
+          if type -q /usr/bin/rm
+            /usr/bin/rm $argv
+          else
+            ${pkgs.coreutils}/bin/rm $argv
+          end
+        end
+      '';
     };
 
     shellAliases = {
@@ -74,7 +89,6 @@
       grep = "grep --color=auto";
       diff = "diff --color=auto";
       dev = "nix develop -c fish";
-      rm = "trash";
       del = "rm -rf";
       rsyncp = "rsync --info=progress2 --no-inc-recursive";
       ffmpeg = "ffmpeg -hide_banner";

From 25739382ef02f7cf5f3b098640f999fb99a00734 Mon Sep 17 00:00:00 2001
From: Antoine Vaure <antoine.vaure@allegrodvt.com>
Date: Tue, 21 Apr 2026 11:15:10 +0200
Subject: [PATCH 4/4] add config for ipva02; same as ipva01

---
 flake.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flake.nix b/flake.nix
index 6b11bd6..5c60048 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,6 +75,7 @@
          programs.fish.loginShellInit = "source ${pkgs.nix}/etc/profile.d/nix.fish";
          })
       ];
+      homeConfigurations."anvaure@msm-lnx-ipva-02" = homeConfigurations."anvaure@msm-lnx-ipva-01";
       homeConfigurations."anvaure@msm-lnx-demo-01" = homeConfigurations."anvaure@msm-lnx-ipva-01";
 
       nixosConfigurations.basado = osConfig [