diff --git a/init.el b/init.el
index 48da4a0..34fc95f 100644
--- a/init.el
+++ b/init.el
@@ -641,6 +641,9 @@
 (use-package esh-autosuggest
   :hook (eshell-mode . esh-autosuggest-mode))
 
+(use-package fish-completion-mode
+  :hook ((eshell-mode . fish-completion-mode)))
+
 (use-package eshell-syntax-highlighting
   :custom
   ((eshell-syntax-highlighting-highlight-in-remote-dirs nil))
diff --git a/packages/packages.nix b/packages/packages.nix
index 529ebf7..db9c0b1 100644
--- a/packages/packages.nix
+++ b/packages/packages.nix
@@ -47,6 +47,7 @@ with epkgs; let
       treemacs-nerd-icons
       eat
       eshell-syntax-highlighting
+      fish-completion # fish completion for eshell
       esh-autosuggest
       clipetty
       sideline