diff --git a/flake.lock b/flake.lock
index 53295ac..3c426db 100644
--- a/flake.lock
+++ b/flake.lock
@@ -179,11 +179,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1684385584,
-        "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=",
+        "lastModified": 1684481515,
+        "narHash": "sha256-sDMEZ4HLP6sVNiBcgla3KWihdDjh67DP5ZWkGKWFgY0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a",
+        "rev": "5b1bc788f578cd83d54b48bb057d6f6703ae7725",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684047328,
-        "narHash": "sha256-Kwdg+vDiZpfjtkoJH/AQdu2HFJmfdWp+7AJegBIibrs=",
+        "lastModified": 1684491027,
+        "narHash": "sha256-tB44RuuhVCq7TOF02D1l9sxexSmX2c9DDl/UUzi+XQY=",
         "owner": "therealr5",
         "repo": "purge",
-        "rev": "fb7472f69dad2b5cd1c58c6b505a2db72048d3a5",
+        "rev": "63a0c5b4d9f4f167b5b8a5456ed195fd3340d3ee",
         "type": "github"
       },
       "original": {
@@ -252,11 +252,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684047341,
-        "narHash": "sha256-p012shouUVUI1cXEtgmOr6o6ki7qu+NICIwu+PvstIU=",
+        "lastModified": 1684491085,
+        "narHash": "sha256-ce65P0CAKbZ9Xcx3aBHtByynrT0LHlusgyTzdxxuwr4=",
         "owner": "therealr5",
         "repo": "trucksimulatorbot-images",
-        "rev": "ec556101ee5f314550d4e4ce843cda5152d16006",
+        "rev": "734dbc070778c5671fc23dfc70196e449089e904",
         "type": "github"
       },
       "original": {
diff --git a/hosts/iso/zsh.nix b/hosts/iso/zsh.nix
index bb96e5e..db73b7f 100644
--- a/hosts/iso/zsh.nix
+++ b/hosts/iso/zsh.nix
@@ -1,10 +1,11 @@
 { pkgs, ... }:
 {
   programs.command-not-found.enable = false;
-  environment.systemPackages = with pkgs; [
-    fzf
-  ];
   users.defaultUserShell = pkgs.zsh;
+  programs.fzf = {
+    fuzzyCompletion = true;
+    keybindings = true;
+  };
   programs.zsh = {
     enable = true;
     autosuggestions = {
@@ -20,14 +21,6 @@
       ''
         source ${pkgs.zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh
         zsh-newuser-install () {}
-
-      '';
-
-    # Hacky way to bind Ctrl+R to fzf. Otherwise it will be overridden 
-    promptInit =
-      ''
-        source ${pkgs.fzf}/share/fzf/completion.zsh
-        source ${pkgs.fzf}/share/fzf/key-bindings.zsh
       '';
   };
 }
diff --git a/shared/zsh.nix b/shared/zsh.nix
index e2d0bd6..a2d6456 100644
--- a/shared/zsh.nix
+++ b/shared/zsh.nix
@@ -2,12 +2,16 @@
 {
   programs.command-not-found.enable = false;
   environment.systemPackages = with pkgs; [
-    fzf
+    # fzf
     bat
     exa
     trash-cli
   ];
   users.defaultUserShell = pkgs.zsh;
+  programs.fzf = {
+    fuzzyCompletion = true;
+    keybindings = true;
+  };
   programs.zsh = {
     enable = true;
     shellAliases = {
@@ -62,12 +66,8 @@
         }
 
       '';
-
-    # Hacky way to bind Ctrl+R to fzf. Otherwise it will be overridden 
     promptInit =
       ''
-        source ${pkgs.fzf}/share/fzf/completion.zsh
-        source ${pkgs.fzf}/share/fzf/key-bindings.zsh
         if [[ "$(hostname)" == "thinkpad" ]]
         then
           cat ${../images/cat.sixel}
diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix
index c3769fa..d9be568 100644
--- a/users/rouven/modules/default.nix
+++ b/users/rouven/modules/default.nix
@@ -3,7 +3,6 @@
   imports = [
     ./accounts
     ./foot
-    ./fzf
     ./git
     ./gpg
     ./helix
diff --git a/users/rouven/modules/fzf/default.nix b/users/rouven/modules/fzf/default.nix
deleted file mode 100644
index ea22d5e..0000000
--- a/users/rouven/modules/fzf/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  programs.fzf = {
-    enable = true;
-    tmux.enableShellIntegration = true;
-  };
-}
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index da3cdf0..6b26d6c 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -4,7 +4,8 @@
 
     # essentials
     wpa_supplicant_gui # manage wifi
-    pcmanfm # rock solid file manager
+    # pcmanfm # rock solid file manager
+    xfce.thunar
     xdg-utils # used for xdg-open
     snapper-gui
     kleopatra