Merge branch 'master' into arch-laptop
This commit is contained in:
		
						commit
						673c819a72
					
				| @ -20,3 +20,6 @@ export VERSION_CONTROL="never" | |||||||
| # This section can be safely removed at any time if needed. | # This section can be safely removed at any time if needed. | ||||||
| test -r '/home/mikec/.opam/opam-init/init.sh' && . '/home/mikec/.opam/opam-init/init.sh' > /dev/null 2> /dev/null || true | test -r '/home/mikec/.opam/opam-init/init.sh' && . '/home/mikec/.opam/opam-init/init.sh' > /dev/null 2> /dev/null || true | ||||||
| # END opam configuration | # END opam configuration | ||||||
|  | if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then | ||||||
|  |   exec river | ||||||
|  | fi | ||||||
|  | |||||||
| @ -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) | # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) | ||||||
| # for examples | # for examples | ||||||
| 
 | 
 | ||||||
| @ -124,12 +124,13 @@ alias bat='bat --theme="base16-256"' | |||||||
| if [ -n "$(command -v 'eza')" ]; then | if [ -n "$(command -v 'eza')" ]; then | ||||||
|   alias ls='eza' |   alias ls='eza' | ||||||
| fi | fi | ||||||
|  | alias zf='z $(flirt)' | ||||||
| 
 | 
 | ||||||
| # Alias definitions. | # Alias definitions. | ||||||
| # You may want to put all your additions into a separate file like | # You may want to put all your additions into a separate file like | ||||||
| # ~/.bash_aliases, instead of adding them here directly. | # ~/.bash_aliases, instead of adding them here directly. | ||||||
| # See /usr/share/doc/bash-doc/examples in the bash-doc package. | # See /usr/share/doc/bash-doc/examples in the bash-doc package. | ||||||
| export EDITOR='nvim' | export EDITOR='kak' | ||||||
| 
 | 
 | ||||||
| if [ -f ~/.bash_aliases ]; then | if [ -f ~/.bash_aliases ]; then | ||||||
|     . ~/.bash_aliases |     . ~/.bash_aliases | ||||||
| @ -141,6 +142,7 @@ if [ "$XDG_SESSION_DESKTOP" = "sway" ] ; then | |||||||
|     export STUDIO_JDK=/usr/lib/jvm/java-11-openjdk/ |     export STUDIO_JDK=/usr/lib/jvm/java-11-openjdk/ | ||||||
| fi | fi | ||||||
| eval "$(zoxide init bash)" | eval "$(zoxide init bash)" | ||||||
|  | eval "$(fzf --bash)" | ||||||
| 
 | 
 | ||||||
| export TMUX_TMPDIR=/tmp | export TMUX_TMPDIR=/tmp | ||||||
| export TINTED_SHELL_ENABLE_BASE16_VARS=1 | 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' | #     alias theme='tinty_source_shell_theme apply "$(tinty list | fzf --cycle)" && xrdb ~/.Xresources' | ||||||
| # fi | # 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' |     alias kak='tmux new-session kak > /dev/null' | ||||||
| fi | fi | ||||||
| alias enter-dev='. enter-dev.sh' | alias enter-dev='. enter-dev.sh' | ||||||
|  | |||||||
| @ -1633,7 +1633,7 @@ sort-column='name' | |||||||
| sort-directories-first=false | sort-directories-first=false | ||||||
| sort-order='ascending' | sort-order='ascending' | ||||||
| type-format='category' | type-format='category' | ||||||
| window-position=(26, 23) | window-position=(52, 39) | ||||||
| window-size=(1512, 1344) | window-size=(1512, 1344) | ||||||
| 
 | 
 | ||||||
| [org/virt-manager/virt-manager] | [org/virt-manager/virt-manager] | ||||||
|  | |||||||
| @ -1,163 +0,0 @@ | |||||||
| # Catppuccin Macchiato theme for Kakoune |  | ||||||
| # |  | ||||||
| # Taken and adapted from |  | ||||||
| # <https://github.com/catppuccin/kakoune/blob/e52fb5c95f70c297fea1fd58613284817b5a50bd/colors/catppuccin_macchiato.kak> |  | ||||||
| 
 |  | ||||||
| # 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 (<https://git.sr.ht/~hadronized/kak-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" |  | ||||||
| @ -1,166 +0,0 @@ | |||||||
| # Catppuccint Mocha theme for Kakoune |  | ||||||
| # |  | ||||||
| # Taken and adapted from |  | ||||||
| # <https://github.com/catppuccin/kakoune/blob/7f187d9da2867a7fda568b2135d29b9c00cfbb94/colors/catppuccin_mocha.kak> |  | ||||||
| 
 |  | ||||||
