From e8bf24a68fe5a64ee62e90089833081f076dbc90 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Tue, 20 Oct 2020 14:57:55 -0300 Subject: [PATCH] set global fzf config --- dotfiles/fish.fish | 19 +++++++++++++------ dotfiles/nvim/init.vim | 15 --------------- lelmeta/PKGBUILD | 2 +- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dotfiles/fish.fish b/dotfiles/fish.fish index 7cf212d..c4017f6 100644 --- a/dotfiles/fish.fish +++ b/dotfiles/fish.fish @@ -37,13 +37,9 @@ command -qs trash && command -qs exa && alias ls 'exa --git' - +{%@@ set bat_command = "bat " + ("--theme GitHub" * (color.type == "light")) @@%} command -qs bat && - # {%@@ if color.type == "light" @@%} # - alias cat 'bat --theme GitHub' - # {%@@ else @@%} # - alias cat 'bat' - # {%@@ endif @@%} # + alias cat "{{@@ bat_command @@}}" command -qs zoxide && zoxide init fish | source @@ -294,5 +290,16 @@ set -xU LESS_TERMCAP_so (printf "\e[01;44;33m") set -xU LESS_TERMCAP_ue (printf "\e[0m") set -xU LESS_TERMCAP_us (printf "\e[01;32m") +#}}} +# Fzf settings{{{ +export FZF_DEFAULT_OPTS="\ +--preview '{{@@ bat_command @@}} --style=numbers --color=always {}' \ +--color='\ +bg+:{{@@ color.bg_light @@}},\ +gutter:{{@@ color.bg @@}},\ +prompt:{{@@ color.accent @@}},\ +pointer:{{@@ color.accent @@}},\ +spinner:{{@@ color.accent @@}}\ +'" #}}} # vim:foldmethod=marker diff --git a/dotfiles/nvim/init.vim b/dotfiles/nvim/init.vim index 37a6024..3341e2a 100644 --- a/dotfiles/nvim/init.vim +++ b/dotfiles/nvim/init.vim @@ -221,21 +221,6 @@ call plug#end() highlight SpellCap guisp={{@@ color.normal.cyan @@}} guibg=none highlight SpellLocal guisp={{@@ color.normal.yellow @@}} guibg=none - let g:fzf_colors = - \ { 'fg': ['fg', 'Normal'], - \ 'bg': ['bg', 'Normal'], - \ 'hl': ['fg', 'Comment'], - \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], - \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], - \ 'hl+': ['fg', 'Statement'], - \ 'info': ['fg', 'PreProc'], - \ 'border': ['fg', 'Ignore'], - \ 'prompt': ['fg', 'Conditional'], - \ 'pointer': ['fg', 'Exception'], - \ 'marker': ['fg', 'Keyword'], - \ 'spinner': ['fg', 'Label'], - \ 'header': ['fg', 'Comment'] } - "}}} " Keys{{{ " diff --git a/lelmeta/PKGBUILD b/lelmeta/PKGBUILD index 2062c18..7bf88b7 100755 --- a/lelmeta/PKGBUILD +++ b/lelmeta/PKGBUILD @@ -46,7 +46,7 @@ depends=( papirus-folders capitaine-cursors # Terminal - ranger atool p7zip tree jq + ranger atool p7zip tree jq fzf neofetch htop # Replacements #ls cat rm -rf grep find sed cd