Clean up Fish config

nix/modules/fish/default.nix

@@ -2,7 +2,7 @@
 let tide_conf = builtins.readFile ./tide_config.fish; in
 {
   programs.zoxide.enableFishIntegration = true;
-
+  programs.kitty.shellIntegration.enableFishIntegration = true;
   programs.fzf = {
     enable = true;
     enableFishIntegration = false;
@@ -52,10 +52,6 @@ let tide_conf = builtins.readFile ./tide_config.fish; in
 
       fish_add_path --path ~/.dotfiles/bin ~/.local/bin ~/bin
 
-      # fish_add_path ~/.emacs.d/bin
-
-      fzf_configure_bindings --history=\cr --directory=\ef --git_status=\es
-
       # If running under kitty, fake the term for ssh to avoid
       # having to install terminfo on remote machine
       function ssh --wraps ssh
@@ -65,13 +61,6 @@ let tide_conf = builtins.readFile ./tide_config.fish; in
         command ssh $argv
       end
 
-      # Kitty integration
-      if set -q KITTY_INSTALLATION_DIR
-          set --global KITTY_SHELL_INTEGRATION enabled
-          source "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish"
-          set --prepend fish_complete_path "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_completions.d"
-      end
-
       if test -f $HOME/.cargo/env.fish
         source "$HOME/.cargo/env.fish"
       end

nix/modules/kitty/default.nix

@@ -12,7 +12,7 @@
       macos_option_as_alt = "left";
       enable_audio_bell = "no";
       window_alert_on_bell = "no";
-      shell_integration = "disabled";
+      shell_integration = "no-rc" ;
     };
 
     font = {