From 16169fbab48f0f1b41413294e8821d336dc8fda7 Mon Sep 17 00:00:00 2001 From: Michael Chalupiak Date: Fri, 14 Nov 2025 00:11:07 -0500 Subject: [PATCH] merge --- config/.Xresources | 1 - config/.config/ghostty/config | 2 +- config/.config/kak/al/rc/typst.kak | 69 -------- config/.config/kak/colors/carbonfox.kak | 191 +++++++++++++++++++++ config/.config/kak/colors/dawnfox.kak | 178 +++++++++++++++++++ config/.config/kak/kakrc | 216 +++++++++++++----------- config/.config/nvim/lazy-lock.json | 60 +++---- config/.profile | 2 +- 8 files changed, 522 insertions(+), 197 deletions(-) delete mode 100644 config/.config/kak/al/rc/typst.kak create mode 100644 config/.config/kak/colors/carbonfox.kak create mode 100644 config/.config/kak/colors/dawnfox.kak diff --git a/config/.Xresources b/config/.Xresources index 6c101db..b92715e 100644 --- a/config/.Xresources +++ b/config/.Xresources @@ -1,5 +1,4 @@ ! High DPI Settings for Window Managers -!Xft.dpi: 192 ! #define background_opacity 80 #include ".theme.xresources" ! .alpha: 0.2 diff --git a/config/.config/ghostty/config b/config/.config/ghostty/config index 76c7c8c..3edeaf6 100644 --- a/config/.config/ghostty/config +++ b/config/.config/ghostty/config @@ -15,7 +15,7 @@ font-size = 14 font-thicken = true # font-variation = wdth=100 # theme = light:xcodelight,dark:xcodedark -theme = light:dawnfox,dark:carbonfox +theme = light:Dawnfox,dark:Carbonfox # theme = Monokai Classic # window-decoration = false # gtk-adwaita = false diff --git a/config/.config/kak/al/rc/typst.kak b/config/.config/kak/al/rc/typst.kak deleted file mode 100644 index 5353ea6..0000000 --- a/config/.config/kak/al/rc/typst.kak +++ /dev/null @@ -1,69 +0,0 @@ -# Detection -# ‾‾‾‾‾‾‾‾‾ - -hook global BufCreate .*[.](typ) %{ - set-option buffer filetype typst -} - -# Initialization -# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ - -hook -group typst-highlight global WinSetOption filetype=typst %{ - require-module typst - - add-highlighter window/typst ref typst - hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/typst } - hook window InsertChar \n -group typst typst-on-new-line -} - -provide-module typst %§ - -# Highlighters -# ‾‾‾‾‾‾‾‾‾‾‾‾ - -add-highlighter shared/typst group - -# Comments -add-highlighter shared/typst/ regex ^//(?:[^\n/][^\n]*|)$ 0:comment - -# Strings -add-highlighter shared/typst/ regex '"[^"]*"' 0:string - -# Headings -add-highlighter shared/typst/ regex ^=+\h+[^\n]+$ 0:header - -# Code blocks -# Raw with optional syntax highlighting -add-highlighter shared/typst/ regex '^```[^(```)]*```' 0:mono -# Multiline monospace -add-highlighter shared/typst/ regex '^`[^(`)]*`' 0:mono - -# Monospace text -add-highlighter shared/typst/ regex \B(`[^\n]+?`)\B 0:mono -add-highlighter shared/typst/ regex \B(```[^\n]+?```)\B 0:mono - -# Bold text -add-highlighter shared/typst/ regex \s\*[^\*]+\*\B 0:+b - -# Italic text -add-highlighter shared/typst/ regex \b_.*?_\b 0:+i - -# Code expressions: functions, variables -add-highlighter shared/typst/ regex (^|\h)#(\w|\.|-)+ 0:meta - -# Bold terms in term lists -add-highlighter shared/typst/ regex ^/\h[^:]*: 0:+b - -§ - -# Commands -# ‾‾‾‾‾‾‾‾ - -define-command -hidden typst-on-new-line %< - evaluate-commands -draft -itersel %< - # Preserve previous line indent - try %{ execute-keys -draft K } - # Cleanup trailing whitespaces from previous line - try %{ execute-keys -draft k x s \h+$ d } - > -> diff --git a/config/.config/kak/colors/carbonfox.kak b/config/.config/kak/colors/carbonfox.kak new file mode 100644 index 0000000..389836a --- /dev/null +++ b/config/.config/kak/colors/carbonfox.kak @@ -0,0 +1,191 @@ +# Carbonfox theme for Kakoune +# +# Taken and adapted from +# + +# Color palette +declare-option str black_base "rgb:282828" +declare-option str black_dim "rgb:222222" +declare-option str black_bright "rgb:484848" + +declare-option str red_base "rgb:ee5396" +declare-option str red_dim "rgb:ca4780" +declare-option str red_bright "rgb:f16da6" + +declare-option str green_base "rgb:25be6a" +declare-option str green_dim "rgb:1fa25a" +declare-option str green_bright "rgb:46c880" + +declare-option str yellow_base "rgb:08bdba" +declare-option str yellow_dim "rgb:07a19e" +declare-option str yellow_bright "rgb:2dc7c4" + +declare-option str blue_base "rgb:78a9ff" +declare-option str blue_dim "rgb:6690d9" +declare-option str blue_bright "rgb:8cb6ff" + +declare-option str magenta_base "rgb:be95ff" +declare-option str magenta_dim "rgb:a27fd9" +declare-option str magenta_bright "rgb:c8a5ff" + +declare-option str cyan_base "rgb:33b1ff" +declare-option str cyan_dim "rgb:2b96d9" +declare-option str cyan_bright "rgb:52bdff" + +declare-option str white_base "rgb:dfdfe0" +declare-option str white_dim "rgb:bebebe" +declare-option str white_bright "rgb:e4e4e5" + +declare-option str orange_base "rgb:3ddbd9" +declare-option str orange_dim "rgb:34bab8" +declare-option str orange_bright "rgb:5ae0df" + +declare-option str pink_base "rgb:ff7eb6" +declare-option str pink_dim "rgb:d96b9b" +declare-option str pink_bright "rgb:ff91c1" + +declare-option str bg0 "rgb:0c0c0c" +declare-option str bg1 "rgb:161616" +declare-option str bg2 "rgb:252525" +declare-option str bg3 "rgb:353535" +declare-option str bg4 "rgb:535353" + +declare-option str fg0 "rgb:f9fbff" +declare-option str fg1 "rgb:f2f4f8" +declare-option str fg2 "rgb:b6b8bb" +declare-option str fg3 "rgb:7b7c7e" + +declare-option str comment "rgb:6e6f70" + +declare-option str sel1 "rgb:525253" +declare-option str sel0 "rgb:2a2a2a" + +# Markup +set-face global title "%opt{yellow_base}" +set-face global header "%opt{red_bright}" +set-face global bold "%opt{fg1}+b" +set-face global italic "%opt{fg1}+i" + +# Builtins +set-face global Default "%opt{fg1},%opt{bg1}" +set-face global PrimarySelection "%opt{fg2},%opt{sel0}" +set-face global SecondarySelection "%opt{fg3},%opt{sel1}" +set-face global PrimaryCursor "%opt{bg1},%opt{fg1}" +set-face global SecondaryCursor "%opt{bg1},%opt{fg2}" +set-face global PrimaryCursorEol "%opt{fg2},%opt{blue_bright}" +set-face global SecondaryCursorEol "%opt{fg3},%opt{blue_dim}" +set-face global LineNumbers "%opt{fg3},%opt{bg1}" +set-face global LineNumberCursor "%opt{fg2},%opt{bg1}" +set-face global LineNumbersWrapped "%opt{fg3},%opt{bg1}+i" +set-face global MenuForeground "%opt{fg1},%opt{sel1}" +set-face global MenuBackground "%opt{fg1},%opt{sel0}" +set-face global MenuInfo "%opt{fg1},%opt{bg0}" +set-face global Information "%opt{fg1},%opt{bg0}" +set-face global Error "%opt{red_base},%opt{bg0}" +set-face global StatusLine "%opt{fg2},%opt{bg0}" +set-face global StatusLineMode "%opt{green_bright},%opt{bg0}" +set-face global StatusLineInfo "%opt{blue_bright},%opt{bg0}" +set-face global StatusLineValue "%opt{orange_base},%opt{bg0}" +set-face global StatusCursor "%opt{bg0},%opt{fg2}" +set-face global Prompt "%opt{blue_bright},%opt{bg0}" +set-face global MatchingChar "%opt{fg1},%opt{sel1}" +set-face global Whitespace "%opt{fg3},%opt{bg1}" +set-face global WrapMarker Whitespace +set-face global BufferPadding "%opt{blue_dim},%opt{bg1}" + +# Code +set-face global value "%opt{orange_bright}" +set-face global type "%opt{yellow_base}" +set-face global variable "%opt{white_base}" +set-face global module "%opt{blue_base}" +set-face global function "%opt{blue_bright}" +set-face global string "%opt{green_base}" +set-face global keyword "%opt{magenta_base}" +set-face global operator "%opt{fg2}" +set-face global attribute "%opt{blue_base}" +set-face global comment "%opt{comment}" +set-face global documentation comment +set-face global meta "%opt{pink_bright}" +set-face global builtin "%opt{red_base}" + +# Tree-sitter () +set-face global ts_attribute "%opt{yellow_base}" +set-face global ts_comment "%opt{comment}" +set-face global ts_comment_unused "%opt{comment}" +set-face global ts_conceal "%opt{magenta_dim}" +set-face global ts_constant "%opt{orange_bright}" +set-face global ts_constant_builtin_boolean "%opt{orange_bright}" +set-face global ts_constant_character "%opt{green_base}" +set-face global ts_constant_macro "%opt{orange_bright}" +set-face global ts_constructor "%opt{cyan_base}" +set-face global ts_diff_plus "%opt{green_base}" +set-face global ts_diff_minus "%opt{red_base}" +set-face global ts_diff_delta "%opt{yellow_base}" +set-face global ts_diff_delta_moved "%opt{blue_base}" +set-face global ts_error "%opt{red_base}" +set-face global ts_function "%opt{blue_bright}" +set-face global ts_function_builtin "%opt{pink_base}" +set-face global ts_function_macro "%opt{pink_bright}" +set-face global ts_function_method_private "%opt{blue_dim}" +set-face global ts_hint "%opt{orange_base}" +set-face global ts_info "%opt{blue_base}" +set-face global ts_keyword "%opt{magenta_base}" +set-face global ts_keyword_conditional "%opt{magenta_bright}" +set-face global ts_keyword_control_conditional "%opt{magenta_bright}" +set-face global ts_keyword_control_directive "%opt{pink_bright}" +set-face global ts_keyword_control_import "%opt{orange_bright}" +set-face global ts_keyword_directive "%opt{pink_bright}" +set-face global ts_keyword_storage "%opt{blue_base}" +set-face global ts_keyword_storage_modifier "%opt{magenta_base}" +set-face global ts_keyword_storage_modifier_mut "%opt{blue_bright}" +set-face global ts_keyword_storage_modifier_ref "%opt{blue_bright}" +set-face global ts_label "%opt{pink_base}+i" +set-face global ts_markup_bold "%opt{red_base}+b" +set-face global ts_markup_heading "%opt{blue_base}" +set-face global ts_markup_heading_1 "%opt{blue_base}" +set-face global ts_markup_heading_2 "%opt{blue_base}" +set-face global ts_markup_heading_3 "%opt{blue_base}" +set-face global ts_markup_heading_4 "%opt{blue_base}" +set-face global ts_markup_heading_5 "%opt{blue_base}" +set-face global ts_markup_heading_6 "%opt{blue_base}" +set-face global ts_markup_heading_marker "%opt{orange_base}+b" +set-face global ts_markup_italic "%opt{pink_base}+i" +set-face global ts_markup_list_checked "%opt{green_base}" +set-face global ts_markup_list_numbered "%opt{fg2}" +set-face global ts_markup_list_unchecked "%opt{cyan_base}" +set-face global ts_markup_list_unnumbered "%opt{fg2}" +set-face global ts_markup_link_label "%opt{blue_base}" +set-face global ts_markup_link_url "%opt{cyan_base}+u" +set-face global ts_markup_link_uri "%opt{cyan_base}+u" +set-face global ts_markup_link_text "%opt{blue_base}" +set-face global ts_markup_quote "%opt{fg2},%opt{bg2}" +set-face global ts_markup_raw "%opt{green_base}" +set-face global ts_markup_strikethrough "%opt{fg1}+s" +set-face global ts_namespace "%opt{cyan_base}" +set-face global ts_operator "%opt{fg2}" +set-face global ts_property "%opt{blue_base}" +set-face global ts_punctuation "%opt{fg2}" +set-face global ts_punctuation_special "%opt{blue_bright}" +set-face global ts_special "%opt{blue_base}" +set-face global ts_spell "%opt{fg1},%opt{bg1},%opt{red_base}+c" +set-face global ts_string "%opt{green_base}" +set-face global ts_string_regex "%opt{yellow_bright}" +set-face global ts_string_regexp "%opt{yellow_bright}" +set-face global ts_string_escape "%opt{cyan_base}" +set-face global ts_string_special "%opt{green_base}" +set-face global ts_string_special_path "%opt{green_base}" +set-face global ts_string_special_symbol "%opt{green_base}" +set-face global ts_string_symbol "%opt{green_base}" +set-face global ts_tag "%opt{blue_base}" +set-face global ts_tag_error "%opt{red_base}" +set-face global ts_text "%opt{white_base}" +set-face global ts_text_title "%opt{orange_base}" +set-face global ts_type "%opt{yellow_base}" +set-face global ts_type_enum_variant "%opt{yellow_base}" +set-face global ts_type_enum_variant_builtin "%opt{orange_bright}" +set-face global ts_variable "%opt{white_base}" +set-face global ts_variable_builtin "%opt{red_base}" +set-face global ts_variable_other_member "%opt{cyan_base}" +set-face global ts_variable_other_member_private "%opt{cyan_dim}" +set-face global ts_variable_parameter "%opt{blue_base}" +set-face global ts_warning "%opt{magenta_base}" diff --git a/config/.config/kak/colors/dawnfox.kak b/config/.config/kak/colors/dawnfox.kak new file mode 100644 index 0000000..06e3494 --- /dev/null +++ b/config/.config/kak/colors/dawnfox.kak @@ -0,0 +1,178 @@ +# Carbonfox theme for Kakoune +# +# Taken and adapted from +# + +# Color palette +declare-option str pink_dim "rgb:c9709e" +declare-option str pink_base "rgb:d685af" +declare-option str pink_bright "rgb:de8db7" +declare-option str bg2 "rgb:ebe0df" +declare-option str fg1 "rgb:575279" +declare-option str bg3 "rgb:ebdfe4" +declare-option str orange_dim "rgb:ca6e69" +declare-option str orange_base "rgb:d7827e" +declare-option str orange_bright "rgb:de8c88" +declare-option str red_dim "rgb:a5576d" +declare-option str red_base "rgb:b4637a" +declare-option str red_bright "rgb:c26d85" +declare-option str green_dim "rgb:597668" +declare-option str green_base "rgb:618774" +declare-option str green_bright "rgb:629f81" +declare-option str cyan_dim "rgb:50848c" +declare-option str cyan_base "rgb:56949f" +declare-option str cyan_bright "rgb:5ca7b4" +declare-option str black_dim "rgb:504c6b" +declare-option str black_base "rgb:575279" +declare-option str black_bright "rgb:5f5695" +declare-option str yellow_dim "rgb:dd9024" +declare-option str yellow_base "rgb:ea9d34" +declare-option str yellow_bright "rgb:eea846" +declare-option str fg3 "rgb:a8a3b3" +declare-option str sel1 "rgb:b8cece" +declare-option str comment "rgb:9893a5" +declare-option str blue_dim "rgb:295e73" +declare-option str blue_base "rgb:286983" +declare-option str blue_bright "rgb:2d81a3" +declare-option str sel0 "rgb:d0d8d8" +declare-option str fg2 "rgb:625c87" +declare-option str bg1 "rgb:faf4ed" +declare-option str fg0 "rgb:4c4769" +declare-option str bg4 "rgb:bdbfc9" +declare-option str bg0 "rgb:ebe5df" +declare-option str white_dim "rgb:c8cfde" +declare-option str white_base "rgb:e5e9f0" +declare-option str white_bright "rgb:e6ebf3" +declare-option str magenta_dim "rgb:816b9a" +declare-option str magenta_base "rgb:907aa9" +declare-option str magenta_bright "rgb:9a80b9" + +# Markup +set-face global title "%opt{yellow_base}" +set-face global header "%opt{red_dim}+b" +set-face global bold "%opt{fg1}+b" +set-face global italic "%opt{fg1}+i" + +# Builtins +set-face global Default "%opt{fg1},%opt{bg1}" +set-face global PrimarySelection "%opt{fg2},%opt{sel0}" +set-face global SecondarySelection "%opt{fg3},%opt{sel1}" +set-face global PrimaryCursor "%opt{bg1},%opt{fg1}" +set-face global SecondaryCursor "%opt{bg1},%opt{fg2}" +set-face global PrimaryCursorEol "%opt{bg2},%opt{blue_bright}" +set-face global SecondaryCursorEol "%opt{bg3},%opt{blue_dim}" +set-face global LineNumbers "%opt{fg3},%opt{bg1}" +set-face global LineNumberCursor "%opt{fg2},%opt{bg1}" +set-face global LineNumbersWrapped "%opt{fg3},%opt{bg1}+i" +set-face global MenuForeground "%opt{fg1},%opt{sel1}" +set-face global MenuBackground "%opt{fg1},%opt{sel0}" +set-face global MenuInfo "%opt{fg1},%opt{bg0}" +set-face global Information "%opt{fg1},%opt{bg0}" +set-face global Error "%opt{red_base},%opt{bg0}" +set-face global StatusLine "%opt{fg2},%opt{bg0}" +set-face global StatusLineMode "%opt{green_bright},%opt{bg0}" +set-face global StatusLineInfo "%opt{blue_bright},%opt{bg0}" +set-face global StatusLineValue "%opt{orange_base},%opt{bg0}" +set-face global StatusCursor "%opt{bg0},%opt{fg2}" +set-face global Prompt "%opt{blue_bright},%opt{bg0}" +set-face global MatchingChar "%opt{fg1},%opt{sel1}" +set-face global Whitespace "%opt{fg3},%opt{bg1}" +set-face global WrapMarker Whitespace +set-face global BufferPadding "%opt{blue_dim},%opt{bg1}" + +# Code +set-face global value "%opt{orange_dim}" +set-face global type "%opt{yellow_base}" +set-face global variable "%opt{black_base}" +set-face global module "%opt{blue_base}" +set-face global function "%opt{blue_dim}" +set-face global string "%opt{green_base}" +set-face global keyword "%opt{magenta_base}" +set-face global operator "%opt{fg2}" +set-face global attribute "%opt{blue_base}" +set-face global comment "%opt{comment}" +set-face global documentation comment +set-face global meta "%opt{pink_dim}" +set-face global builtin "%opt{red_base}" + +# Tree-sitter () +set-face global ts_attribute "%opt{yellow_base}" +set-face global ts_comment "%opt{comment}" +set-face global ts_comment_unused "%opt{comment}" +set-face global ts_conceal "%opt{magenta_dim}" +set-face global ts_constant "%opt{orange_dim}" +set-face global ts_constant_builtin_boolean "%opt{orange_dim}" +set-face global ts_constant_character "%opt{green_base}" +set-face global ts_constant_macro "%opt{orange_dim}" +set-face global ts_constructor "%opt{cyan_base}" +set-face global ts_diff_plus "%opt{green_base}" +set-face global ts_diff_minus "%opt{red_base}" +set-face global ts_diff_delta "%opt{yellow_base}" +set-face global ts_diff_delta_moved "%opt{blue_base}" +set-face global ts_error "%opt{red_base}" +set-face global ts_function "%opt{blue_dim}" +set-face global ts_function_builtin "%opt{pink_base}" +set-face global ts_function_macro "%opt{pink_dim}" +set-face global ts_function_method_private "%opt{blue_dim}" +set-face global ts_hint "%opt{green_base}" +set-face global ts_info "%opt{blue_base}" +set-face global ts_keyword "%opt{magenta_base}" +set-face global ts_keyword_conditional "%opt{magenta_dim}" +set-face global ts_keyword_control_conditional "%opt{magenta_dim}" +set-face global ts_keyword_control_directive "%opt{pink_dim}" +set-face global ts_keyword_control_import "%opt{orange_dim}" +set-face global ts_keyword_directive "%opt{pink_dim}" +set-face global ts_keyword_storage "%opt{blue_base}" +set-face global ts_keyword_storage_modifier "%opt{magenta_base}" +set-face global ts_keyword_storage_modifier_mut "%opt{blue_dim}" +set-face global ts_keyword_storage_modifier_ref "%opt{blue_dim}" +set-face global ts_label "%opt{pink_base}+i" +set-face global ts_markup_bold "%opt{red_base}+b" +set-face global ts_markup_heading "%opt{blue_base}" +set-face global ts_markup_heading_1 "%opt{blue_base}+b" +set-face global ts_markup_heading_2 "%opt{blue_base}+b" +set-face global ts_markup_heading_3 "%opt{blue_base}+b" +set-face global ts_markup_heading_4 "%opt{blue_base}+b" +set-face global ts_markup_heading_5 "%opt{blue_base}+b" +set-face global ts_markup_heading_6 "%opt{blue_base}+b" +set-face global ts_markup_heading_marker "%opt{orange_base}+b" +set-face global ts_markup_italic "%opt{pink_base}+i" +set-face global ts_markup_list_checked "%opt{green_base}" +set-face global ts_markup_list_numbered "%opt{fg2}" +set-face global ts_markup_list_unchecked "%opt{cyan_base}" +set-face global ts_markup_list_unnumbered "%opt{fg2}" +set-face global ts_markup_link_label "%opt{blue_base}" +set-face global ts_markup_link_url "%opt{cyan_base}+u" +set-face global ts_markup_link_uri "%opt{cyan_base}+u" +set-face global ts_markup_link_text "%opt{blue_base}" +set-face global ts_markup_quote "%opt{fg2},%opt{bg2}" +set-face global ts_markup_raw "%opt{green_base}" +set-face global ts_markup_strikethrough "%opt{fg1}+s" +set-face global ts_namespace "%opt{cyan_base}" +set-face global ts_operator "%opt{fg2}" +set-face global ts_property "%opt{blue_base}" +set-face global ts_punctuation "%opt{fg2}" +set-face global ts_punctuation_special "%opt{blue_dim}" +set-face global ts_special "%opt{blue_base}" +set-face global ts_spell "%opt{fg1},%opt{bg1},%opt{red_base}+c" +set-face global ts_string "%opt{green_base}" +set-face global ts_string_regex "%opt{yellow_dim}" +set-face global ts_string_regexp "%opt{yellow_dim}" +set-face global ts_string_escape "%opt{cyan_base}" +set-face global ts_string_special "%opt{green_base}" +set-face global ts_string_special_path "%opt{green_base}" +set-face global ts_string_special_symbol "%opt{green_base}" +set-face global ts_string_symbol "%opt{green_base}" +set-face global ts_tag "%opt{blue_base}" +set-face global ts_tag_error "%opt{red_base}" +set-face global ts_text "%opt{black_base}" +set-face global ts_text_title "%opt{orange_base}" +set-face global ts_type "%opt{yellow_base}" +set-face global ts_type_enum_variant "%opt{yellow_base}" +set-face global ts_type_enum_variant_builtin "%opt{orange_dim}" +set-face global ts_variable "%opt{black_base}" +set-face global ts_variable_builtin "%opt{red_base}" +set-face global ts_variable_other_member "%opt{cyan_base}" +set-face global ts_variable_other_member_private "%opt{cyan_dim}" +set-face global ts_variable_parameter "%opt{blue_base}" +set-face global ts_warning "%opt{yellow_base}" diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc index 4ba2642..ee9f6e0 100644 --- a/config/.config/kak/kakrc +++ b/config/.config/kak/kakrc @@ -49,11 +49,11 @@ plug "https://git.sr.ht/~hadronized/kakoune-tree-sitter-themes" theme set-option global luar_interpreter luajit ## Treesitter ## - -# eval %sh{ kak-tree-sitter -dksvvv --with-highlighting --with-text-objects --init $kak_session } +eval %sh{ kak-tree-sitter -dksvvv --with-highlighting --with-text-objects --init $kak_session } #eval %sh{ kak-tree-sitter -dks --with-text-objects --session $kak_session } #eval %sh{ kak-tree-sitter -dks --with-highlighting --session $kak_session } -#eval %sh{ kak-tree-sitter -dksvvvv --init $kak_session } +#eval %sh{ kak-tree-sitter -dksvvv --init $kak_session } +# # evaluate-commands %sh{ # echo "colorscheme base16-$BASE16_THEME" # } @@ -64,83 +64,87 @@ evaluate-commands %sh{kak-popup init} ## Highlighting ## hook global WinCreate .* %{ add-highlighter window/number-lines number-lines -relative -hlcursor} add-highlighter global/ show-matching -add-highlighter global/ column 80 MenuForeground -add-highlighter global/ show-whitespaces +add-highlighter global/ column 80 MenuBackground +add-highlighter global/ show-whitespaces -spc " " -nbsp "" +#add-highlighter global/ show-whitespaces -nbsp "" -lf "" -indent "|" ## Wrapping ## add-highlighter global/ wrap -word -indent + ## Formatting ## -define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{ - - - hook global -group autofmt BufSetOption filetype=(zig) %{ - set-option buffer formatcmd 'zig fmt --stdin' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } - - hook global -group autofmt BufSetOption filetype=(html) %{ - set-option buffer formatcmd 'prettier --tab-width 4 --parser html' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } - - hook global -group autofmt BufSetOption filetype=(css) %{ - set-option buffer formatcmd 'prettier --tab-width 4 --parser css' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } - - hook global -group autofmt BufSetOption filetype=(javascript) %{ - set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } - - hook global -group autofmt BufSetOption filetype=(go) %{ - set-option buffer formatcmd 'gofmt' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } -} - -define-command disable-autofmt -docstring 'disable autoformatting of buffer' %{ - remove-hooks global autofmt -} - -enable-autofmt +# define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{ +# +# +# hook global -group autofmt BufSetOption filetype=(zig) %{ +# set-option buffer formatcmd 'zig fmt --stdin' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# +# hook global -group autofmt BufSetOption filetype=(html) %{ +# set-option buffer formatcmd 'prettier --tab-width 4 --parser html' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# +# hook global -group autofmt BufSetOption filetype=(css) %{ +# set-option buffer formatcmd 'prettier --tab-width 4 --parser css' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# hook global -group autofmt BufSetOption filetype=(javascript) %{ +# set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# +# hook global -group autofmt BufSetOption filetype=(go) %{ +# set-option buffer formatcmd 'gofmt' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# } +# +# define-command disable-autofmt -docstring 'disable autoformatting of buffer' %{ +# remove-hooks global autofmt +# } +# +# enable-autofmt +# +# +# ## Indentation ## set global tabstop 4 set global indentwidth 4 @@ -151,6 +155,26 @@ hook global BufCreate .* %{ autoconfigtab } +define-command set-spell -docstring 'Enable spellcheck' %{ + # hook -group spellcheck global BufOpenFile .* %{ + hook -group spellcheck buffer InsertChar .* %{ + evaluate-commands %{ + spell + } + } + + hook -group spellcheck buffer InsertDelete .* %{ + evaluate-commands %{ + spell + } + } + # } +} + +define-command set-nospell -docstring 'Disable spellcheck' %{ + remove-hooks buffer spellcheck +} + define-command sleuth -docstring 'Heuristically set buffer options' %{ try %{ evaluate-commands -draft %{ @@ -201,29 +225,16 @@ define-command sleuth-disable -docstring 'Disable sleuth' %{ } ## LSP ## -# lsp-enable -# lsp-inlay-diagnostics-enable global -hook global WinSetOption filetype=(c|zig|python|ruby|lua|java|html|css|swift) %{ - # set-option window lsp_auto_highlight_references true - set-option window lsp_hover_anchor true - lsp-auto-hover-enable - #lsp-auto-hover-insert-mode-enable - lsp-auto-signature-help-enable - lsp-inlay-hints-enable global - lsp-enable-window -} +lsp-enable +lsp-inlay-diagnostics-enable global +set-option global lsp_auto_highlight_references true +set-option global lsp_hover_anchor true +lsp-auto-signature-help-enable +lsp-inlay-hints-enable global -hook global WinSetOption filetype=(rust) %{ - set-option window lsp_auto_highlight_references true - set-option window lsp_hover_anchor true - lsp-auto-hover-enable - #lsp-auto-hover-insert-mode-enable - lsp-auto-signature-help-enable - lsp-inlay-hints-enable global - lsp-enable-window -} +map global user k ':lsp-hover' -hook global WinSetOption filetype=(c|zig|rust|python|ruby|lua|java|html|css) %{ +hook global WinSetOption filetype=(c|cpp|zig|rust|python|ruby|lua|java|html|css) %{ hook window -group semantic-tokens BufReload .* lsp-semantic-tokens hook window -group semantic-tokens NormalIdle .* lsp-semantic-tokens hook window -group semantic-tokens InsertIdle .* lsp-semantic-tokens @@ -253,6 +264,19 @@ hook -group lsp-filetype-swift global BufSetOption filetype=swift %{ } } +hook -group lsp-filetype-typst global BufSetOption filetype=typst %{ + set-option buffer lsp_servers %{ + [tinymist] + root_globs = [".git", ".hg"] + args = ["lsp"] + settings_section = "_" + [tinymist.settings._] + # See https://myriad-dreamin.github.io/tinymist/configurations.html + exportPdf = "onType" + # formatterMode = "typstyle" + # previewFeature = "disable" + } +} set-option global lsp_config %{ } @@ -493,4 +517,4 @@ map -docstring 'next spell check' global spell n ':spell-next' map -docstring 'spell check replacements' global spell r ':spell-replace' map -docstring 'quit kakoune' global user q ':q!' -colorscheme base16-rose-pine +colorscheme carbonfox diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json index d508d54..29bb9e6 100644 --- a/config/.config/nvim/lazy-lock.json +++ b/config/.config/nvim/lazy-lock.json @@ -1,53 +1,55 @@ { - "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, - "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "e300259ec777a40b4b9e3c8e6ade203e78d15881" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, + "catppuccin": { "branch": "main", "commit": "8c4125e3c746976ba025dc5d908fa22c6aa09486" }, "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" }, "compiler-explorer.nvim": { "branch": "master", "commit": "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dim.lua": { "branch": "main", "commit": "e7d7428d2d0bde97c6441ca9f04a1e9ac7c6d6bb" }, - "dracula.nvim": { "branch": "main", "commit": "df528c869b09fbdc7578e6ccc7ff6faf44a2046d" }, - "dropbar.nvim": { "branch": "master", "commit": "596f95e98a21e8fccf3db91fec481129eb82ff61" }, + "dim.lua": { "branch": "main", "commit": "a3a0dce75f7212ab61130e77a8157530bd23db15" }, + "dracula.nvim": { "branch": "main", "commit": "041d923368d540a1e438989ce8f915628081a56a" }, + "dropbar.nvim": { "branch": "master", "commit": "ce202248134e3949aac375fd66c28e5207785b10" }, "everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" }, - "everforest": { "branch": "master", "commit": "28d59e29d972e21f2e802ce916f28dcab30697ae" }, + "everforest": { "branch": "master", "commit": "0909c23a2b8cbc337cffe91fda36381747e88506" }, "fennel.vim": { "branch": "main", "commit": "c6a9c035ca108cbb24273d96cd6277fb8fbc60b4" }, "github-colors": { "branch": "main", "commit": "7292749e49e6f870e63879a528bb05c8c8d1a59a" }, "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, - "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, - "gruvbox-material": { "branch": "master", "commit": "6a100833060d26cd3ab85c34c5f7154a1000c12f" }, - "gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" }, + "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, + "gruvbox-material": { "branch": "master", "commit": "834dbf21836862300ced7444db4262b796330ab7" }, + "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "leap.nvim": { "branch": "main", "commit": "e9cb442c0614a7e8185608f639e10c54e53bb083" }, + "lazy.nvim": { "branch": "main", "commit": "f0f5bbb9e5bfae5e6468f9359ffea3d151418176" }, + "leap.nvim": { "branch": "main", "commit": "44e3a60a7a62069e5c9445b7a8104612d4f060cb" }, "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, - "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, - "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, + "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "35ec9e1425c2f9a36f556893336af4f302c63214" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" }, - "mellow.nvim": { "branch": "main", "commit": "0cb5476b506f8e71428e823919b69ecf34afe646" }, - "mini.nvim": { "branch": "main", "commit": "0ffc2af38b3c5293076317b138635d6d7c80a40f" }, + "mellow.nvim": { "branch": "main", "commit": "5cd188489bcc7eb512f0a30581ad972070f8e5cd" }, + "mini.nvim": { "branch": "main", "commit": "ee4a4a4abed25e3d108d985b0553c5271f2f71aa" }, "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, "moonlight.nvim": { "branch": "pure-lua", "commit": "e24e4218ec680b6396532808abf57ca0ada82e66" }, "moonscript-vim": { "branch": "master", "commit": "715c96c7c3b02adc507f84bf5754985460afc426" }, "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" }, - "nelua.vim": { "branch": "main", "commit": "330f34d017df92dd1a1a7283e302982256e169db" }, - "neogit": { "branch": "master", "commit": "4046f747739cf7e7b9aada447f3edc59c947b111" }, + "nelua.vim": { "branch": "main", "commit": "5bc2ce7cc1ae952940bb3419ad106c02820f4baf" }, + "neogit": { "branch": "master", "commit": "c6d00913f802acedfb93c01267e89185f25800ca" }, "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, + "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-highlight-colors": { "branch": "main", "commit": "1ce0a09bfc28c7274e649d20927cea51e440b65c" }, - "nvim-lspconfig": { "branch": "master", "commit": "408cf07b97535825cca6f1afa908d98348712ba6" }, + "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, + "nvim-highlight-colors": { "branch": "main", "commit": "e0c4a58ec8c3ca7c92d3ee4eb3bc1dd0f7be317e" }, + "nvim-lspconfig": { "branch": "master", "commit": "cbd1e91296189a765094810de1b71a04e2597579" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, + "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "a9742cbc1f95db9eaf3293bf8cd0622ca36542bb" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-unception": { "branch": "main", "commit": "df0e505f0f1371c49c2bcf993985962edb5a279d" }, - "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" }, + "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" }, - "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" }, + "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" }, "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" }, "onedark.nvim": { "branch": "master", "commit": "de495fabe171d48aed5525f002d14414efcecbb2" }, "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, @@ -56,13 +58,13 @@ "range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" }, "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, "sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" }, - "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, + "snacks.nvim": { "branch": "main", "commit": "59c5545e91878c1f6218b032a881832bc98a46f3" }, "telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" }, - "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "tokyonight.nvim": { "branch": "main", "commit": "2642dbb83333e0575d1c3436e1d837926871c5fb" }, "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" }, "vim-colors-xcode": { "branch": "master", "commit": "6d449229bf29176448bd06377689d7a8db0d1bee" }, "vim-etlua": { "branch": "master", "commit": "bb2974d0134ce6da60c3be0d82d809976b859c1c" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, - "vim-teal": { "branch": "master", "commit": "c87b8931afa68376b88ff721336f31512b9384f1" }, + "vim-teal": { "branch": "master", "commit": "a416397cf7aad7b03ef53fd3d9847fd764bcbfee" }, "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" } } diff --git a/config/.profile b/config/.profile index 6dfe73c..ce40637 100644 --- a/config/.profile +++ b/config/.profile @@ -1,6 +1,6 @@ if [ "$XDG_SESSION_DESKTOP" = "sway" ] ; then # https://github.com/swaywm/sway/issues/595 - export _JAVA_AWT_WM_NONREPARENTING=1 + # export _JAVA_AWT_WM_NONREPARENTING=1 export STUDIO_JDK=/usr/lib/jvm/java-11-openjdk/ fi