From b490204bc51294a102aa3b61bb87f6b1d5280163 Mon Sep 17 00:00:00 2001 From: Andre Ramnitz Date: Sun, 15 Sep 2024 02:50:08 +0200 Subject: [PATCH] starship: integrate base16 --- config/dot-config/kak/starship.toml | 54 ++++++---- config/dot-config/starship.toml | 146 ++++++++++++---------------- 2 files changed, 96 insertions(+), 104 deletions(-) diff --git a/config/dot-config/kak/starship.toml b/config/dot-config/kak/starship.toml index 386e6506..839b0455 100644 --- a/config/dot-config/kak/starship.toml +++ b/config/dot-config/kak/starship.toml @@ -14,13 +14,14 @@ ${custom.kaklsp_hint}\ ${custom.kaklsp_code_actions}\ [](fg:green bg:black)\ ${git_branch}\ +${git_commit}\ ${git_state}\ ${git_status}\ -[](fg:#26233a bg:cyan)\ +[](fg:black bg:cyan)\ ${custom.kaksession}\ -[](fg:cyan bg:purple)\ +[](fg:cyan bg:black)\ ${custom.kakfiletype}\ -[](fg:purple bg:default)\ +[](bg:default fg:black)\ ${custom.kakmode}\ ${custom.kakcontext}\ ${custom.kaktime} @@ -35,19 +36,21 @@ disabled = true [git_branch] symbol = "" -style = "bg:#26233a" -format = '[[ $symbol $branch ](fg:purple bg:#26233a)]($style)' - -[git_status] -style = "bg:#26233a" -format = '[[($all_status$ahead_behind )](fg:purple bg:#26233a)]($style)' -ahead = '⇡${count}' -diverged = '⇕⇡${ahead_count}⇣${behind_count}' -behind = '⇣${count}' +style = "fg:green bg:black" +format = '[ $symbol $branch ]($style)' + +[git_commit] +format = '[\($hash$tag\)]($style)' +style = 'bg:black fg:green dimmed' +commit_hash_length = 6 +only_detached = false +tag_symbol = ' 笠' +tag_disabled = false +disabled = false [git_state] format = '\( [$state($progress_current/$progress_total)]($style)\)' -style = "bg:#26233a fg:white dimmed" +style = "bg:black fg:white dimmed" rebase = 'REBASING' merge = 'MERGING' revert = 'REVERTING' @@ -57,6 +60,21 @@ am = 'AM' am_or_rebase = 'AM/REBASE' disabled = false +[git_status] +format = '[ \[$all_status$ahead_behind\]]($style)[ ]($style)' +style = 'fg:bright-green bold' +stashed = '\$' +ahead = '⇡${count}' +behind = '⇣${count}' +diverged = '⇕⇡${ahead_count}⇣${behind_count}' +conflicted = '=' +deleted = '✘' +renamed = '»' +modified = '!' +staged = '+' +untracked = '?' +disabled = false + [directory] format = '[ $read_only]($style)[$path]($style)' truncation_length = 8 @@ -102,7 +120,7 @@ disabled = false [custom.kakcursor] description = 'The current Kakoune cursor position' -format = '[%val{cursor_line}:%val{cursor_char_column}]($style)' +format = '[ %val{cursor_line}:%val{cursor_char_column}]($style)' style = 'fg:black bg:blue' when = '' shell = ['true'] @@ -134,7 +152,7 @@ disabled = false [custom.kakfiletype] description = 'The current buffer filetype' format = '[ %opt{filetype} ]($style)' -style = 'fg:black bg:purple' +style = 'bg:black fg:cyan' when = '' shell = ['true'] disabled = false @@ -189,9 +207,9 @@ disabled = false [custom.kakbuflist] description = "Open buffers" -format = '[$output]($style)' -style = 'bg:bright-black fg:white' +format = '[ numbufs: $output ]($style)' +style = 'bg:bright-black fg:bright-white' when = 'true' shell = ['sh'] -command = 'kks get -s ${kak_session##*/} %val{buflist} | grep -vE "(\*scratch\*|\*debug\*|${kak_buffile##*/})" | rev | cut -d"/" -f1 | rev | paste -s -d "|" ' +command = 'kks get -s ${kak_session##*/} %val{buflist} | wc -w' disabled = false diff --git a/config/dot-config/starship.toml b/config/dot-config/starship.toml index e5d93a53..b9929942 100644 --- a/config/dot-config/starship.toml +++ b/config/dot-config/starship.toml @@ -1,74 +1,18 @@ "$schema" = 'https://starship.rs/config-schema.json' -# palette = 'rose-pine' - -# [palettes.rose-pine] -# base = '#191724' -# surface = '#1f1d2e' -# overlay = '#26233a' -# muted = '#6e6a86' -# subtle = '#908caa' -# text = '#e0def4' -# love = '#eb6f92' -# gold = '#f6c177' -# rose = '#ebbcba' -# pine = '#31748f' -# foam = '#9ccfd8' -# iris = '#c4a7e7' -# highlight_low = '#21202e' -# highlight_med = '#403d52' -# highlight_high = '#524f67' - -# [palettes.rose-pine-moon] -# base = '#232136' -# surface = '#2a273f' -# overlay = '#393552' -# muted = '#6e6a86' -# subtle = '#908caa' -# text = '#e0def4' -# love = '#eb6f92' -# gold = '#f6c177' -# rose = '#ea9a97' -# pine = '#3e8fb0' -# foam = '#9ccfd8' -# iris = '#c4a7e7' -# highlight_low = '#2a283e' -# highlight_med = '#44415a' -# highlight_high = '#56526e' - -# [palettes.rose-pine-dawn] -# base = '#faf4ed' -# surface = '#fffaf3' -# overlay = '#f2e9e1' -# muted = '#9893a5' -# subtle = '#797593' -# text = '#575279' -# love = '#b4637a' -# gold = '#ea9d34' -# rose = '#d7827e' -# pine = '#286983' -# foam = '#56949f' -# iris = '#907aa9' -# highlight_low = '#f4ede8' -# highlight_med = '#dfdad9' -# highlight_high = '#cecacd' - format = """ -[░▒▓](blue)\ -[  ](bg:blue fg:black)\ -[](bg:green fg:blue)\ +[░▒▓](fg:bright-black)\ +[  ](bg:bright-black fg:#DDDAEC)\ +[](bg:cyan fg:bright-black)\ $directory\ -[](fg:green bg:#26233a)\ -$git_branch\ -$git_status\ -[](fg:#26233a bg:#26233a)\ -$nodejs\ -$rust\ -$golang\ -$php\ -[](fg:#26233a bg:#1f1d2e)\ +[](fg:cyan bg:black)\ +${git_branch}\ +${git_commit}\ +${git_state}\ +${git_status}\ +[](fg:black bg:yellow)\ $time\ -[ ](fg:#1f1d2e)\ +[ ](fg:yellow bg:default)\ \n$character""" [character] @@ -76,7 +20,7 @@ success_symbol = '[❯](bold green) ' error_symbol = '[❯](bold red) ' [directory] -style = "fg:white bg:green" +style = 'fg:black bg:cyan' format = "[ $path ]($style)" truncation_length = 3 truncation_symbol = "…/" @@ -89,48 +33,78 @@ truncation_symbol = "…/" [git_branch] symbol = "" -style = "bg:#26233a" -format = '[[ $symbol $branch ](fg:purple bg:#26233a)]($style)' +style = "fg:cyan bg:black" +format = '[ $symbol $branch ]($style)' + +[git_commit] +format = '[\($hash$tag\)]($style)' +style = 'bg:black fg:cyan dimmed' +commit_hash_length = 6 +only_detached = false +tag_symbol = ' 笠' +tag_disabled = false +disabled = false + +[git_state] +format = '\( [$state($progress_current/$progress_total)]($style)\)' +style = "bg:black fg:white dimmed" +rebase = 'REBASING' +merge = 'MERGING' +revert = 'REVERTING' +cherry_pick = 'CHERRY-PICKING' +bisect = 'BISECTING' +am = 'AM' +am_or_rebase = 'AM/REBASE' +disabled = false [git_status] -style = "bg:#26233a" -format = '[[($all_status$ahead_behind )](fg:purple bg:#26233a)]($style)' +format = '[ \[$all_status$ahead_behind\]]($style)[ ]($style)' +style = 'bg:black fg:bright-green bold' +stashed = '\$' ahead = '⇡${count}' -diverged = '⇕⇡${ahead_count}⇣${behind_count}' behind = '⇣${count}' +diverged = '⇕⇡${ahead_count}⇣${behind_count}' +conflicted = '=' +deleted = '✘' +renamed = '»' +modified = '!' +staged = '+' +untracked = '?' +disabled = false + [c] symbol = "󰙱" -style = "bg:#26233a" -format = '[[ $symbol ($version) ](fg:green bg:#26233a)]($style)' +style = 'bg:bright-black' +format = '[[ $symbol ($version) ](fg:green bg:bright-black)]($style)' [nodejs] symbol = "󰎙" -style = "bg:#26233a" -format = '[[ $symbol ($version) ](fg:green bg:#26233a)]($style)' +style = 'bg:bright-black' +format = '[[ $symbol ($version) ](fg:green bg:bright-black)]($style)' [python] symbol = "󰌠" -style = "bg:#26233a" -format = '[[ $symbol ($version) ](fg:green bg:#26233a)]($style)' +style = 'bg:bright-black' +format = '[[ $symbol ($version) ](fg:green bg:bright-black)]($style)' [rust] symbol = "󱘗" -style = "bg:#26233a" -format = '[[ $symbol ($version) ](fg:green bg:#26233a)]($style)' +style = 'bg:bright-black' +format = '[[ $symbol ($version) ](fg:green bg:bright-black)]($style)' [golang] symbol = "󰟓" -style = "bg:#26233a" -format = '[[ $symbol ($version) ](fg:green bg:#26233a)]($style)' +style = 'bg:bright-black' +format = '[[ $symbol ($version) ](fg:green bg:bright-black)]($style)' [php] symbol = "" -style = "bg:#26233a" -format = '[[ $symbol ($version) ](fg:green bg:#26233a)]($style)' +style = 'bg:bright-black' +format = '[[ $symbol ($version) ](fg:green bg:bright-black)]($style)' [time] disabled = false time_format = "%R" # Hour:Minute Format -style = "bg:#1f1d2e" -format = '[[  $time ](fg:cyan bg:#1f1d2e)]($style)' +style = 'bg:yellow fg:black' +format = '[  $time ]($style)' -- 2.51.2