diff --git a/nix/homeModules/common/fish/default.nix b/nix/homeModules/common/fish/default.nix
index ab3f5afc..81a5b2ca 100644
--- a/nix/homeModules/common/fish/default.nix
+++ b/nix/homeModules/common/fish/default.nix
@@ -34,20 +34,13 @@ in {
   home.packages = [pkgs.vivid];
   programs = {
     fd.enable = true;
-    fzf = {
-      enable = true;
-      enableFishIntegration = true;
-    };
-    starship = {
-      enableFishIntegration = true;
-    };
+    fzf.enable = true;
   };
 
   #
   # Integration
   #
-  programs.kitty.shellIntegration.enableFishIntegration = true;
-  services.gpg-agent.enableFishIntegration = true;
+  home.shell.enableFishIntegration = true;
 
   #
   # Scripts and functions