From: Andre Ramnitz Date: Sun, 17 May 2026 23:20:29 +0000 (+0200) Subject: kak: clean up config, update bundle, update starship X-Git-Url: https://git.ramnitz.eu/?a=commitdiff_plain;p=kakoune-config.git kak: clean up config, update bundle, update starship --- diff --git a/bundle/kak-bundle b/bundle/kak-bundle index 5b49521..264ddd2 160000 --- a/bundle/kak-bundle +++ b/bundle/kak-bundle @@ -1 +1 @@ -Subproject commit 5b49521f1f00a4bc9a0b12aff05d945e29b82fd3 +Subproject commit 264ddd2f802da826dc80b7ba1cdc11e6fb69fd9a diff --git a/kakrc b/kakrc index 12650e3..ce9ed9e 100644 --- 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" + + # also set other defaults here: + set-option global finaleol ifnotempty } 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 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 @@ -130,6 +132,7 @@ source %sh{ echo ${kak_config}/languagecmd.kak # boilerplate from https://git.sr.ht/~nasmevka } + # Small.kak config # ─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── define-command -hidden -docstring %{ @@ -139,27 +142,12 @@ define-command -hidden -docstring %{ 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 -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 @@ -268,26 +256,26 @@ hook -always global PromptIdle '' update_hex_color_code_ranges2 # default normal mode kks mappings # ─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── -map global normal -docstring 'terminal' ': kks-connect terminal' +map global normal -docstring 'terminal' ': kks-connect terminal' map global normal -docstring 'terminal' ': kks-connect terminal' -map global normal -docstring 'files' ': kks-connect popup kks-files' -map global normal -docstring 'files' ': kks-connect popup kks-files' -map global normal -docstring 'buffers' ': kks-connect popup kks-buffers' -map global normal -docstring 'buffers' ': kks-connect popup kks-buffers' -map global normal -docstring 'live grep' ': kks-connect popup kks-grep' -map global normal -docstring 'live grep' ': kks-connect popup kks-grep' -map global normal -docstring 'file browser' ': kks-connect popup kks-lf' -map global normal -docstring 'file browser' ': kks-connect popup kks-lf' -map global normal -docstring 'lines in buffer' ': kks-connect popup kks-lines' -map global normal -docstring 'lines in buffer' ': kks-connect popup kks-lines' -map global normal -docstring 'recent files' ': kks-connect popup kks-mru' -map global normal -docstring 'recent files' ': kks-connect popup kks-mru' -map global normal -docstring 'session selector' ': kks-connect popup kks-select' -map global normal -docstring 'session selector' ': kks-connect popup kks-select' -map global normal -docstring 'filetypes' ': kks-connect popup kks-filetypes' -map global normal -docstring 'filetypes' ': kks-connect popup kks-filetypes' -map global normal -docstring 'vcs client' ': kks-connect popup lazygit' -map global normal -docstring 'vcs client' ': kks-connect popup lazygit' +map global normal -docstring 'files' ': kks-connect terminal-popup kks-files' +map global normal -docstring 'files' ': kks-connect terminal-popup kks-files' +map global normal -docstring 'buffers' ': kks-connect terminal-popup kks-buffers' +map global normal -docstring 'buffers' ': kks-connect terminal-popup kks-buffers' +map global normal -docstring 'live grep' ': kks-connect terminal-popup kks-grep' +map global normal -docstring 'live grep' ': kks-connect terminal-popup kks-grep' +map global normal -docstring 'file browser' ': kks-connect terminal-popup kks-lf' +map global normal -docstring 'file browser' ': kks-connect terminal-popup kks-lf' +map global normal -docstring 'lines in buffer' ': kks-connect terminal-popup kks-lines' +map global normal -docstring 'lines in buffer' ': kks-connect terminal-popup kks-lines' +map global normal -docstring 'recent files' ': kks-connect terminal-popup kks-mru' +map global normal -docstring 'recent files' ': kks-connect terminal-popup kks-mru' +map global normal -docstring 'session selector' ': kks-connect terminal-popup kks-select' +map global normal -docstring 'session selector' ': kks-connect terminal-popup kks-select' +map global normal -docstring 'filetypes' ': kks-connect terminal-popup kks-filetypes' +map global normal -docstring 'filetypes' ': kks-connect terminal-popup kks-filetypes' +map global normal -docstring 'vcs client' ': kks-connect terminal-popup lazygit' +map global normal -docstring 'vcs client' ': kks-connect terminal-popup lazygit' # normal mode additional mappings # ─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── @@ -392,8 +380,10 @@ map global gitmode -docstring 'Status' s ':gi # 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 bd67d27..4ac7270 100644 --- 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}\ @@ -166,7 +170,7 @@ disabled = false [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