From 5ddef6771426920e0eec68a8624f0928a2327410 Mon Sep 17 00:00:00 2001 From: js0ny Date: Thu, 10 Apr 2025 01:53:54 +0100 Subject: [PATCH] fix(fzf): run command will change shell-integration behaviour --- common/fzfrc | 18 +++++++++--------- tools/kitty/kitty.conf | 1 + tools/zsh/zshenv | 7 ++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/common/fzfrc b/common/fzfrc index a2beb38..4d88a35 100644 --- a/common/fzfrc +++ b/common/fzfrc @@ -1,10 +1,10 @@ # --preview 'bat --color=always --style=numbers {}' ---bind alt-n:preview-down,alt-e:preview-up ---bind ctrl-e:up ---bind alt-p:toggle-preview ---color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 ---color=fg:#cdd6f4,header:#f38ba8,info:#f5c2e7,pointer:#f5e0dc ---color=marker:#b4befe,fg+:#cdd6f4,prompt:#f5c2e7,hl+:#f38ba8 ---color=selected-bg:#45475a ---color=border:#313244,label:#cdd6f4 - +# --bind alt-n:preview-down,alt-e:preview-up +# --bind ctrl-e:up +# --bind alt-p:toggle-preview +# --color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 +# --color=fg:#cdd6f4,header:#f38ba8,info:#f5c2e7,pointer:#f5e0dc +# --color=marker:#b4befe,fg+:#cdd6f4,prompt:#f5c2e7,hl+:#f38ba8 +# --color=selected-bg:#45475a +# --color=border:#313244,label:#cdd6f4 +# diff --git a/tools/kitty/kitty.conf b/tools/kitty/kitty.conf index e9393a4..2c09cce 100644 --- a/tools/kitty/kitty.conf +++ b/tools/kitty/kitty.conf @@ -79,3 +79,4 @@ map ctrl+shift+enter toggle_layout stack # }}} +shell fish diff --git a/tools/zsh/zshenv b/tools/zsh/zshenv index d7e852f..eabb593 100644 --- a/tools/zsh/zshenv +++ b/tools/zsh/zshenv @@ -139,9 +139,10 @@ if command -v emacs >/dev/null; then export SPACEMACSDIR="$XDG_CONFIG_HOME"/spacemacs fi # Fzf -if command -v fzf > /dev/null; then - export FZF_DEFAULT_OPTS_FILE="$HOME/.dotfiles/common/fzfrc" -fi +# This will make shell integration buggy +# if command -v fzf > /dev/null; then +# export FZF_DEFAULT_OPTS_FILE="$HOME/.dotfiles/common/fzfrc" +# fi # tldr # Works only with C client (did not verify) if command -v tldr >/dev/null; then