diff --git a/config.yaml b/config.yaml index 14b3a39..ea0524d 100644 --- a/config.yaml +++ b/config.yaml @@ -13,6 +13,7 @@ variables: terminal: kitty bar: waybar bar_pos: top + font: mono: FiraCode Nerd Font interface: Inter @@ -25,20 +26,22 @@ profiles: dark: # {{{ variables: opacity: 0.98 + color: type: dark bg: '#202020' bg_light: '#404040' bg_dark: '#191919' - txt: '#ffffff' + txt: '#FFFFFF' nontxt: '#252525' + normal: black: '#404040' red: '#AB4642' green: '#A1B56C' yellow: '#E6C547' blue: '#6C99DA' - magenta: '#C397D8' + magenta: '#C10175' cyan: '#70C0BA' white: '#EAEAEA' dotfiles: @@ -47,24 +50,28 @@ profiles: light: # {{{ variables: opacity: 0.95 + color: type: light - bg: '#F5F5F5' + bg: '#FAFAFA' bg_light: '#A0A0A0' bg_dark: '#999999' txt: '#303030' nontxt: '#A0A0A0' + normal: black: '#555555' red: '#D54E53' green: '#008800' - yellow: '#EAB700' + yellow: '#DBB704' blue: '#0D68A8' magenta: '#C397D8' cyan: '#00A0A5' white: '#FFFFFF' + # }}} # Accents {{{ + accent_red: {variables: {accent_color: "#D9534F"}} accent_green: {variables: {accent_color: "#159828"}} accent_blue: {variables: {accent_color: "#3465A3"}} @@ -87,6 +94,7 @@ profiles: tabR: Y insertMode: s insertQuit: kk + #}}} qwerty: #{{{ variables: @@ -101,7 +109,9 @@ profiles: tabR: O insertMode: i insertQuit: jj + #}}} + main: #{{{ variables: gtk_theme: "materia-{{@@ env['USER'] @@}}-{{@@ accent_color_name @@}}-{{@@ color.type @@}}" @@ -114,6 +124,7 @@ profiles: - "{{@@ key_layout @@}}" - "{{@@ color_type @@}}" - "accent_{{@@ accent_color_name @@}}" + #}}} config: # {{{ diff --git a/dotfiles/kakoune.kak b/dotfiles/kakoune.kak index 1489ca8..129daa3 100644 --- a/dotfiles/kakoune.kak +++ b/dotfiles/kakoune.kak @@ -2,6 +2,8 @@ source "%val{config}/plugins/plug.kak/rc/plug.kak" + plug 'delapouite/kakoune-palette' + plug "andreyorst/fzf.kak" plug "kak-lsp/kak-lsp" do %{ cargo install --locked --force --path . @@ -77,6 +79,7 @@ hook global NormalIdle .* %{ try %{ git show-diff + palette-status } } hook global BufOpenFile .* %{ @@ -87,11 +90,13 @@ hook global InsertChar \t %{ exec -draft -itersel h@ } -group kakrc-replace-tabs-with-spaces add-highlighter global/ number-lines -relative -hlcursor + add-highlighter global/ show-whitespaces #color {%@@ set accent = "rgb:%s" % accent_color.replace('#','') @@%} {%@@ set bg_light = "rgb:%s" % color.bg_light.replace('#','') @@%} + {%@@ set nontxt = "rgb:%s" % color.nontxt.replace('#','') @@%} # For Code face global value default @@ -102,7 +107,7 @@ face global string green face global keyword {{@@ accent @@}} face global operator yellow - face global attribute green + face global attribute yellow+b face global comment {{@@ bg_light @@}} face global documentation comment face global meta magenta @@ -146,7 +151,7 @@ face global Prompt yellow,default face global MatchingChar default,default+b - face global Whitespace default,default+f + face global Whitespace {{@@ nontxt @@}},default+f face global BufferPadding blue,default #lsp diff --git a/dotfiles/nvim.vim b/dotfiles/nvim.vim index 5839ca2..5ee6dca 100644 --- a/dotfiles/nvim.vim +++ b/dotfiles/nvim.vim @@ -225,6 +225,7 @@ hi CursorLineNr guifg={{@@ c.nontxt @@}} hi VertSplit guibg=None guifg={{@@ c.bg_dark @@}} " set fillchars=vert:/ +hi Keyword guifg={{@@ accent_color @@}} hi Identifier guifg={{@@ accent_color @@}} hi MatchParen gui=bold guifg={{@@ n.yellow @@}}