kak: clean-up config, adjust popup size, reenable kks

diff --git a/kakrc b/kakrc
index 91b68baf2bec1d8e3e3bfbf740ae869788861127..b25d417eef8392c96c50bcb877f9537b471dc25f 100644 (file)
--- a/kakrc
+++ b/kakrc
@@ -51,19 +51,19 @@ hook global WinCreate [^*].* %{
 
 # session manager integration (kkga/kks)
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
-# evaluate-commands %sh{ kks init }
-# define-command -override kks-connect -params 1.. -command-completion  %{
-#   %arg{1} sh -c %{
-#     export EDITOR='kks edit'
-#     export KKS_SESSION=$1
-#     export KKS_CLIENT=$2
-#     shift 3
-
-#     [ $# = 0 ] && set "$SHELL"
-
-#     "$@"
-#   } -- %val{session} %val{client} %arg{@}
-# }
+evaluate-commands %sh{ kks init }
+define-command -override kks-connect -params 1.. -command-completion  %{
+  %arg{1} sh -c %{
+    export EDITOR='kks edit'
+    export KKS_SESSION=$1
+    export KKS_CLIENT=$2
+    shift 3
+
+    [ $# = 0 ] && set "$SHELL"
+
+    "$@"
+  } -- %val{session} %val{client} %arg{@}
+}
 
 # Enable PLUGin manager
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
@@ -204,7 +204,7 @@ set-face global StatusLineValue  green,default,default
 add-highlighter global/trailing-whitespace regex '\h+$' 0:Error
 
 # highlight comment tags
-add-highlighter global/todos regex '(//|#|/\*)\h*(TODO|WARNING|FIXME|MAYBE)[:]?[^\n]*' 1:default+bu@comment
+add-highlighter global/todos regex \b(TODO|WARNING|FIXME|MAYBE|NOTE)\b 1:default+bi@comment
 
 # show matching brackets
 add-highlighter global/ show-matching
@@ -306,10 +306,12 @@ map global normal -docstring 'terminal'                                <c-t>  ':
 map global normal -docstring 'files'                                   <c-f>  ': kks-connect popup kks-files<ret>'
 map global normal -docstring 'buffers'                                 <c-b>  ': kks-connect popup kks-buffers<ret>'
 map global normal -docstring 'live grep'                               <c-g>  ': kks-connect popup kks-grep<ret>'
+map global normal -docstring 'file browser'                            <c-h>  ': kks-connect popup kks-lf<ret>'
 map global normal -docstring 'lines in buffer'                         <c-l>  ': kks-connect popup kks-lines<ret>'
 map global normal -docstring 'recent files'                            <c-r>  ': kks-connect popup kks-mru<ret>'
+map global normal -docstring 'session selector'                        <c-s>  ': kks-connect popup kks-select<ret>'
+map global normal -docstring 'filetypes'                               <c-t>  ': kks-connect popup kks-filetypes<ret>'
 map global normal -docstring 'vcs client'                              <c-v>  ': kks-connect popup lazygit<ret>'
-map global normal -docstring 'file browser'                            <c-h>  ': kks-connect popup kks-lf<ret>'
 
 # normal mode additional mappings
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
@@ -320,6 +322,7 @@ map global normal -docstring 'comment line'                              '#'  ':
 map global normal -docstring 'comment block'                           <a-#>  ': comment-block<ret>'
 map global normal -docstring 'Next buffer '                            <c-n>  ': buffer-next<ret>'
 map global normal -docstring 'Previous buffer'                         <c-p>  ': buffer-previous<ret>'
+map global normal -docstring 'Debug buffer'                            <c-D>  ': buffer *debug*<ret>'
 map global normal -docstring 'Delete buffer'                           <c-q>  ': delete-buffer<ret>'
 map global normal -docstring 'add 1 int'                                 '^'  ': inc %val{count} +<ret>'
 map global normal -docstring 'substract 1 int'                         <a-^>  ': inc %val{count} -<ret>'
@@ -376,10 +379,8 @@ map global buffermode -docstring 'list buffers'                          l  ': k
 map global buffermode -docstring 'Lint buffer'                           L  ': buffer *lint-output*<ret>'
 map global buffermode -docstring 'next buffer'                           n  ': buffer-next<ret>'
 map global buffermode -docstring 'previous buffer'                       p  ': buffer-previous<ret>'
-map global buffermode -docstring 'wrap enable'                           w  ': add-highlighter buffer/bw wrap<ret>'
-map global buffermode -docstring 'Wrap disable'                          W  ': remove-highlighter buffer/bw<ret>'
-map global buffermode -docstring 'Word-wrap enable'                   <a-w> ': add-highlighter buffer/wordwrap wrap -word -indent<ret>'
-map global buffermode -docstring 'Word-wrap disable'                  <a-W> ': remove-highlighter buffer/wordwrap<ret>'
+map global buffermode -docstring 'Word-wrap enable'                      w  ': add-highlighter buffer/wordwrap wrap -word -indent<ret>'
+map global buffermode -docstring 'Word-wrap disable'                     W  ': remove-highlighter buffer/wordwrap<ret>'
 
 # selection user mode
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
@@ -411,7 +412,7 @@ set-option global foot_normal_cmd 'foot'
 set-option global foot_popup_cmd 'foot'
 set-option global foot_panel_cmd 'foot'
 set-option global foot_normal_flags ''
-set-option global foot_popup_flags '--app-id=kakpopup' '--window-size-chars=240x40'
+set-option global foot_popup_flags '--app-id=kakpopup' '--window-size-chars=160x40'
 # set-option global foot_popup_flags '--app-id=kakpopup'
-set-option global foot_panel_flags '--app-id=kakpanel' '--window-size-chars=240x1'
+set-option global foot_panel_flags '--app-id=kakpanel' '--window-size-chars=200x1'