diff --git a/common/default.nix b/common/default.nix
index 17c25ae1..6c03105d 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,6 +1,7 @@
 { config, home-manager, lib, nixpkgs, nur, nix-melt, nurl, pkgs, ... }: {
   imports = [
     home-manager.nixosModules.default
+    ./modules/programs.nix
     ./overlays/list.nix
   ];
 
diff --git a/common/modules/bash/default.nix b/common/modules/bash/default.nix
index 6c0a1c5a..ab919f63 100644
--- a/common/modules/bash/default.nix
+++ b/common/modules/bash/default.nix
@@ -1,19 +1,11 @@
 # Home-manager module
 
 { lib, ... }: {
-  programs = {
+  imports = [
+    ./programs.nix
+  ];
 
-    fzf = {
-      enable = true;
-      enableBashIntegration = true;
-    };
-    ripgrep = {
-      enable = true;
-      arguments = [
-        "--no-config"
-      ];
-    };
-    jq.enable = true;
+  programs = {
 
     starship = let
       textColor   = "#e3e5e5";
diff --git a/common/modules/bash/programs.nix b/common/modules/bash/programs.nix
new file mode 100644
index 00000000..2869f971
--- /dev/null
+++ b/common/modules/bash/programs.nix
@@ -0,0 +1,15 @@
+{ ... }: {
+  programs = {
+    fzf = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+    ripgrep = {
+      enable = true;
+      arguments = [
+        "--no-config"
+      ];
+    };
+    jq.enable = true;
+  };
+}
diff --git a/common/modules/programs.nix b/common/modules/programs.nix
new file mode 100644
index 00000000..fb3f3486
--- /dev/null
+++ b/common/modules/programs.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }: {
+  services = {
+
+    locate = {
+      enable = true;
+      package = pkgs.mlocate;
+      localuser = null;
+      interval = "hourly";
+      prunePaths = [
+        "/tmp"
+        "/var/tmp"
+        "/var/cache"
+        "/var/lock"
+        "/var/run"
+        "/var/spool"
+        "/nix/var/log/nix"
+        "/proc"
+        "/run/user"
+      ];
+    };
+  };
+}
diff --git a/hosts/wim/cfg/packages.nix b/hosts/wim/cfg/packages.nix
index d16d846d..3d3d9a18 100644
--- a/hosts/wim/cfg/packages.nix
+++ b/hosts/wim/cfg/packages.nix
@@ -45,24 +45,6 @@
     gvfs.enable = true;
     flatpak.enable = true;
     tlp.enable = true;
-
-    locate = {
-      enable = true;
-      package = pkgs.mlocate;
-      localuser = null;
-      interval = "hourly";
-      prunePaths = [
-        "/tmp"
-        "/var/tmp"
-        "/var/cache"
-        "/var/lock"
-        "/var/run"
-        "/var/spool"
-        "/nix/var/log/nix"
-        "/proc"
-        "/run/user"
-      ];
-    };
   };
 
   xdg.portal = {
@@ -153,11 +135,6 @@
     htop = {
       enable = true;
     };
-
-    fzf = {
-      fuzzyCompletion = true;
-      keybindings = true;
-    };
   };
 
   # List packages in root user PATH