diff --git a/hosts/common/base.nix b/hosts/common/base.nix
index 8cc14b9..fa25113 100644
--- a/hosts/common/base.nix
+++ b/hosts/common/base.nix
@@ -82,6 +82,7 @@
       pciutils
       usbutils
       tree
+      fzf #fuzzy finder
 
       # Shells
       bash
@@ -122,6 +123,7 @@
 
   programs = {
     command-not-found.enable = true;
+    fzf.fuzzyCompletion = true;
     xonsh = {
       enable = true;
       extraPackages = ps: with ps; [
@@ -160,16 +162,16 @@
         xontrib load coreutils
         xontrib load fish_completer
         xontrib load direnv
-        xontrib load fzf-completions
         xontrib load clp
         xontrib load bashisms
-        
         #xontrib load abbrevs #relies on xonsh.ptk_shell which was deprecated in 0.13
-        #from xonsh.built_ins import XSH
-        #XSH.env['fzf_history_binding'] = "c-r"  # Ctrl+R
-        #XSH.env['fzf_ssh_binding'] = "c-s"  # Ctrl+S
-        #XSH.env['fzf_file_binding'] = "c-t"  # Ctrl+T
-        #XSH.env['fzf_dir_binding'] = "c-g"  # Ctrl+G
+
+        xontrib load fzf-completions
+        from xonsh.built_ins import XSH
+        XSH.env['fzf_history_binding'] = "c-r"  # Ctrl+R
+        XSH.env['fzf_ssh_binding'] = "c-s"  # Ctrl+S
+        XSH.env['fzf_file_binding'] = "c-t"  # Ctrl+T
+        XSH.env['fzf_dir_binding'] = "c-g"  # Ctrl+G
 
         aliases["tsla-fan"] = "ipmitool -H 10.30.0.3 -U ADMIN -P ADMIN raw 0x30 0x70 0x66 0x01 0x0"
         aliases["nixoss"] = "sudo nixos-rebuild switch --flake .#${config.networking.hostName}"