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 [ 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";