Revert "kak: Usar kakoune.cr en vez de fzf.kak"

This reverts commit c4c5b5fc9a.
This commit is contained in:
Cat /dev/Nulo 2022-08-02 11:12:47 +02:00
parent 82f84e88ea
commit 57bed2a06d
2 changed files with 21 additions and 37 deletions

View file

@ -57,26 +57,11 @@ hook global WinSetOption filetype=go %{
# Usar Foot
# ------------
eval %sh{
# https://github.com/alexherbo2/kakoune.cr/issues/33#issuecomment-1112160325
if test -n "$TMUX"; then echo "
define-command tmux-terminal-popup -params 1.. -shell-completion -docstring '
tmux-terminal-popup <program> [<arguments>]: create a new terminal as a tmux popup
The program passed as argument will be executed in the new popup' \
%{
tmux-terminal-impl 'display-popup -E -h 75% -w 75% -d #{pane_current_path}' %arg{@}
}
alias global terminal-popup tmux-terminal-popup
"
elif test -n "$WAYLAND_DISPLAY"; then echo '
hook global KakBegin .* %{ set-option global termcmd "footclient sh -c" }
define-command terminal-popup -params 1.. -shell-completion %{
set-option global termcmd "footclient --app-id=fzf sh -c"
wayland-terminal %arg{@}
set-option global termcmd "footclient sh -c"
}
'
fi
hook global KakBegin .* %{ set-option global termcmd "footclient sh -c" }
define-command fzf-terminal -params 1.. -shell-completion %{
set-option global termcmd "footclient --app-id=fzf sh -c"
wayland-terminal %arg{@}
set-option global termcmd "footclient sh -c"
}
# ------------
@ -117,18 +102,25 @@ hook -group sleuth global BufOpenFile .* %{ sleuth }
hook -group sleuth global BufWritePost .* %{ sleuth }
# ------------
# Kakoune.cr
# FZF
# ------------
source "%val{config}/plugins/fzf.kak/rc/fzf.kak"
evaluate-commands %sh{
kcr init kakoune
find -L "$kak_config/plugins/fzf.kak/rc/modules/" -type f -name '*.kak' -exec printf 'source "%s"\n' {} \;
}
map -docstring 'new client' global normal <c-t> ': new<ret>'
map -docstring 'terminal' global normal <c-ret> ': connect terminal<ret>'
map -docstring 'file picker' global normal <c-f> ': connect terminal-popup kcr fzf files -- -H<ret>'
map -docstring 'buffer picker' global normal <c-b> ': connect terminal-popup kcr fzf buffers<ret>'
map -docstring 'grep picker' global normal <c-g> ': connect terminal-popup kcr fzf grep<ret>'
hook global ModuleLoaded fzf %{
set-option global fzf_terminal_command 'fzf-terminal kak -c %val{session} -e "%arg{@}"'
}
hook global ModuleLoaded fzf-file %{
set-option global fzf_file_command 'rg -L --hidden --files --glob !.git'
}
hook global ModuleLoaded fzf-grep %{
set-option global fzf_grep_command 'rg'
}
map -docstring 'search files' global user f ': fzf-mode<ret>f'
map -docstring 'search buffers' global user b ': fzf-mode<ret>b'
map -docstring 'grep files' global user g ': fzf-mode<ret>g'
# ------------
# Buffer switching

View file

@ -28,13 +28,5 @@ Probablemente incompleto.
### Alpine
```sh
apk add zsh zsh-vcs fzf kak
```
#### Para editor mejorado
(requiere tmux o Wayland+foot)
```sh
apk add kakoune-cr kakoune-cr-commands bat fd
apk add zsh zsh-vcs fzf vis
```