diff --git a/kakoune/.config/kak/kakrc b/kakoune/.config/kak/kakrc index 231596f..bb453c2 100644 --- a/kakoune/.config/kak/kakrc +++ b/kakoune/.config/kak/kakrc @@ -33,11 +33,14 @@ map global -docstring 'Git' user 'g' ': enter-user-mode git-mode' map global -docstring 'Blame' git-mode 'b' ': git blame' map global -docstring 'Blame' git-mode 'B' ': git blame-jump' map global -docstring 'Diff file' git-mode 'd' ': git diff %val{buffile}' +map global -docstring 'Diff' git-mode 'D' ': git diff' map global -docstring 'Grep' git-mode 'g' ': git grep ' map global -docstring 'Log' git-mode 'l' ': git log -- %val{buffile}' map global -docstring 'Log' git-mode 'L' ': git log' -map global -docstring 'Show diff' git-mode 's' ': git show-diff' -map global -docstring 'Hide diff' git-mode 'h' ': git hide-diff' +map global -docstring 'Show branch' git-mode 'c' ': git show-branch' +map global -docstring 'Status' git-mode 't' ': git status' +map global -docstring 'Show diff' git-mode 's' ': git-show-diff' +map global -docstring 'Hide diff' git-mode 'h' ': git-hide-diff' map global -docstring 'Next hunk' git-mode 'n' ': git next-hunk' map global -docstring 'Prev hunk' git-mode 'p' ': git prev-hunk' @@ -102,16 +105,28 @@ define-command git-log-show-current-commit %{ git show %val{selection} } +define-command -override git-show-diff %{ + hook buffer -group git-show-diff NormalIdle .* %{ git update-diff } + git show-diff +} + +define-command -override git-hide-diff %{ + remove-hooks buffer git-show-diff + git hide-diff +} + set-face global JumpLabel 'rgb:faf8f5,rgb:af8842+F' # CHANGE STATUS BAR COLOR IN INSERT MODE hook global ModeChange push:.*:insert %{ set-face window StatusLine 'default,rgb:04785d' + set-option window idle_timeout 500 } hook global ModeChange pop:insert:.* %{ unset-face window StatusLine + unset-option window idle_timeout } # ODIN