kak: clean up config, update bundle, update starship

diff --git a/bundle/kak-bundle b/bundle/kak-bundle
index 5b49521f1f00a4bc9a0b12aff05d945e29b82fd3..264ddd2f802da826dc80b7ba1cdc11e6fb69fd9a 160000 (submodule)
--- a/bundle/kak-bundle
+++ b/bundle/kak-bundle
@@ -1 +1 @@
-Subproject commit 5b49521f1f00a4bc9a0b12aff05d945e29b82fd3
+Subproject commit 264ddd2f802da826dc80b7ba1cdc11e6fb69fd9a

diff --git a/kakrc b/kakrc
index 12650e3c0ea5dde022680ac039a13a2b445e91ff..ce9ed9e597f9d01e59f993c015c6f2f8f480afa7 100644 (file)
--- a/kakrc
+++ b/kakrc
@@ -5,6 +5,9 @@
 # its usage is only documented in #3829
 hook global WinCreate .* %{
     set-option window ui_options "terminal_set_title=%val{bufname} - Kakoune"
 # its usage is only documented in #3829
 hook global WinCreate .* %{
     set-option window ui_options "terminal_set_title=%val{bufname} - Kakoune"

+
+    # also set other defaults here:
+    set-option global finaleol ifnotempty

 }
 
 def import -override -params 1 %{
 }
 
 def import -override -params 1 %{


@@ -70,7 +73,6 @@ bundle kakoune-find https://github.com/occivink/kakoune-find
 bundle kakoune-expand https://github.com/occivink/kakoune-expand
 bundle foot.kak https://github.com/kkga/foot.kak
 bundle kakoune-surround https://github.com/h-youhei/kakoune-surround
 bundle kakoune-expand https://github.com/occivink/kakoune-expand
 bundle foot.kak https://github.com/kkga/foot.kak
 bundle kakoune-surround https://github.com/h-youhei/kakoune-surround

-bundle shadow.kak https://github.com/ftonneau/shadow.kak

 bundle small.kak https://git.sr.ht/~nasmevka/small.kak
 bundle kakship https://github.com/eburghar/kakship %{
     kakship-enable
 bundle small.kak https://git.sr.ht/~nasmevka/small.kak
 bundle kakship https://github.com/eburghar/kakship %{
     kakship-enable


@@ -130,6 +132,7 @@ source %sh{
     echo ${kak_config}/languagecmd.kak # boilerplate from https://git.sr.ht/~nasmevka
 }
 
     echo ${kak_config}/languagecmd.kak # boilerplate from https://git.sr.ht/~nasmevka
 }
 

+

 # Small.kak config
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 define-command -hidden -docstring %{
 # Small.kak config
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 define-command -hidden -docstring %{


@@ -139,27 +142,12 @@ define-command -hidden -docstring %{
     small-spacetab-kak
 }
 
     small-spacetab-kak
 }
 

-# Shadow.kak config
-# ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
-# markdown
-shadow-set markdown \
-code ^\h*``` \n\h*``` nofirst nolast default,rgb:c9c9c9 \
-note ^Note \n\n first nolast default,rgb:ddddc5
-shadow-decorate markdown \
-border ^\h*``` default,rgb:c9afaf
-
-# kak
-shadow-set kak \
-comment ^# \n\h* first last default,rgb:1d1c1d
-shadow-decorate kak \
-border ^\h# default,rgb:222222
-

 
 # Look and Feel
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 # dabruin colorscheme config in separate file
 
 # Look and Feel
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 # dabruin colorscheme config in separate file

-source "%val{config}/dabruin-wrapper.kak"
-colorscheme dabruin
+#source "%val{config}/dabruin-wrapper.kak"
+# colorscheme dabruin

 
 set-face global StatusLine       cyan,default,default
 set-face global StatusLineInfo   blue,default,default
 
 set-face global StatusLine       cyan,default,default
 set-face global StatusLineInfo   blue,default,default


@@ -268,26 +256,26 @@ hook -always global PromptIdle '' update_hex_color_code_ranges2
 
 # default normal mode kks mappings
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 
 # default normal mode kks mappings
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

-map global normal -docstring 'terminal'                                <c-c>  ': kks-connect terminal<ret>'
+map global normal -docstring 'terminal'                                <c-c> ': kks-connect terminal<ret>'

 map global normal -docstring 'terminal'                                <F2>  ': kks-connect terminal<ret>'
 map global normal -docstring 'terminal'                                <F2>  ': kks-connect terminal<ret>'

-map global normal -docstring 'files'                                   <c-f>  ': kks-connect popup kks-files<ret>'
-map global normal -docstring 'files'                                   <F3>  ': kks-connect popup kks-files<ret>'
-map global normal -docstring 'buffers'                                 <c-b>  ': kks-connect popup kks-buffers<ret>'
-map global normal -docstring 'buffers'                                 <F4>   ': kks-connect popup kks-buffers<ret>'
-map global normal -docstring 'live grep'                               <c-g>  ': kks-connect popup kks-grep<ret>'
-map global normal -docstring 'live grep'                               <F5>  ': kks-connect popup kks-grep<ret>'
-map global normal -docstring 'file browser'                            <c-h>  ': kks-connect popup kks-lf<ret>'
-map global normal -docstring 'file browser'                            <F6>  ': 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 'lines in buffer'                         <F7>  ': kks-connect popup kks-lines<ret>'
-map global normal -docstring 'recent files'                            <c-r>  ': kks-connect popup kks-mru<ret>'
-map global normal -docstring 'recent files'                            <F8>  ': kks-connect popup kks-mru<ret>'
-map global normal -docstring 'session selector'                        <c-s>  ': kks-connect popup kks-select<ret>'
-map global normal -docstring 'session selector'                        <F9>  ': kks-connect popup kks-select<ret>'
-map global normal -docstring 'filetypes'                               <c-t>  ': kks-connect popup kks-filetypes<ret>'
-map global normal -docstring 'filetypes'                               <F10>  ': kks-connect popup kks-filetypes<ret>'
-map global normal -docstring 'vcs client'                              <c-v>  ': kks-connect popup lazygit<ret>'
-map global normal -docstring 'vcs client'                              <F11>  ': kks-connect popup lazygit<ret>'
+map global normal -docstring 'files'                                   <c-f> ': kks-connect terminal-popup kks-files<ret>'
+map global normal -docstring 'files'                                   <F3>  ': kks-connect terminal-popup kks-files<ret>'
+map global normal -docstring 'buffers'                                 <c-b> ': kks-connect terminal-popup kks-buffers<ret>'
+map global normal -docstring 'buffers'                                 <F4>  ': kks-connect terminal-popup kks-buffers<ret>'
+map global normal -docstring 'live grep'                               <c-g> ': kks-connect terminal-popup kks-grep<ret>'
+map global normal -docstring 'live grep'                               <F5>  ': kks-connect terminal-popup kks-grep<ret>'
+map global normal -docstring 'file browser'                            <c-h> ': kks-connect terminal-popup kks-lf<ret>'
+map global normal -docstring 'file browser'                            <F6>  ': kks-connect terminal-popup kks-lf<ret>'
+map global normal -docstring 'lines in buffer'                         <c-l> ': kks-connect terminal-popup kks-lines<ret>'
+map global normal -docstring 'lines in buffer'                         <F7>  ': kks-connect terminal-popup kks-lines<ret>'
+map global normal -docstring 'recent files'                            <c-r> ': kks-connect terminal-popup kks-mru<ret>'
+map global normal -docstring 'recent files'                            <F8>  ': kks-connect terminal-popup kks-mru<ret>'
+map global normal -docstring 'session selector'                        <c-s> ': kks-connect terminal-popup kks-select<ret>'
+map global normal -docstring 'session selector'                        <F9>  ': kks-connect terminal-popup kks-select<ret>'
+map global normal -docstring 'filetypes'                               <c-t> ': kks-connect terminal-popup kks-filetypes<ret>'
+map global normal -docstring 'filetypes'                               <F10> ': kks-connect terminal-popup kks-filetypes<ret>'
+map global normal -docstring 'vcs client'                              <c-v> ': kks-connect terminal-popup lazygit<ret>'
+map global normal -docstring 'vcs client'                              <F11> ': kks-connect terminal-popup lazygit<ret>'

 
 # normal mode additional mappings
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 
 # normal mode additional mappings
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────


@@ -392,8 +380,10 @@ map global gitmode -docstring 'Status'                                   s  ':gi
 
 # terminal config (via foot.kak)
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 
 # terminal config (via foot.kak)
 # ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

-set-option global foot_popup_cmd 'foot'
-set-option global foot_panel_cmd 'foot'
-set-option global foot_popup_flags '-a kakpopup '
-set-option global foot_panel_flags '-a kakpanel '
+declare-option str foot_normal_cmd 'foot'
+declare-option str foot_popup_cmd 'foot'
+declare-option str foot_panel_cmd 'foot'
+declare-option str-list foot_normal_flags
+declare-option str-list foot_popup_flags '--app-id=popup'
+declare-option str-list foot_panel_flags '--app-id=panel'

 
 

diff --git a/starship.toml b/starship.toml
index bd67d27ff9039057a766bc9a3eb1e978843b0e62..4ac727070d3b0f41ccb968c273ce9a461a98328a 100644 (file)
--- a/starship.toml
+++ b/starship.toml
@@ -1,3 +1,7 @@
+"$schema" = 'https://starship.rs/config-schema.json'
+
+# include = ["$HOME/.cache/noctalia/starship-palette.toml"]
+

 add_newline = false
 format = """\
 ${custom.kakmode}\
 add_newline = false
 format = """\
 ${custom.kakmode}\


@@ -166,7 +170,7 @@ disabled = false
 [custom.kaksession]
 description = 'The current Kakoune session'
 format = '[](fg:bright-black bg:black)[  %val{client}:%val{session} ]($style)'
 [custom.kaksession]
 description = 'The current Kakoune session'
 format = '[](fg:bright-black bg:black)[  %val{client}:%val{session} ]($style)'

-style = 'bg:bright-black fg:purple'
+style = 'bg:bright-black fg:bright-yellow'

 when = ''
 shell = ['true']
 disabled = false
 when = ''
 shell = ['true']
 disabled = false