diff --git a/flake.lock b/flake.lock
index 60bd092..3a44cdb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -137,11 +137,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1751250385,
-        "narHash": "sha256-+jWCrLW15eNsfzppVpPkd7Th7b1Dx+aKQfHPzYxzLWY=",
+        "lastModified": 1751274822,
+        "narHash": "sha256-N5Kl10TFWL7mWZWR/SYiYA3+bnH2HfuB/qCFGco2HOo=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "28a7010a46ee17016c9b37be86f4ce4796c47a71",
+        "rev": "9e06201e3703da9d83c608ad31c5bb44ad0753b6",
         "type": "github"
       },
       "original": {
@@ -687,11 +687,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1751232679,
-        "narHash": "sha256-ljpyZxr5cHjJEXItXCoJVXJ+fiHTW1Ft0fPgEY72K5A=",
+        "lastModified": 1751275819,
+        "narHash": "sha256-013hN0hBpLAPS9PQhkQKb2KOUB3Y1Ef7poANHpsxbck=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "d9b7ff985e454c1b3d2af1c5d09e799ecd38902d",
+        "rev": "91b2083cad55e4607ebc1cf920c08daf209ad7a0",
         "type": "github"
       },
       "original": {
@@ -770,11 +770,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1749394952,
-        "narHash": "sha256-WbWkzIvB0gqAdBLghdmUpGveY7MlAS2iMj3VEJnJ9yE=",
+        "lastModified": 1751276396,
+        "narHash": "sha256-oOYrnKStMsOXST+wKnzuSZ49h8Dr1Q3mIn2f5Kb5GAw=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "64c6e53a3999957c19ab95cda78bde466d8374cc",
+        "rev": "59adb9ad1cbd915494fc35cd0e0a9d582ca9de74",
         "type": "github"
       },
       "original": {
@@ -924,11 +924,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1750969886,
-        "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
+        "lastModified": 1751211869,
+        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
+        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
         "type": "github"
       },
       "original": {
@@ -940,11 +940,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1750969886,
-        "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
+        "lastModified": 1751211869,
+        "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
+        "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
         "type": "github"
       },
       "original": {
@@ -1578,11 +1578,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1751126369,
-        "narHash": "sha256-Pf4hBcGfVeBxCTJBwCXMlsGjlrmBE6XocXzAtN0e26U=",
+        "lastModified": 1751272045,
+        "narHash": "sha256-4h+pRl1IxnvS3jPqkommNFMn9alzNEAW99v6vdBlPkI=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "8657e6b6f55d2db3157fed50a8305f500310aba7",
+        "rev": "5a66559d1ca53db3869384a8039bbe82a2ca2dbd",
         "type": "github"
       },
       "original": {
@@ -1599,11 +1599,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751224527,
-        "narHash": "sha256-Mihe18dBS7y13//qPn2LVnSMZdZXI1vvnpKpRCmJcfw=",
+        "lastModified": 1751278949,
+        "narHash": "sha256-wjOCGMnHbTWsxWs/V7QT9ANG3T2wx+DHs4/cg5gl2dc=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "ee2ecf872fe6b7aa14ec90796ba610eeafdd17da",
+        "rev": "9d1622af7aa4aaee79eb5e5da98f045f5b69d8f0",
         "type": "github"
       },
       "original": {
diff --git a/modules/home/shell-conf/fish.nix b/modules/home/shell-conf/fish.nix
deleted file mode 100644
index 8112b88..0000000
--- a/modules/home/shell-conf/fish.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.fish = {
-    enable = true;
-    shellAliases = {
-      "em" = "emacsclient -n -r";
-      "mkdir" = "mkdir -pv";
-      "gtr" = "gtrash -r";
-      "rmr" = "gtrash -r";
-      "rm" = "gtrash put";
-      "lg" = "lazygit";
-    };
-
-    # change fzf variable search to C-M-v
-    interactiveShellInit = ''
-      bind --erase \ct
-      fzf_configure_bindings --variables=\e\cv
-      '';
-    plugins = [
-      {
-        name = "upto";
-        src = pkgs.fetchFromGitHub {
-          owner = "Markcial";
-          repo = "upto";
-          rev = "2d1f35453fb55747d50da8c1cb1809840f99a646";
-          sha256 = "sha256-Lv2XtP2x9dkIkUUjMBWVpAs/l55Ztu7gIjKYH6ZzK4s=";
-        };
-      }
-    ];
-  };
-}
diff --git a/modules/home/shell-conf/fish/fish.nix b/modules/home/shell-conf/fish/fish.nix
index 3d60ac9..b4a6011 100644
--- a/modules/home/shell-conf/fish/fish.nix
+++ b/modules/home/shell-conf/fish/fish.nix
@@ -6,8 +6,10 @@
     shellAliases = {
       "em" = "emacsclient -n -r";
       "mkdir" = "mkdir -pv";
-      "gtr" = "gtrash -r";
+      "gtr" = "gtrash restore";
+      "rmr" = "gtrash restore";
       "rm" = "gtrash put";
+      "lg" = "lazygit";
     };
 
     # change fzf variable search to C-M-v
diff --git a/modules/home/shell-conf/nushell.nix b/modules/home/shell-conf/nushell.nix
deleted file mode 100644
index f220896..0000000
--- a/modules/home/shell-conf/nushell.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  programs.nushell = {
-    enable = true;
-    shellAliases = {
-      "em" = "emacsclient -n -r";
-      "gtr" = "gtrash -r";
-      "rm" = "gtrash put";
-      "rmr" = "gtrash -r";
-      "lg" = "lazygit";
-    };
-
-    loginFile.text = ''
-      ${pkgs.figlet}/bin/figlet -f ($env.HOME)/.local/share/flf/wavy.flf (hostname)
-      '';
-
-    environmentVariables = {
-      ENV_CONVERSIONS.PATH = {
-        from_string = lib.hm.nushell.mkNushellInline "{|s| $s | split row (char esep) }";
-        to_string = lib.hm.nushell.mkNushellInline "{|v| $v | str join (char esep) }";
-      };
-    };
-
-    settings = {
-      show_banner = false;
-    };
-  };
-}
diff --git a/modules/home/shell-conf/nushell/config.nu b/modules/home/shell-conf/nushell/config.nu
new file mode 100644
index 0000000..764ff58
--- /dev/null
+++ b/modules/home/shell-conf/nushell/config.nu
@@ -0,0 +1,8 @@
+let fish_completer = {|spans|
+    fish --command $"complete '--do-complete=($spans | str replace --all "'" "\\'" | str join ' ')'"
+    | from tsv --flexible --noheaders --no-infer
+    | rename value description
+    | update value {
+        if ($in | path exists) {$'"($in | path expand --no-symlink | str replace --all "\"" "\\\"" )"'} else {$in}
+    }
+}
diff --git a/modules/home/shell-conf/nushell/nushell.nix b/modules/home/shell-conf/nushell/nushell.nix
index b50dceb..c01aba7 100644
--- a/modules/home/shell-conf/nushell/nushell.nix
+++ b/modules/home/shell-conf/nushell/nushell.nix
@@ -5,10 +5,12 @@
     enable = true;
     shellAliases = {
       "em" = "emacsclient -n -r";
-      "gtr" = "gtrash -r";
+      "gtr" = "gtrash restore";
+      "rmr" = "gtrash restore";
       "rm" = "gtrash put";
+      "lg" = "lazygit";
     };
-
+    configFile.source = ./config.nu;
     loginFile.text = ''
       ${pkgs.figlet}/bin/figlet -f ($env.HOME)/.local/share/flf/wavy.flf (hostname)
       '';