From c4c5b5fc9a0afd9eb4a8d5759809d3f15017168f Mon Sep 17 00:00:00 2001 From: Nulo Date: Sun, 10 Jul 2022 20:50:58 -0300 Subject: [PATCH] kak: Usar kakoune.cr en vez de fzf.kak Y solo setear foot en caso de que estemos en Wayland --- .config/kak/kakrc | 37 +++++++++++++++++-------------------- .readme.md | 8 +++++++- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.config/kak/kakrc b/.config/kak/kakrc index 3b53c41..bb27996 100644 --- a/.config/kak/kakrc +++ b/.config/kak/kakrc @@ -57,11 +57,15 @@ hook global WinSetOption filetype=go %{ # Usar Foot # ------------ -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" +eval %sh{ + test -n "$WAYLAND_DISPLAY" && 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" + } + ' } # ------------ @@ -102,25 +106,18 @@ hook -group sleuth global BufOpenFile .* %{ sleuth } hook -group sleuth global BufWritePost .* %{ sleuth } # ------------ -# FZF +# Kakoune.cr # ------------ -source "%val{config}/plugins/fzf.kak/rc/fzf.kak" evaluate-commands %sh{ - find -L "$kak_config/plugins/fzf.kak/rc/modules/" -type f -name '*.kak' -exec printf 'source "%s"\n' {} \; + kcr init kakoune } -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-modef' -map -docstring 'search buffers' global user b ': fzf-modeb' -map -docstring 'grep files' global user g ': fzf-modeg' + +map -docstring 'new client' global normal ': new' +map -docstring 'terminal' global normal ': connect terminal' +map -docstring 'file picker' global normal ': connect terminal-popup kcr fzf files -- -H' +map -docstring 'buffer picker' global normal ': connect terminal-popup kcr fzf buffers' +map -docstring 'grep picker' global normal ': connect terminal-popup kcr fzf grep' # ------------ # Buffer switching diff --git a/.readme.md b/.readme.md index a0f70d2..eac2b87 100644 --- a/.readme.md +++ b/.readme.md @@ -28,5 +28,11 @@ Probablemente incompleto. ### Alpine ```sh -apk add zsh zsh-vcs fzf vis +apk add zsh zsh-vcs fzf kak +``` + +#### Para desktop/IDE + +```sh +apk add kakoune-cr kakoune-cr-commands foot sway ```