| # 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 (<https://git.sr.ht/~hadronized/kak-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" |  | ||||||
| @ -1 +0,0 @@ | |||||||
| ../plugins/base16-kakoune/colors/ |  | ||||||
| @ -26,8 +26,8 @@ plug "gustavo-hms/luar" %{ | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| # # Color Themes | # # 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 ### | ### End Of Plugins ### | ||||||
| 
 | 
 | ||||||
| set-option global luar_interpreter luajit | set-option global luar_interpreter luajit | ||||||
| @ -37,10 +37,11 @@ set-option global luar_interpreter luajit | |||||||
| # eval %sh{ kak-tree-sitter -dksv --with-highlighting --with-text-objects --init $kak_session } | # eval %sh{ kak-tree-sitter -dksv --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-text-objects --session $kak_session } | ||||||
| #eval %sh{ kak-tree-sitter -dks  --with-highlighting --session $kak_session } | #eval %sh{ kak-tree-sitter -dks  --with-highlighting --session $kak_session } | ||||||
| # eval %sh{ kak-tree-sitter -dks --init $kak_session } | eval %sh{ kak-tree-sitter -dks --init $kak_session } | ||||||
| # evaluate-commands %sh{ | # evaluate-commands %sh{ | ||||||
| #     echo "colorscheme base16-$BASE16_THEME" | #     echo "colorscheme base16-$BASE16_THEME" | ||||||
| # } | # } | ||||||
|  | 
 | ||||||
| ## Highlighting ## | ## Highlighting ## | ||||||
| hook global WinCreate .* %{ add-highlighter window/number-lines number-lines -relative -hlcursor} | hook global WinCreate .* %{ add-highlighter window/number-lines number-lines -relative -hlcursor} | ||||||
| add-highlighter global/ show-matching | add-highlighter global/ show-matching | ||||||
| @ -356,14 +357,25 @@ define-command -docstring 'Print Working Directory' -params 0 pwd %{ | |||||||
|     evaluate-commands echo %sh{ echo "$(pwd)"} |     evaluate-commands echo %sh{ echo "$(pwd)"} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | # define-command -docstring 'copy to clipboard' xcopy %{ | ||||||
|  | #     execute-keys '<a-|>xclip -selection clipboard -i<ret>' | ||||||
|  | # } | ||||||
|  | 
 | ||||||
|  | # 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 %{ | define-command -docstring 'copy to clipboard' xcopy %{ | ||||||
|     execute-keys '<a-|>xclip -selection clipboard -i<ret>' |     execute-keys '<a-|>wl-copy<ret>' | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| define-command -docstring 'paste from clipboard' xpaste %{ | define-command -docstring 'paste from clipboard' xpaste %{ | ||||||
|     evaluate-commands -save-regs '"' %{ |     evaluate-commands -save-regs '"' %{ | ||||||
|         set-register dquote %sh{ xclip -selection clipboard -o } |         set-register dquote %sh{ wl-paste } | ||||||
|         execute-keys 'p' |         execute-keys 'P' | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @ -424,4 +436,8 @@ map -docstring 'clipboard paste' global user p ':xpaste<ret>' | |||||||
| map -docstring 'quit kakoune' global user q ':q<ret>' | map -docstring 'quit kakoune' global user q ':q<ret>' | ||||||
| map -docstring 'toggle comments' global user c ':comment-line<ret>' | map -docstring 'toggle comments' global user c ':comment-line<ret>' | ||||||
| 
 | 
 | ||||||
|  | <<<<<<< HEAD | ||||||
| colorscheme base16-gruvbox-dark-medium | colorscheme base16-gruvbox-dark-medium | ||||||
|  | ======= | ||||||
|  | colorscheme gruvbox-dark | ||||||
|  | >>>>>>> master | ||||||
|  | |||||||
| @ -7,3 +7,4 @@ https://www.dailywire.com/feeds/rss.xml | |||||||
| https://feeds.simplecast.com/6c2VScgo | https://feeds.simplecast.com/6c2VScgo | ||||||
| https://feeds.simplecast.com/pp_b9xO6 | https://feeds.simplecast.com/pp_b9xO6 | ||||||
| https://notrelated.xyz/rss | https://notrelated.xyz/rss | ||||||
|  | https://joeyh.name/blog/index.rss | ||||||
|  | |||||||
| @ -172,6 +172,6 @@ riverctl map normal Super O spawn 'mumble rpc stoptalking' | |||||||
| riverctl map normal Super Escape spawn 'swaylock -f -c 000000' | riverctl map normal Super Escape spawn 'swaylock -f -c 000000' | ||||||
| swaybg -m fill -i $HOME/Pictures/wallpapers/wallpaper & | swaybg -m fill -i $HOME/Pictures/wallpapers/wallpaper & | ||||||
| # pgrep creek || ( while $HOME/.config/river/bar.sh; do sleep 1; done ) | creek -fn 'Ubuntu:size=14' -nf 0xb8b8b8 -nb 0x282828 -ff 0x181818 -fb 0x7cafc2 | # pgrep creek || ( while $HOME/.config/river/bar.sh; do sleep 1; done ) | creek -fn 'Ubuntu:size=14' -nf 0xb8b8b8 -nb 0x282828 -ff 0x181818 -fb 0x7cafc2 | ||||||
|  | pipewire-launch & | ||||||
| waybar & | waybar & | ||||||
| # wlr-randr --output DP-2 --adaptive-sync enabled --mode 2560x1440@165Hz |  | ||||||
| wlr-randr --output eDP-1 --scale 1.5 | wlr-randr --output eDP-1 --scale 1.5 | ||||||
|  | |||||||
| @ -155,5 +155,5 @@ | |||||||
| (setq dime-dylan-implementations | (setq dime-dylan-implementations | ||||||
|       '((opendylan ("/home/mikec/Documents/suckless/dylan/opendylan-2024.1/bin/dswank") |       '((opendylan ("/home/mikec/Documents/suckless/dylan/opendylan-2024.1/bin/dswank") | ||||||
|          :env ("OPEN_DYLAN_USER_REGISTRIES=/tmp/dime-test/registry")))) |          :env ("OPEN_DYLAN_USER_REGISTRIES=/tmp/dime-test/registry")))) | ||||||
| 
 |  | ||||||
| (setq doc-view-mupdf-use-svg t) | (setq doc-view-mupdf-use-svg t) | ||||||
|  | (add-to-list 'default-frame-alist '(undecorated . t)) | ||||||
|  | |||||||
| @ -16,3 +16,4 @@ export PATH="$PATH:/home/mikec/.local/share/JetBrains/Toolbox/scripts" | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| [ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env | [ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env | ||||||
|  | # pipewire-launch & | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Michael Chalupiak
						Michael Chalupiak