Revert "use separate scripts for bat and fzf"
This reverts commit 901b06cd69
.
This commit is contained in:
parent
5453c44d4a
commit
9239ceee5e
|
@ -39,9 +39,9 @@ command -qs trash &&
|
|||
|
||||
command -qs exa &&
|
||||
alias ls 'exa --git'
|
||||
|
||||
bat --version &>/dev/null &&
|
||||
alias cat bat
|
||||
{%@@ set bat_command = "bat " + ("--theme GitHub" * (color.type == "light")) @@%}
|
||||
command -qs bat &&
|
||||
alias cat "{{@@ bat_command @@}}"
|
||||
|
||||
command -qs zoxide &&
|
||||
zoxide init fish | source
|
||||
|
@ -343,5 +343,19 @@ 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{{{
|
||||
|
||||
set -x FZF_DEFAULT_OPTS "\
|
||||
--preview '{{@@ bat_command @@}} --style=numbers --color=always {}' \
|
||||
--color='\
|
||||
bg+:{{@@ color.bg_light @@}},\
|
||||
hl+:{{@@ color.normal.green @@}},\
|
||||
gutter:{{@@ color.bg @@}},\
|
||||
prompt:{{@@ accent_color @@}},\
|
||||
pointer:{{@@ accent_color @@}},\
|
||||
spinner:{{@@ accent_color @@}}\
|
||||
'"
|
||||
|
||||
#}}}
|
||||
# vim:foldmethod=marker
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
exec /usr/bin/bat {%@@ if color_type == "light" @@%}
|
||||
"--theme GitHub"
|
||||
{%@@ else @@%}
|
||||
{%@@ endif @@%}
|
||||
$@
|
|
@ -1,13 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
{%@@ set bat_command = "bat " + ("--theme GitHub" * (color_type == "light")) @@%}
|
||||
|
||||
exec /usr/bin/fzf --preview '{{@@ bat_command @@}} --style=numbers --color=always {}' \
|
||||
--color="\
|
||||
bg+:{{@@ color.bg_light @@}},\
|
||||
hl+:{{@@ color.normal.green @@}},\
|
||||
gutter:{{@@ color.bg @@}},\
|
||||
prompt:{{@@ accent_color @@}},\
|
||||
pointer:{{@@ accent_color @@}},\
|
||||
spinner:{{@@ accent_color @@}}\
|
||||
" $@
|
Reference in New Issue