From e894b99c2ab4af7077860bd5b32454b11a6f01fb Mon Sep 17 00:00:00 2001 From: Michael Chalupiak Date: Wed, 19 Mar 2025 23:35:59 -0400 Subject: [PATCH] updated kakoune, added flirt --- config/.bashrc | 8 +- .../kak/colors/catppuccin_macchiato.kak | 163 ----------------- .../.config/kak/colors/catppuccin_mocha.kak | 166 ------------------ config/.config/kak/colors/kakoune | 1 - config/.config/kak/kakrc | 21 ++- config/.config/newsboat/urls | 1 + 6 files changed, 22 insertions(+), 338 deletions(-) delete mode 100644 config/.config/kak/colors/catppuccin_macchiato.kak delete mode 100644 config/.config/kak/colors/catppuccin_mocha.kak delete mode 120000 config/.config/kak/colors/kakoune diff --git a/config/.bashrc b/config/.bashrc index f6aafa5..2543886 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -1,4 +1,4 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. +# ~/.bashrc # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) # for examples @@ -124,12 +124,13 @@ alias bat='bat --theme="base16-256"' if [ -n "$(command -v 'eza')" ]; then alias ls='eza' fi +alias zf='z $(flirt)' # Alias definitions. # You may want to put all your additions into a separate file like # ~/.bash_aliases, instead of adding them here directly. # See /usr/share/doc/bash-doc/examples in the bash-doc package. -export EDITOR='nvim' +export EDITOR='kak' if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases @@ -141,6 +142,7 @@ if [ "$XDG_SESSION_DESKTOP" = "sway" ] ; then export STUDIO_JDK=/usr/lib/jvm/java-11-openjdk/ fi eval "$(zoxide init bash)" +eval "$(fzf --bash)" export TMUX_TMPDIR=/tmp export TINTED_SHELL_ENABLE_BASE16_VARS=1 @@ -167,7 +169,7 @@ tinty_source_shell_theme() { # alias theme='tinty_source_shell_theme apply "$(tinty list | fzf --cycle)" && xrdb ~/.Xresources' # fi -if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then +if [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ] && [ -z "$TMUX" ]; then alias kak='tmux new-session kak > /dev/null' fi alias enter-dev='. enter-dev.sh' diff --git a/config/.config/kak/colors/catppuccin_macchiato.kak b/config/.config/kak/colors/catppuccin_macchiato.kak deleted file mode 100644 index 967279c..0000000 --- a/config/.config/kak/colors/catppuccin_macchiato.kak +++ /dev/null @@ -1,163 +0,0 @@ -# Catppuccin Macchiato theme for Kakoune -# -# Taken and adapted from -# - -# Color palette -declare-option str rosewater "rgb:f4dbd6" -declare-option str red "rgb:ed8796" -declare-option str mauve "rgb:c6a0f6" -declare-option str maroon "rgb:ee99a0" -declare-option str pink "rgb:f5bde6" -declare-option str cyan "rgb:7dc4e4" -declare-option str yellow "rgb:eed49f" -declare-option str green "rgb:a6da95" -declare-option str white "rgb:cad3f5" -declare-option str blue "rgb:8aadf4" -declare-option str sky "rgb:91d7e3" -declare-option str lavender "rgb:b7bdf8" -declare-option str black1 "rgb:1e2030" -declare-option str black2 "rgb:24273a" -declare-option str black3 "rgb:363a4f" -declare-option str orange "rgb:f5a97f" -declare-option str teal "rgb:8bd5ca" -declare-option str flamingo "rgb:f0c6c6" -declare-option str gray0 "rgb:5b6078" -declare-option str gray1 "rgb:6e738d" -declare-option str bright_red "%opt{red}+b" -declare-option str bright_green "%opt{green}+b" -declare-option str bright_yellow "%opt{yellow}+b" -declare-option str bright_blue "%opt{blue}+b" -declare-option str bright_cyan "%opt{cyan}+b" -declare-option str bright_white "%opt{white}+b" -declare-option str foreground %opt{white} -declare-option str background %opt{black2} -declare-option str overlay0 "rgb:8087a2" -declare-option str overlay1 "rgb:939ab7" - -# Markup -set-face global title "%opt{rosewater}" -set-face global header "%opt{bright_red}" -set-face global bold "%opt{mauve}" -set-face global italic "%opt{lavender}" -set-face global mono "%opt{green}" -set-face global block "%opt{cyan}" -set-face global link "%opt{green}" -set-face global bullet "%opt{green}" -set-face global list "%opt{white}" - -# Builtins -set-face global Default "%opt{white},%opt{background}" -set-face global PrimarySelection "%opt{gray0},%opt{lavender}" -set-face global SecondarySelection "%opt{lavender},%opt{gray0}" -set-face global PrimaryCursor "%opt{background},%opt{rosewater}" -set-face global SecondaryCursor "%opt{black1},%opt{teal}" -set-face global PrimaryCursorEol "%opt{gray0},%opt{mauve}" -set-face global SecondaryCursorEol "%opt{gray0},%opt{maroon}" -set-face global LineNumbers "%opt{gray1},%opt{background}" -set-face global LineNumberCursor "%opt{lavender},%opt{gray0}+b" -set-face global LineNumbersWrapped "%opt{teal},%opt{black1}+i" -set-face global MenuForeground "%opt{white},%opt{gray0}+b" -set-face global MenuBackground "%opt{white},%opt{black3}" -set-face global MenuInfo "%opt{black1},%opt{blue}" -set-face global Information "%opt{black1},%opt{lavender}" -set-face global Error "%opt{red},%opt{black2}" -set-face global StatusLine "%opt{white},%opt{black1}" -set-face global StatusLineMode "%opt{black2},%opt{yellow}" -set-face global StatusLineInfo "%opt{background},%opt{green}" -set-face global StatusLineValue "%opt{orange},%opt{gray0}" -set-face global StatusCursor "%opt{black1},%opt{lavender}" -set-face global Prompt "%opt{green},%opt{black2}" -set-face global MatchingChar "%opt{maroon},%opt{black2}" -set-face global Whitespace "%opt{gray1},%opt{background}+f" -set-face global WrapMarker Whitespace -set-face global BufferPadding "%opt{background},%opt{background}" - -# Code -set-face global value "%opt{orange}" -set-face global type "%opt{rosewater}" -set-face global variable "%opt{white}" -set-face global module "%opt{maroon}" -set-face global function "%opt{sky}" -set-face global string "%opt{green}" -set-face global keyword "%opt{blue}" -set-face global operator "%opt{blue}" -set-face global attribute "%opt{green}" -set-face global comment "%opt{gray1}+i" -set-face global documentation comment -set-face global meta "%opt{pink}" -set-face global builtin "%opt{lavender}+b" - -# Tree-sitter () -set-face global ts_attribute "%opt{blue}" -set-face global ts_comment "%opt{overlay0}+i" -set-face global ts_conceal "%opt{mauve}+i" -set-face global ts_constant "%opt{orange}" -set-face global ts_constant_builtin_boolean "%opt{sky}" -set-face global ts_constant_character "%opt{yellow}" -set-face global ts_constant_macro "%opt{mauve}" -set-face global ts_constructor "%opt{cyan}" -set-face global ts_diff_plus "%opt{green}" -set-face global ts_diff_minus "%opt{red}" -set-face global ts_diff_delta "%opt{blue}" -set-face global ts_diff_delta_moved "%opt{mauve}" -set-face global ts_error "%opt{red}+b" -set-face global ts_function "%opt{blue}" -set-face global ts_function_builtin "%opt{blue}+i" -set-face global ts_function_macro "%opt{mauve}" -set-face global ts_hint "%opt{blue}+b" -set-face global ts_info "%opt{green}+b" -set-face global ts_keyword "%opt{mauve}" -set-face global ts_keyword_conditional "%opt{mauve}+i" -set-face global ts_keyword_control_conditional "%opt{mauve}+i" -set-face global ts_keyword_control_directive "%opt{mauve}+i" -set-face global ts_keyword_control_import "%opt{mauve}+i" -set-face global ts_keyword_directive "%opt{mauve}+i" -set-face global ts_label "%opt{cyan}+i" -set-face global ts_markup_bold "%opt{orange}+b" -set-face global ts_markup_heading "%opt{red}" -set-face global ts_markup_heading_1 "%opt{red}" -set-face global ts_markup_heading_2 "%opt{mauve}" -set-face global ts_markup_heading_3 "%opt{green}" -set-face global ts_markup_heading_4 "%opt{yellow}" -set-face global ts_markup_heading_5 "%opt{pink}" -set-face global ts_markup_heading_6 "%opt{teal}" -set-face global ts_markup_heading_marker "%opt{orange}+b" -set-face global ts_markup_italic "%opt{pink}+i" -set-face global ts_markup_list_checked "%opt{green}" -set-face global ts_markup_list_numbered "%opt{blue}+i" -set-face global ts_markup_list_unchecked "%opt{teal}" -set-face global ts_markup_list_unnumbered "%opt{mauve}" -set-face global ts_markup_link_label "%opt{blue}" -set-face global ts_markup_link_url "%opt{teal}+u" -set-face global ts_markup_link_uri "%opt{teal}+u" -set-face global ts_markup_link_text "%opt{blue}" -set-face global ts_markup_quote "%opt{gray1}" -set-face global ts_markup_raw "%opt{green}" -set-face global ts_markup_strikethrough "%opt{gray1}+s" -set-face global ts_namespace "%opt{blue}+i" -set-face global ts_operator "%opt{sky}" -set-face global ts_property "%opt{sky}" -set-face global ts_punctuation "%opt{overlay1}" -set-face global ts_punctuation_special "%opt{sky}" -set-face global ts_special "%opt{blue}" -set-face global ts_spell "%opt{mauve}" -set-face global ts_string "%opt{green}" -set-face global ts_string_regex "%opt{orange}" -set-face global ts_string_regexp "%opt{orange}" -set-face global ts_string_escape "%opt{mauve}" -set-face global ts_string_special "%opt{blue}" -set-face global ts_string_special_path "%opt{green}" -set-face global ts_string_special_symbol "%opt{mauve}" -set-face global ts_string_symbol "%opt{red}" -set-face global ts_tag "%opt{mauve}" -set-face global ts_tag_error "%opt{red}" -set-face global ts_text "%opt{white}" -set-face global ts_text_title "%opt{mauve}" -set-face global ts_type "%opt{yellow}" -set-face global ts_type_enum_variant "%opt{flamingo}" -set-face global ts_variable "%opt{white}" -set-face global ts_variable_builtin "%opt{red}" -set-face global ts_variable_other_member "%opt{teal}" -set-face global ts_variable_parameter "%opt{maroon}+i" -set-face global ts_warning "%opt{orange}+b" diff --git a/config/.config/kak/colors/catppuccin_mocha.kak b/config/.config/kak/colors/catppuccin_mocha.kak deleted file mode 100644 index 730bd73..0000000 --- a/config/.config/kak/colors/catppuccin_mocha.kak +++ /dev/null @@ -1,166 +0,0 @@ -# Catppuccint Mocha theme for Kakoune -# -# Taken and adapted from -# - -# Catppuccin theme for Kakoune - -# Color palette (see https://catppuccin.com/palette) -declare-option str rosewater "rgb:f5e0dc" -declare-option str flamingo "rgb:f2cdcd" -declare-option str pink "rgb:f5c2e7" -declare-option str mauve "rgb:cba6f7" -declare-option str red "rgb:f38ba8" -declare-option str maroon "rgb:eba0ac" -declare-option str peach "rgb:fab387" -declare-option str yellow "rgb:f9e2af" -declare-option str green "rgb:a6e3a1" -declare-option str teal "rgb:94e2d5" -declare-option str sky "rgb:89dceb" -declare-option str sapphire "rgb:74c7ec" -declare-option str blue "rgb:89b4fa" -declare-option str lavender "rgb:b4befe" -declare-option str text "rgb:cdd6f4" -declare-option str subtext1 "rgb:bac2de" -declare-option str subtext0 "rgb:a6adc8" -declare-option str overlay2 "rgb:9399b2" -declare-option str overlay1 "rgb:7f849c" -declare-option str overlay0 "rgb:6c7086" -declare-option str surface2 "rgb:585b70" -declare-option str surface1 "rgb:45475a" -declare-option str surface0 "rgb:313244" -declare-option str base "rgb:1e1e2e" -declare-option str mantle "rgb:181825" -declare-option str crust "rgb:11111b" - -# Markup -set-face global title "%opt{text}+b" -set-face global header "%opt{subtext0}+b" -set-face global bold "%opt{maroon}+b" -set-face global italic "%opt{maroon}+i" -set-face global mono "%opt{green}" -set-face global block "%opt{sapphire}" -set-face global link "%opt{blue}" -set-face global bullet "%opt{peach}" -set-face global list "%opt{peach}" - -# Builtins -set-face global Default "%opt{text},%opt{base}" -set-face global PrimarySelection "%opt{text},%opt{surface2}" -set-face global SecondarySelection "%opt{text},%opt{surface2}" -set-face global PrimaryCursor "%opt{crust},%opt{rosewater}" -set-face global SecondaryCursor "%opt{text},%opt{overlay0}" -set-face global PrimaryCursorEol "%opt{surface2},%opt{lavender}" -set-face global SecondaryCursorEol "%opt{surface2},%opt{overlay1}" -set-face global LineNumbers "%opt{overlay1},%opt{base}" -set-face global LineNumberCursor "%opt{rosewater},%opt{surface2}+b" -set-face global LineNumbersWrapped "%opt{rosewater},%opt{surface2}" -set-face global MenuForeground "%opt{text},%opt{surface1}+b" -set-face global MenuBackground "%opt{text},%opt{surface0}" -set-face global MenuInfo "%opt{crust},%opt{teal}" -set-face global Information "%opt{crust},%opt{teal}" -set-face global Error "%opt{crust},%opt{red}" -set-face global DiagnosticError Error -set-face global DiagnosticWarning "%opt{yellow}" -set-face global StatusLine "%opt{text},%opt{mantle}" -set-face global StatusLineMode "%opt{crust},%opt{yellow}" -set-face global StatusLineInfo "%opt{crust},%opt{teal}" -set-face global StatusLineValue "%opt{crust},%opt{yellow}" -set-face global StatusCursor "%opt{crust},%opt{rosewater}" -set-face global Prompt "%opt{teal},%opt{base}+b" -set-face global MatchingChar "%opt{maroon},%opt{base}" -set-face global Whitespace "%opt{overlay1},%opt{base}+f" -set-face global WrapMarker Whitespace -set-face global BufferPadding "%opt{base},%opt{base}" - - -# Code -set-face global value "%opt{peach}" -set-face global type "%opt{yellow}" -set-face global variable "%opt{text}" -set-face global module "%opt{maroon}" -set-face global function "%opt{blue}" -set-face global string "%opt{green}" -set-face global keyword "%opt{mauve}" -set-face global operator "%opt{sky}" -set-face global attribute "%opt{yellow}" -set-face global comment "%opt{overlay1}+i" -set-face global documentation comment -set-face global meta "%opt{yellow}" -set-face global builtin "%opt{red}" - -# Tree-sitter () -# Copied from catppuccin_macchiato.kak -# Adjusted with https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md -set-face global ts_attribute attribute -set-face global ts_comment comment -set-face global ts_conceal "%opt{mauve}+i" -set-face global ts_constant "%opt{peach}" -set-face global ts_constant_builtin_boolean "%opt{sky}" -set-face global ts_constant_character "%opt{yellow}" -set-face global ts_constant_macro "%opt{mauve}" -set-face global ts_constructor "%opt{sky}" -set-face global ts_diff_plus "%opt{green}" -set-face global ts_diff_minus "%opt{red}" -set-face global ts_diff_delta "%opt{blue}" -set-face global ts_diff_delta_moved "%opt{mauve}" -set-face global ts_error "%opt{red}+b" -set-face global ts_function "%opt{blue}" -set-face global ts_function_builtin "%opt{blue}+i" -set-face global ts_function_macro "%opt{mauve}" -set-face global ts_hint "%opt{blue}+b" -set-face global ts_info "%opt{teal}+b" -set-face global ts_keyword "%opt{mauve}" -set-face global ts_keyword_conditional "%opt{mauve}+i" -set-face global ts_keyword_control_conditional "%opt{mauve}+i" -set-face global ts_keyword_control_directive "%opt{mauve}+i" -set-face global ts_keyword_control_import "%opt{mauve}+i" -set-face global ts_keyword_directive "%opt{mauve}+i" -set-face global ts_label "%opt{sky}+i" -set-face global ts_markup_bold "%opt{peach}+b" -set-face global ts_markup_heading "%opt{red}" -set-face global ts_markup_heading_1 "%opt{red}" -set-face global ts_markup_heading_2 "%opt{mauve}" -set-face global ts_markup_heading_3 "%opt{green}" -set-face global ts_markup_heading_4 "%opt{yellow}" -set-face global ts_markup_heading_5 "%opt{pink}" -set-face global ts_markup_heading_6 "%opt{teal}" -set-face global ts_markup_heading_marker "%opt{peach}+b" -set-face global ts_markup_italic "%opt{pink}+i" -set-face global ts_markup_list_checked "%opt{green}" -set-face global ts_markup_list_numbered "%opt{blue}+i" -set-face global ts_markup_list_unchecked "%opt{teal}" -set-face global ts_markup_list_unnumbered "%opt{mauve}" -set-face global ts_markup_link_label "%opt{blue}" -set-face global ts_markup_link_url "%opt{teal}+u" -set-face global ts_markup_link_uri "%opt{teal}+u" -set-face global ts_markup_link_text "%opt{blue}" -set-face global ts_markup_quote "%opt{overlay1}" -set-face global ts_markup_raw "%opt{green}" -set-face global ts_markup_strikethrough "%opt{overlay1}+s" -set-face global ts_namespace "%opt{blue}+i" -set-face global ts_operator "%opt{sky}" -set-face global ts_property "%opt{sky}" -set-face global ts_punctuation "%opt{overlay1}" -set-face global ts_punctuation_special "%opt{sky}" -set-face global ts_special "%opt{blue}" -set-face global ts_spell "%opt{mauve}" -set-face global ts_string string -set-face global ts_string_regex "%opt{pink}" -set-face global ts_string_regexp "%opt{pink}" -set-face global ts_string_escape "%opt{flamingo}" -set-face global ts_string_special "%opt{blue}" -set-face global ts_string_special_path "%opt{green}" -set-face global ts_string_special_symbol "%opt{mauve}" -set-face global ts_string_symbol "%opt{red}" -set-face global ts_tag "%opt{mauve}" -set-face global ts_tag_error "%opt{red}" -set-face global ts_text "%opt{text}" -set-face global ts_text_title "%opt{mauve}" -set-face global ts_type type -set-face global ts_type_enum_variant "%opt{teal}" -set-face global ts_variable variable -set-face global ts_variable_builtin builtin -set-face global ts_variable_other_member "%opt{teal}" -set-face global ts_variable_parameter "%opt{maroon}+i" -set-face global ts_warning "%opt{yellow}+b" diff --git a/config/.config/kak/colors/kakoune b/config/.config/kak/colors/kakoune deleted file mode 120000 index a9f0acd..0000000 --- a/config/.config/kak/colors/kakoune +++ /dev/null @@ -1 +0,0 @@ -../plugins/base16-kakoune/colors/ \ No newline at end of file diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc index c6ca84f..928110a 100644 --- a/config/.config/kak/kakrc +++ b/config/.config/kak/kakrc @@ -26,8 +26,8 @@ plug "gustavo-hms/luar" %{ } # # Color Themes -plug "tinted-theming/base16-kakoune" - +plug "tinted-theming/base16-kakoune" theme config +plug "https://git.sr.ht/~hadronized/kakoune-tree-sitter-themes" theme config ### End Of Plugins ### set-option global luar_interpreter luajit @@ -357,14 +357,25 @@ define-command -docstring 'Print Working Directory' -params 0 pwd %{ evaluate-commands echo %sh{ echo "$(pwd)"} } +# define-command -docstring 'copy to clipboard' xcopy %{ +# execute-keys 'xclip -selection clipboard -i' +# } + +# define-command -docstring 'paste from clipboard' xpaste %{ +# evaluate-commands -save-regs '"' %{ +# set-register dquote %sh{ xclip -selection clipboard -o } +# execute-keys 'p' +# } +# } + define-command -docstring 'copy to clipboard' xcopy %{ - execute-keys 'xclip -selection clipboard -i' + execute-keys 'wl-copy' } define-command -docstring 'paste from clipboard' xpaste %{ evaluate-commands -save-regs '"' %{ - set-register dquote %sh{ xclip -selection clipboard -o } - execute-keys 'p' + set-register dquote %sh{ wl-paste } + execute-keys 'P' } } diff --git a/config/.config/newsboat/urls b/config/.config/newsboat/urls index 1db068e..a917a09 100644 --- a/config/.config/newsboat/urls +++ b/config/.config/newsboat/urls @@ -7,3 +7,4 @@ https://www.dailywire.com/feeds/rss.xml https://feeds.simplecast.com/6c2VScgo https://feeds.simplecast.com/pp_b9xO6 https://notrelated.xyz/rss +https://joeyh.name/blog/index.rss