17 Commits

Author SHA1 Message Date
Michael Chalupiak
25c0556ab4 Merge branch 'master' into macmini 2025-12-26 11:41:08 -05:00
Michael Chalupiak
ef1981d06b multicursor (good this time) 2025-12-26 11:40:48 -05:00
Michael Chalupiak
97b50a3a2e merge master 2025-12-19 14:28:22 -05:00
Michael Chalupiak
f60dd72912 Small vim config changes 2025-12-19 14:25:00 -05:00
Michael Chalupiak
458a2dd1d6 auto colorscheme for kakoune 2025-11-14 12:54:18 -05:00
Michael Chalupiak
16169fbab4 merge 2025-11-14 00:11:07 -05:00
Michael Chalupiak
367244a53d Update to neovim and ghostty theme 2025-09-24 18:22:28 -04:00
Michael Chalupiak
93361624d7 neovim hex editor 2025-09-18 11:28:54 -04:00
Michael Chalupiak
6dcd713273 Actually removing telescope (snacks.picker for the win) 2025-08-29 12:18:16 -04:00
Michael Chalupiak
a177955e85 Small additions to snacks.picker 2025-08-29 11:58:09 -04:00
Michael Chalupiak
c8a110b9ba Changed from telescope to snacks.picker, also now using nord 2025-08-29 11:50:23 -04:00
Michael Chalupiak
449f2dc890 Added diagnostic toggle 2025-08-24 23:01:59 -04:00
Michael Chalupiak
005f77cdbf Added leap.nvim 2025-08-24 22:51:17 -04:00
Michael Chalupiak
cf051a191f Optimized neovim config 2025-08-24 02:58:30 -04:00
Michael Chalupiak
1114797040 removed tmux plugins 2025-08-23 15:27:51 -04:00
Michael Chalupiak
d3ee528e2b fix opening config 2025-08-23 14:41:02 -04:00
Michael Chalupiak
1f5f04cef1 Add neogit to neovim config and change theme to xcode 2025-08-18 19:29:30 -04:00
25 changed files with 1057 additions and 3071 deletions

27
.gitignore vendored Normal file
View File

@@ -0,0 +1,27 @@
config/.config/dconf/*
config/.themes/*
config/**/*.uuid
config/.icons/*
config/.config/KDE/*
config/.config/falkon/*
config/.config/ghostty/iTerm2-Color-Schemes/*
config/.config/ghostty/themes/*
config/.config/helix/runtime/*
config/.config/kak/colors/*
config/.config/kak/plugins/*
config/.config/mutt/chalupmc@rose-hulman
config/.config/mutt/mikecchalupiak@outlook
config/.config/mutt/spamreciver1@outlook
config/.config/qt5ct/colors/*
config/.config/qutebrowser/autoconfig.yml
config/.config/qutebrowser/rosepine/*
config/.config/zathura/colors
config/.doom.d/flycheck_config.el
config/.scripts/kkse
config/.scripts/mlvwm-alert
config/.scripts/mlvwm-confirm
config/.scripts/mlvwm-message
config/.scripts/mlvwm-powerdown
config/.scripts/mlvwm-restart
config/.scripts/mlvwm-screenshot
config/.scripts/pipewire-launch

View File

@@ -1,5 +1,4 @@
! High DPI Settings for Window Managers ! High DPI Settings for Window Managers
!Xft.dpi: 192
! #define background_opacity 80 ! #define background_opacity 80
#include ".theme.xresources" #include ".theme.xresources"
! .alpha: 0.2 ! .alpha: 0.2

View File

@@ -139,10 +139,10 @@ alias zf='z $(flirt)'
# 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.
# if [ -z "$EDITOR" ]; then if [ -z "$EDITOR" ]; then
# export EDITOR='kak' # export EDITOR=kak
export EDITOR='nvim' export EDITOR='nvim'
# fi fi
if [ -f ~/.bash_aliases ]; then if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases . ~/.bash_aliases
@@ -183,23 +183,23 @@ tinty_source_shell_theme() {
# fi # fi
run_kak() { run_kak() {
/usr/bin/kak -c $SESH 2>/dev/null "$@" || /usr/bin/kak -s $SESH "$@" $(which kak) -c $SESH 2>/dev/null "$@" || $(which kak) -s $SESH "$@"
} }
if [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ] && [ -z "$TMUX" ]; then if [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ] && [ -z "$TMUX" ]; then
SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)" SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)"
alias kak='tmux new-session -e "EDITOR=\"/usr/bin/kak -c $SESH\"" -s $SESH /usr/bin/kak -s $SESH > /dev/null' alias kak='tmux new-session -e "EDITOR=\"$(which kak) -c $SESH\"" -s $SESH $(which kak) -s $SESH > /dev/null'
elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then
SESH="$(tmux display-message -p '#S')" SESH="$(tmux display-message -p '#S')"
# alias kak='kak -c $SESH 2>/dev/null || kak -s $SESH' # alias kak='kak -c $SESH 2>/dev/null || kak -s $SESH'
alias kak=run_kak alias kak=run_kak
alias vidir='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null || /usr/bin/kak -s $SESH" vidir' alias vidir='EDITOR="$(which kak) -c $SESH 2>/dev/null || $(which kak) -s $SESH" vidir'
alias vipe='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null || /usr/bin/kak -s $SESH" vipe' alias vipe='EDITOR="$(which kak) -c $SESH 2>/dev/null || $(which kak) -s $SESH" vipe'
fi fi
if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix || command -v hx)" ] && [ -z "$TMUX" ]; then if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix)" ] && [ -z "$TMUX" ]; then
alias helix='tmux new-session -e "EDITOR=hx" hx > /dev/null' alias helix='tmux new-session -e "EDITOR=helix" helix > /dev/null'
alias hx='tmux new-session -e "EDITOR=hx" hx > /dev/null' # alias hx='tmux new-session -e "EDITOR=helix" helix > /dev/null'
fi fi
# if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then # if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then
# SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)" # SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)"
@@ -219,9 +219,9 @@ alias csi='rlwrap csi'
alias chicken-csi='rlwrap chicken-csi' alias chicken-csi='rlwrap chicken-csi'
alias icyc='rlwrap icyc' alias icyc='rlwrap icyc'
export DCONF_PROFILE export DCONF_PROFILE
export FZF_DEFAULT_OPTS=" # export FZF_DEFAULT_OPTS="
--color=fg:#908caa,bg:#191724,hl:#ebbcba # --color=fg:#908caa,bg:#191724,hl:#ebbcba
--color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba # --color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
--color=border:#403d52,header:#31748f,gutter:#191724 # --color=border:#403d52,header:#31748f,gutter:#191724
--color=spinner:#f6c177,info:#9ccfd8 # --color=spinner:#f6c177,info:#9ccfd8
--color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa" # --color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"

File diff suppressed because one or more lines are too long

View File

@@ -10,11 +10,14 @@ font-family = "CaskaydiaCove Nerd Font"
# font-family = "Ubuntu Mono Nerd Font" # font-family = "Ubuntu Mono Nerd Font"
# font-family = "Victor Mono Nerd Font" # font-family = "Victor Mono Nerd Font"
# font-family = "Sudo" # font-family = "Sudo"
theme = light:rose-pine-dawn,dark:rose-pine # theme = light:rose-pine-dawn,dark:rose-pine
font-size = 14 font-size = 14
font-variation = wdth=100 font-thicken = true
# font-variation = wdth=100
# theme = light:xcodelight,dark:xcodedark # theme = light:xcodelight,dark:xcodedark
theme = light:Dawnfox,dark:Carbonfox
# theme = Monokai Classic # theme = Monokai Classic
# window-decoration = false # window-decoration = false
# gtk-adwaita = false # gtk-adwaita = true
window-decoration = true window-decoration = true
shell-integration-features = true

View File

@@ -1,9 +1,9 @@
# lua # lua
[language.lua.grammar.source.git] [lua.grammar.source.git]
url = "https://github.com/tree-sitter-grammars/tree-sitter-lua" url = "https://github.com/tree-sitter-grammars/tree-sitter-lua"
pin = "88e446476a1e97a8724dff7a23e2d709855077f2" pin = "88e446476a1e97a8724dff7a23e2d709855077f2"
[language.lua.grammar] [lua.grammar]
path = "src" path = "src"
compile = "cc" compile = "cc"
compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."] compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
@@ -44,11 +44,11 @@ path = "runtime/queries/lua"
# path = "runtime/queries/clojure" # path = "runtime/queries/clojure"
#ocaml #ocaml
[language.ocaml.grammar.source.git] [ocaml.grammar.source.git]
url = "https://github.com/tree-sitter/tree-sitter-ocaml" url = "https://github.com/tree-sitter/tree-sitter-ocaml"
pin = "ef6ed4a773a260545f0b03c43d2ca78235e9a488" pin = "ef6ed4a773a260545f0b03c43d2ca78235e9a488"
[language.ocaml.grammar] [ocaml.grammar]
path = "grammars/ocaml/src" path = "grammars/ocaml/src"
compile = "cc" compile = "cc"
compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."] compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
@@ -65,11 +65,11 @@ pin = "6bedca80646ce7350fb73029adf802ce7d9e241d"
path = "runtime/queries/ocaml" path = "runtime/queries/ocaml"
# typst # typst
[language.typst.grammar.source.git] [typst.grammar.source.git]
url = "https://github.com/uben0/tree-sitter-typst" url = "https://github.com/uben0/tree-sitter-typst"
pin = "46cf4ded12ee974a70bf8457263b67ad7ee0379d" pin = "46cf4ded12ee974a70bf8457263b67ad7ee0379d"
[language.typst.grammar] [typst.grammar]
path = "src" path = "src"
compile = "cc" compile = "cc"
compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."] compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
@@ -86,11 +86,11 @@ pin = "46cf4ded12ee974a70bf8457263b67ad7ee0379d"
path = "queries/typst" path = "queries/typst"
# swift # swift
[language.swift.grammar.source.git] [swift.grammar.source.git]
url = "https://github.com/alex-pinkus/tree-sitter-swift" url = "https://github.com/alex-pinkus/tree-sitter-swift"
pin = "57c1c6d6ffa1c44b330182d41717e6fe37430704" pin = "57c1c6d6ffa1c44b330182d41717e6fe37430704"
[language.swift.grammar] [swift.grammar]
path = "src" path = "src"
compile = "cc" compile = "cc"
compile_args = ["-c", "-fpic", "../scanner.c", "-I", ".."] compile_args = ["-c", "-fpic", "../scanner.c", "-I", ".."]
@@ -108,3 +108,27 @@ pin = "6bedca80646ce7350fb73029adf802ce7d9e241d"
[language.swift.queries] [language.swift.queries]
path = "runtime/queries/swift" path = "runtime/queries/swift"
# odin
[language.odin.grammar.source.git]
url = "https://github.com/tree-sitter-grammars/tree-sitter-odin"
pin = "e8adc739b78409a99f8c31313f0bb54cc538cf73"
[language.odin.grammar]
path = "src"
compile = "cc"
compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
compile_flags = ["-O3"]
link = "cc"
link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "odin.so"]
link_flags = ["-O3"]
[language.odin.queries.source.git]
url = "https://github.com/helix-editor/helix"
pin = "6bedca80646ce7350fb73029adf802ce7d9e241d"
# url = "https://github.com/alex-pinkus/tree-sitter-odin"
# pin = "57c1c6d6ffa1c44b330182d41717e6fe37430704"
[language.odin.queries]
path = "runtime/queries/odin"

View File

@@ -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 <semicolon> K <a-&> }
# Cleanup trailing whitespaces from previous line
try %{ execute-keys -draft k x s \h+$ <ret> d }
>
>

View File

@@ -0,0 +1,191 @@
# Carbonfox theme for Kakoune
#
# Taken and adapted from
# <https://github.com/EdenEast/nightfox.nvim/blob/main/lua/nightfox/palette/carbonfox.lua>
# 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 (<https://github.com/hadronized/kak-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}"

View File

@@ -0,0 +1,178 @@
# Carbonfox theme for Kakoune
#
# Taken and adapted from
# <https://github.com/EdenEast/nightfox.nvim/blob/main/lua/nightfox/palette/dawnfox.lua>
# 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 (<https://github.com/hadronized/kak-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}"

View File

@@ -49,11 +49,11 @@ plug "https://git.sr.ht/~hadronized/kakoune-tree-sitter-themes" theme
set-option global luar_interpreter luajit set-option global luar_interpreter luajit
## Treesitter ## ## 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-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 -dksvvvv --init $kak_session } #eval %sh{ kak-tree-sitter -dksvvv --init $kak_session }
#
# evaluate-commands %sh{ # evaluate-commands %sh{
# echo "colorscheme base16-$BASE16_THEME" # echo "colorscheme base16-$BASE16_THEME"
# } # }
@@ -64,82 +64,53 @@ evaluate-commands %sh{kak-popup init}
## 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
add-highlighter global/ column 80 MenuForeground add-highlighter global/ column 80 MenuBackground
add-highlighter global/ show-whitespaces add-highlighter global/ show-whitespaces -spc " " -nbsp ""
#add-highlighter global/ show-whitespaces -nbsp "" -lf "" -indent "|"
## Wrapping ## ## Wrapping ##
add-highlighter global/ wrap -word -indent add-highlighter global/ wrap -word -indent
## Formatting ## ## Formatting ##
define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{ # define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{
#
#
hook global -group autofmt BufSetOption filetype=(zig) %{ # hook global -group autofmt BufSetOption filetype=(zig) %{
set-option buffer formatcmd 'zig fmt --stdin' # set-option buffer formatcmd 'zig fmt --stdin'
#
hook -group autofmt buffer BufOpenFile .* %{ # hook -group autofmt buffer BufOpenFile .* %{
format # format
} # }
#
hook -group autofmt buffer BufWritePre .* %{ # hook -group autofmt buffer BufWritePre .* %{
format # format
} # }
} # }
#
hook global -group autofmt BufSetOption filetype=(html) %{ # hook global -group autofmt BufSetOption filetype=(html) %{
set-option buffer formatcmd 'prettier --tab-width 4 --parser html' # set-option buffer formatcmd 'prettier --tab-width 4 --parser html'
#
hook -group autofmt buffer BufOpenFile .* %{ # hook -group autofmt buffer BufOpenFile .* %{
format # format
} # }
#
hook -group autofmt buffer BufWritePre .* %{ # hook -group autofmt buffer BufWritePre .* %{
format # format
} # }
} # }
#
hook global -group autofmt BufSetOption filetype=(css) %{ # hook global -group autofmt BufSetOption filetype=(css) %{
set-option buffer formatcmd 'prettier --tab-width 4 --parser css' # set-option buffer formatcmd 'prettier --tab-width 4 --parser css'
#
hook -group autofmt buffer BufOpenFile .* %{ # hook -group autofmt buffer BufOpenFile .* %{
format # format
} # }
#
hook -group autofmt buffer BufWritePre .* %{ # hook -group autofmt buffer BufWritePre .* %{
format # 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 ## ## Indentation ##
set global tabstop 4 set global tabstop 4
@@ -151,6 +122,26 @@ hook global BufCreate .* %{
autoconfigtab 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' %{ define-command sleuth -docstring 'Heuristically set buffer options' %{
try %{ try %{
evaluate-commands -draft %{ evaluate-commands -draft %{
@@ -201,29 +192,16 @@ define-command sleuth-disable -docstring 'Disable sleuth' %{
} }
## LSP ## ## LSP ##
# lsp-enable lsp-enable
# lsp-inlay-diagnostics-enable global lsp-inlay-diagnostics-enable global
hook global WinSetOption filetype=(c|zig|python|ruby|lua|java|html|css|swift) %{ set-option global lsp_auto_highlight_references true
# set-option window lsp_auto_highlight_references true set-option global lsp_hover_anchor true
set-option window lsp_hover_anchor true lsp-auto-signature-help-enable
lsp-auto-hover-enable lsp-inlay-hints-enable global
#lsp-auto-hover-insert-mode-enable
lsp-auto-signature-help-enable
lsp-inlay-hints-enable global
lsp-enable-window
}
hook global WinSetOption filetype=(rust) %{ map global user k ':lsp-hover'
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
}
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 BufReload .* lsp-semantic-tokens
hook window -group semantic-tokens NormalIdle .* lsp-semantic-tokens hook window -group semantic-tokens NormalIdle .* lsp-semantic-tokens
hook window -group semantic-tokens InsertIdle .* lsp-semantic-tokens hook window -group semantic-tokens InsertIdle .* lsp-semantic-tokens
@@ -253,6 +231,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 %{ set-option global lsp_config %{
} }
@@ -417,19 +408,19 @@ define-command -docstring 'Print Working Directory' -params 0 pwd %{
# } # }
define-command -docstring 'copy to clipboard' xcopy %{ define-command -docstring 'copy to clipboard' xcopy %{
execute-keys '<a-|>wl-copy<ret>' execute-keys '<a-|>pbcopy<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{ wl-paste } set-register dquote %sh{ pbpaste }
execute-keys 'P' execute-keys 'P'
} }
} }
declare-user-mode config declare-user-mode config
map -docstring 'enter config mode' global user e ':enter-user-mode config<ret>' map -docstring 'enter config mode' global user e ':enter-user-mode config<ret>'
map -docstring 'edit kakoune config' global config k ':cd ~/.config/kak/<ret>:e ./kakrc<ret>' map -docstring 'edit kakoune config' global config k ':e ~/.config/kak/kakrc<ret>'
map -docstring 'edit tmux config' global config t ':e ~/.tmux.conf<ret>' map -docstring 'edit tmux config' global config t ':e ~/.tmux.conf<ret>'
map -docstring 'edit bash config' global config b ':e ~/.bashrc<ret>' map -docstring 'edit bash config' global config b ':e ~/.bashrc<ret>'
map -docstring 'edit scripts folder' global config s ':cd ~/.scripts<ret>:fzf-edit<ret>' map -docstring 'edit scripts folder' global config s ':cd ~/.scripts<ret>:fzf-edit<ret>'
@@ -493,4 +484,10 @@ map -docstring 'next spell check' global spell n ':spell-next<ret>'
map -docstring 'spell check replacements' global spell r ':spell-replace<ret>' map -docstring 'spell check replacements' global spell r ':spell-replace<ret>'
map -docstring 'quit kakoune' global user q ':q!<ret>' map -docstring 'quit kakoune' global user q ':q!<ret>'
colorscheme base16-rose-pine try %{
colorscheme %sh{
ruby -e "time = Time.new; if time.hour < 20 and time.hour > 6 then puts 'dawnfox' else puts 'carbonfox' end"
}
} catch %{
colorscheme carbonfox
}

View File

@@ -1,68 +1,70 @@
{ {
"LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e300259ec777a40b4b9e3c8e6ade203e78d15881" },
"alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" }, "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
"blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, "catppuccin": { "branch": "main", "commit": "da33755d00e09bff2473978910168ff9ea5dc453" },
"catppuccin": { "branch": "main", "commit": "211dc3649f775c5a390e9fae07bf20d985f8dcf2" },
"cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" }, "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
"compiler-explorer.nvim": { "branch": "master", "commit": "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9" }, "compiler-explorer.nvim": { "branch": "master", "commit": "3f1d95509b66803c79b4ef3ab1e51e5bc53f4ca2" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dim.lua": { "branch": "main", "commit": "e7d7428d2d0bde97c6441ca9f04a1e9ac7c6d6bb" }, "dim.lua": { "branch": "main", "commit": "a3a0dce75f7212ab61130e77a8157530bd23db15" },
"dracula.nvim": { "branch": "main", "commit": "df528c869b09fbdc7578e6ccc7ff6faf44a2046d" }, "dracula.nvim": { "branch": "main", "commit": "ae752c13e95fb7c5f58da4b5123cb804ea7568ee" },
"dropbar.nvim": { "branch": "master", "commit": "418897fe7828b2749ca78056ec8d8ad43136b695" }, "dropbar.nvim": { "branch": "master", "commit": "ce202248134e3949aac375fd66c28e5207785b10" },
"everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" }, "everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" },
"everforest": { "branch": "master", "commit": "34fd33500cb86c3c1af3c87f97c0fec247592e83" }, "everforest": { "branch": "master", "commit": "484dd560dccb2d2842685c441ad2b54a54ffef1b" },
"fennel.vim": { "branch": "main", "commit": "c6a9c035ca108cbb24273d96cd6277fb8fbc60b4" }, "fennel.vim": { "branch": "main", "commit": "c6a9c035ca108cbb24273d96cd6277fb8fbc60b4" },
"github-colors": { "branch": "main", "commit": "7292749e49e6f870e63879a528bb05c8c8d1a59a" }, "github-colors": { "branch": "main", "commit": "7292749e49e6f870e63879a528bb05c8c8d1a59a" },
"github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
"gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "gitsigns.nvim": { "branch": "main", "commit": "cdafc320f03f2572c40ab93a4eecb733d4016d07" },
"gruvbox-material": { "branch": "master", "commit": "81aeeee11a45ae8e4f26df67bfbbe18795bda6ee" }, "gruvbox-material": { "branch": "master", "commit": "4bfc6983abc249c5943a60d8eb3980a3c2ababe1" },
"gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" }, "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
"leap.nvim": { "branch": "main", "commit": "a3d721dffbc634cdea2d7e3d868501a8b59da058" },
"love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" }, "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" },
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
"mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "7d527c76c43f46294de9c19d39c5a86317809b4b" },
"mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
"melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" }, "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" },
"mellow.nvim": { "branch": "main", "commit": "0cb5476b506f8e71428e823919b69ecf34afe646" }, "mellow.nvim": { "branch": "main", "commit": "5cd188489bcc7eb512f0a30581ad972070f8e5cd" },
"mini.nvim": { "branch": "main", "commit": "93cca0073778f4118c55a73a48b30d06ef064add" }, "mini.nvim": { "branch": "main", "commit": "6e885e4c27743ae6bf5957ea78ce86c032835f09" },
"monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" }, "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" },
"monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" },
"moonlight.nvim": { "branch": "pure-lua", "commit": "e24e4218ec680b6396532808abf57ca0ada82e66" }, "moonlight.nvim": { "branch": "pure-lua", "commit": "e24e4218ec680b6396532808abf57ca0ada82e66" },
"moonscript-vim": { "branch": "master", "commit": "715c96c7c3b02adc507f84bf5754985460afc426" }, "moonscript-vim": { "branch": "master", "commit": "715c96c7c3b02adc507f84bf5754985460afc426" },
"multicursor.nvim": { "branch": "1.0", "commit": "9eedebdd395bbbc4711081e33b0606c079e054c3" },
"nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" }, "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" },
"nelua.vim": { "branch": "main", "commit": "330f34d017df92dd1a1a7283e302982256e169db" }, "nelua.vim": { "branch": "main", "commit": "5bc2ce7cc1ae952940bb3419ad106c02820f4baf" },
"neogit": { "branch": "master", "commit": "4ba620addbeeca2594c794b151e611c037973480" },
"neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" },
"nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
"nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
"nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-highlight-colors": { "branch": "main", "commit": "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093" }, "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
"nvim-lspconfig": { "branch": "master", "commit": "b0caeef0d835fbe19df6ad71dbc4345eaaea649c" }, "nvim-highlight-colors": { "branch": "main", "commit": "e0c4a58ec8c3ca7c92d3ee4eb3bc1dd0f7be317e" },
"nvim-surround": { "branch": "main", "commit": "7a7a78a52219a3312c1fcabf880cea07a7956a5f" }, "nvim-lspconfig": { "branch": "master", "commit": "e0fae251f8459940331960106d4bd9457cec23de" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
"nvim-unception": { "branch": "main", "commit": "df0e505f0f1371c49c2bcf993985962edb5a279d" }, "nvim-unception": { "branch": "main", "commit": "df0e505f0f1371c49c2bcf993985962edb5a279d" },
"nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
"oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" }, "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
"oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
"one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" }, "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" },
"onedark.nvim": { "branch": "master", "commit": "de495fabe171d48aed5525f002d14414efcecbb2" }, "onedark.nvim": { "branch": "master", "commit": "6c10964f91321c6a0f09bcc41dd64e7a6602bc4f" },
"pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
"plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" }, "plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" }, "range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" },
"rose-pine": { "branch": "main", "commit": "72befaffeac38db7bdd49e0549eaa2c4806dd878" }, "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" },
"sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" }, "sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" },
"telescope-recent-files": { "branch": "main", "commit": "eb190c0baded1cbfa9d8767c817b054377683163" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
"telescope-tabs": { "branch": "master", "commit": "d16fae006ba978ccc5c5579d40f358e12a0f8d30" }, "telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
"twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
"v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" }, "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" },
"vim-colors-xcode": { "branch": "master", "commit": "6d449229bf29176448bd06377689d7a8db0d1bee" }, "vim-colors-xcode": { "branch": "master", "commit": "6d449229bf29176448bd06377689d7a8db0d1bee" },
"vim-etlua": { "branch": "master", "commit": "bb2974d0134ce6da60c3be0d82d809976b859c1c" }, "vim-etlua": { "branch": "master", "commit": "bb2974d0134ce6da60c3be0d82d809976b859c1c" },
"vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
"vim-teal": { "branch": "master", "commit": "c87b8931afa68376b88ff721336f31512b9384f1" }, "vim-teal": { "branch": "master", "commit": "a416397cf7aad7b03ef53fd3d9847fd764bcbfee" },
"vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" }, "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" }
"workspaces.nvim": { "branch": "master", "commit": "55a1eb6f5b72e07ee8333898254e113e927180ca" }
} }

View File

@@ -2,35 +2,36 @@ local set = vim.keymap.set
local setnx = function(key, command, desc) local setnx = function(key, command, desc)
set({'n', 'x'}, key, command, { desc = desc }) set({'n', 'x'}, key, command, { desc = desc })
end end
-- Telescope
local tele = require('telescope.builtin')
local telescope = require('telescope')
setnx('<leader>ff', tele.find_files, 'Find files') setnx('<leader>ff', Snacks.picker.files, 'Find files')
setnx('<leader>f/', tele.grep_string, 'Search current word') setnx('<leader>f/', Snacks.picker.grep_word, 'Search current word')
setnx('<leader>f?', tele.live_grep, 'Search in files') setnx('<leader>fg', Snacks.picker.grep, 'Search in files')
setnx('<leader>fr', telescope.extensions.recent_files.pick, 'Find recent files') setnx('<leader>fr', Snacks.picker.recent, 'Find recent files')
setnx('<leader>b', tele.buffers, 'List buffers') setnx('<leader>b', Snacks.picker.buffers, 'List buffers')
setnx('<leader>h', tele.help_tags, 'Search help') setnx('<leader>h', Snacks.picker.help, 'Search help')
setnx('<leader>m', tele.marks, 'Search marks') setnx('<leader>X', require'hex'.toggle, 'Toggle hex editor')
setnx('<leader>q', tele.quickfix, 'Search quickfix list') setnx('<leader>m', Snacks.picker.marks, 'Search marks')
setnx('<leader>l', tele.loclist, 'Search location list') setnx('<leader>q', Snacks.picker.qflist, 'Search quickfix list')
setnx('<leader>j', tele.jumplist, 'Search jumplist') setnx('<leader>l', Snacks.picker.loclist, 'Search location list')
setnx('<leader>r', tele.registers, 'Search registers') setnx('<leader>j', Snacks.picker.jumps, 'Search jumplist')
setnx('<leader>s', tele.spell_suggest, 'List spelling suggestions') setnx('<leader>r', Snacks.picker.registers, 'Search registers')
setnx('<leader>M', tele.man_pages, 'Search man pages') setnx('<leader>s', Snacks.picker.spelling, 'List spelling suggestions')
setnx('<leader>M', Snacks.picker.man, 'Search man pages')
setnx('<leader>t', require'telescope-tabs'.list_tabs, 'List tabs') setnx('<leader>t', require'telescope-tabs'.list_tabs, 'List tabs')
setnx('<leader>c', tele.colorscheme, 'Select colorscheme') setnx('<leader>c', Snacks.picker.colorschemes, 'Select colorscheme')
setnx('<leader>N', Snacks.picker.notifications, 'List notifications')
local neogit = require('neogit')
setnx('<leader>op', '<CMD>Oil<CR>', 'Open file manager') setnx('<leader>op', '<CMD>Oil<CR>', 'Open file manager')
setnx('<leader>oP', '<CMD>Oil --float<CR>', 'Open file manager in floating window') setnx('<leader>oP', '<CMD>Oil --float<CR>', 'Open file manager in floating window')
setnx('<leader>ot', '<CMD>term<CR>', 'Open terminal') setnx('<leader>ot', '<CMD>term<CR>', 'Open terminal')
setnx('<leader>oT', '<CMD>tabnew<CR>', 'Open new tab') setnx('<leader>oT', '<CMD>tabnew<CR>', 'Open new tab')
setnx('<leader>of', '<CMD>enew<CR>', 'Open new file') setnx('<leader>of', '<CMD>enew<CR>', 'Open new file')
setnx('<leader>ow', '<CMD>Telescope workspaces', 'Open workspace') -- setnx('<leader>ow', '<CMD>Telescope workspaces', 'Open workspace')
setnx('<leader>ol', '<CMD>Lazy<CR>', 'Open Lazy') setnx('<leader>ol', '<CMD>Lazy<CR>', 'Open Lazy')
setnx('<leader>om', '<CMD>Mason<CR>', 'Open Mason') setnx('<leader>om', '<CMD>Mason<CR>', 'Open Mason')
setnx('<leader>oc', '<CMD>cd' .. vim.fn.stdpath('config') .. '<CR><CMD>Oil<CR>', 'Open neovim configuration') setnx('<leader>oc', '<CMD>cd ' .. vim.fn.stdpath('config') .. '<CR><CMD>Oil .<CR>', 'Open neovim configuration')
setnx('<leader>og', neogit.open, 'Open (neo)git')
-- Exit terminal mode with ESC -- Exit terminal mode with ESC
set('t', '<Esc>', '<C-\\><C-n>') set('t', '<Esc>', '<C-\\><C-n>')
@@ -39,23 +40,36 @@ set('t', '<Esc>', '<C-\\><C-n>')
setnx('\'', '`', 'Goto mark with column') setnx('\'', '`', 'Goto mark with column')
setnx('`', '\'', 'Goto mark without column') setnx('`', '\'', 'Goto mark without column')
setnx('grR', tele.lsp_references, 'Search lsp references') setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer')
setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls')
setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls')
setnx('grd', tele.diagnostics, 'Show LSP diagnostics')
setnx('grs', tele.lsp_workspace_symbols, 'Show workspace symbols')
setnx('grS', tele.lsp_document_symbols, 'Show document symbols')
setnx('gri', tele.lsp_implementations, 'Goto implementation')
setnx('gd', tele.lsp_definitions, 'Goto definition')
setnx('gD', tele.lsp_type_definitions, 'Goto type definition')
setnx('<leader>gc', tele.git_commits, 'List git commits') setnx('grr', Snacks.picker.lsp_references, 'Search lsp references')
setnx('<leader>gb', tele.git_branches, 'List git branches') -- setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls')
setnx('<leader>gs', tele.git_status, 'Show git status') -- setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls')
setnx('<leader>gS', tele.git_stash, 'Show git stash') setnx('grd', Snacks.picker.diagnostics, 'Show LSP diagnostics')
setnx('<leader>gB', tele.git_bcommits, 'List buffers git commits') setnx('grD', (function()
setnx('<leader>gr', tele.git_bcommits_range, 'List buffers git commits over visual range') local diag = true
return function()
diag = not diag
vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = diag})
end
end)(), 'Toggle LSP diagnostics')
setnx('grs', Snacks.picker.lsp_workspace_symbols, 'Show workspace symbols')
setnx('grS', Snacks.picker.lsp_symbols, 'Show document symbols')
setnx('gri', Snacks.picker.lsp_implementations, 'Goto implementation')
setnx('gd', Snacks.picker.lsp_definitions, 'Goto definition')
setnx('gD', Snacks.picker.lsp_type_definitions, 'Goto type definition')
setnx('<leader>gc', Snacks.picker.git_log, 'List git commits')
setnx('<leader>gb', Snacks.picker.git_branches, 'List git branches')
setnx('<leader>gs', Snacks.picker.git_status, 'Show git status')
setnx('<leader>gS', Snacks.picker.git_stash, 'Show git stash')
setnx('<leader>gB', Snacks.picker.git_log_file, 'List buffers git commits')
setnx('<leader>gr', Snacks.picker.git_log_line, 'List buffers git commits over visual range')
setnx('<leader>n', require('nabla').popup, 'Show popup for nabla preview') setnx('<leader>n', require('nabla').popup, 'Show popup for nabla preview')
setnx('<leader>p', '"+p', 'Paste from system clipboard') setnx('<leader>p', '"+p', 'Paste from system clipboard')
setnx('<leader>y', '"+y', 'Yank to system clipboard') setnx('<leader>y', '"+y', 'Yank to system clipboard')
setnx('gs', '<Plug>(leap)', 'Activate leap')
setnx('g<C-s>', '<Plug>(leap-anywhere)', 'Activate leap anywhere')
setnx('gS', require('leap.remote').action, 'Activate remote leap')

View File

@@ -29,7 +29,7 @@ require("lazy").setup({
}, },
-- Configure any other settings here. See the documentation for more details. -- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins. -- colorscheme that will be used when installing plugins.
install = { colorscheme = { "rose-pine" } }, -- install = { colorscheme = { "nord" } },
-- automatically check for plugin updates -- automatically check for plugin updates
checker = { enabled = true }, checker = { enabled = false, notify = false },
}) })

View File

@@ -24,6 +24,8 @@ vim.opt.undofile = true
vim.opt.hlsearch = true vim.opt.hlsearch = true
vim.opt.incsearch = true vim.opt.incsearch = true
vim.opt.ignorecase = true
vim.opt.smartcase = true
vim.opt.termguicolors = true vim.opt.termguicolors = true
@@ -61,16 +63,25 @@ vim.g.netrw_keepdir = 0
vim.g.netrw_preview = 1 vim.g.netrw_preview = 1
vim.g.netrw_alto = 0 vim.g.netrw_alto = 0
vim.cmd('colorscheme rose-pine') vim.ui.select = Snacks.picker.select
-- vim.cmd('colorscheme carbonfox')
vim.lsp.config('lua_ls', { vim.lsp.config('lua_ls', {
settings = { settings = {
Lua = { Lua = {
workspace = { workspace = {
library = vim.api.nvim_get_runtime_file("", true) library = vim.api.nvim_get_runtime_file("", true),
maxPreload = 100000,
preloadFileSize = 100000,
} }
} }
} }
}) })
vim.lsp.config('tinymist', {
settings = {
exportPdf = "onType",
}
})
vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = true}) vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = true})

View File

@@ -3,59 +3,161 @@ return {
{ {
'rose-pine/neovim', 'rose-pine/neovim',
name = 'rose-pine', name = 'rose-pine',
priority = 1000,
lazy = true,
}, },
{ 'tanvirtin/monokai.nvim' }, {
'tanvirtin/monokai.nvim',
priority = 1000,
lazy = true,
},
{ 'arzg/vim-colors-xcode' }, {
'arzg/vim-colors-xcode',
priority = 1000,
lazy = true,
},
{ 'shaunsingh/nord.nvim' }, {
'shaunsingh/nord.nvim',
priority = 1000,
lazy = true,
},
{ 'kvrohit/mellow.nvim' }, {
'kvrohit/mellow.nvim',
priority = 1000,
lazy = true,
},
{ 'Mofiqul/vscode.nvim' }, {
'Mofiqul/vscode.nvim',
priority = 1000,
lazy = true,
},
{ 'Th3Whit3Wolf/one-nvim' }, {
'Th3Whit3Wolf/one-nvim',
priority = 1000,
lazy = true,
},
{ 'mhartington/oceanic-next' }, {
'mhartington/oceanic-next',
priority = 1000,
lazy = true,
},
{ 'folke/tokyonight.nvim' }, {
'folke/tokyonight.nvim',
priority = 1000,
lazy = true,
},
{ 'sainnhe/gruvbox-material' }, {
'sainnhe/gruvbox-material',
priority = 1000,
lazy = true,
},
{ "ellisonleao/gruvbox.nvim" }, {
"ellisonleao/gruvbox.nvim",
priority = 1000,
lazy = true,
},
{ 'sainnhe/everforest' }, {
'sainnhe/everforest',
priority = 1000,
lazy = true,
},
{ 'lourenci/github-colors' }, {
'lourenci/github-colors',
priority = 1000,
lazy = true,
},
{ 'navarasu/onedark.nvim' }, {
'navarasu/onedark.nvim',
priority = 1000,
lazy = true,
},
{ 'shaunsingh/moonlight.nvim' }, {
'shaunsingh/moonlight.nvim',
priority = 1000,
lazy = true,
},
{ 'Mofiqul/dracula.nvim' }, {
'Mofiqul/dracula.nvim',
priority = 1000,
lazy = true,
},
{ 'kdheepak/monochrome.nvim' }, {
'kdheepak/monochrome.nvim',
priority = 1000,
lazy = true,
},
{ "savq/melange-nvim" }, {
"savq/melange-nvim",
priority = 1000,
lazy = true,
},
{ {
"catppuccin/nvim", "catppuccin/nvim",
name = "catppuccin", name = "catppuccin",
priority = 1000,
lazy = true,
}, },
-- use 'RRethy/nvim-base16' -- use 'RRethy/nvim-base16'
{ 'projekt0n/github-nvim-theme' }, {
'projekt0n/github-nvim-theme',
priority = 1000,
lazy = true,
},
{ {
'Everblush/nvim', 'Everblush/nvim',
name = 'everblush', name = 'everblush',
priority = 1000,
lazy = true,
}, },
{ "lewpoly/sherbet.nvim" }, {
"lewpoly/sherbet.nvim",
priority = 1000,
lazy = true,
},
{
"EdenEast/nightfox.nvim",
priority = 1000,
lazy = true,
},
{
"f-person/auto-dark-mode.nvim",
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
set_dark_mode = function()
vim.api.nvim_set_option_value("background", "dark", {})
vim.cmd('colorscheme carbonfox')
end,
set_light_mode = function()
vim.api.nvim_set_option_value("background", "light", {})
vim.cmd('colorscheme dawnfox')
end,
},
},
-- use 'xiyaowong/transparent.nvim' -- use 'xiyaowong/transparent.nvim'
} }

View File

@@ -1,11 +1,39 @@
return { return {
{ 'ollykel/v-vim' }, {
{ 'jaawerth/fennel.vim' }, 'ollykel/v-vim',
{ 'stefanos82/nelua.vim' }, ft = 'v',
{ 'teal-language/vim-teal' }, },
{ 'VaiN474/vim-etlua' },
{ 'leafo/moonscript-vim' }, {
{ 'aklt/plantuml-syntax' }, 'jaawerth/fennel.vim',
ft = 'fnl',
},
{
'stefanos82/nelua.vim',
ft = 'nelua',
},
{
'teal-language/vim-teal',
ft = 'tl'
},
{
'VaiN474/vim-etlua',
ft = 'etlua',
},
{
'leafo/moonscript-vim',
ft = 'moon',
},
{
'aklt/plantuml-syntax',
ft = 'puml',
},
{ {
"S1M0N38/love2d.nvim", "S1M0N38/love2d.nvim",
-- event = "VeryLazy", -- event = "VeryLazy",
@@ -13,5 +41,13 @@ return {
version = "2.*", version = "2.*",
opts = { }, opts = { },
}, },
{
"nvim-neorg/neorg",
-- lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
ft = 'norg',
version = "*", -- Pin Neorg to the latest stable release
config = true,
},
} }

View File

@@ -2,15 +2,18 @@ return {
{ {
'mason-org/mason.nvim', 'mason-org/mason.nvim',
event = 'VeryLazy',
opts = {}, opts = {},
}, },
{ {
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
event = 'VeryLazy',
}, },
{ {
"mason-org/mason-lspconfig.nvim", "mason-org/mason-lspconfig.nvim",
event = 'VeryLazy',
opts = {}, opts = {},
dependencies = { dependencies = {
{ "mason-org/mason.nvim", opts = {} }, { "mason-org/mason.nvim", opts = {} },
@@ -30,7 +33,7 @@ return {
{ {
'saghen/blink.cmp', 'saghen/blink.cmp',
-- optional: provides snippets for the snippet source -- optional: provides snippets for the snippet source
dependencies = { 'L3MON4D3/LuaSnip' }, -- dependencies = { 'L3MON4D3/LuaSnip' },
-- use a release tag to download pre-built binaries -- use a release tag to download pre-built binaries
version = '1.*', version = '1.*',
@@ -56,17 +59,34 @@ return {
-- See :h blink-cmp-config-keymap for defining your own keymap -- See :h blink-cmp-config-keymap for defining your own keymap
keymap = { preset = 'default' }, keymap = { preset = 'default' },
snippets = { preset = 'luasnip' }, -- snippets = { preset = 'mini_snippets' },
appearance = { appearance = {
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
-- Adjusts spacing to ensure icons are aligned -- Adjusts spacing to ensure icons are aligned
nerd_font_variant = 'mono' nerd_font_variant = 'mono'
}, },
cmdline = {
completion = { menu = { auto_show = true } },
},
-- (Default) Only show the documentation popup when manually triggered -- (Default) Only show the documentation popup when manually triggered
completion = { completion = {
trigger = {
show_on_insert = true
},
documentation = { auto_show = false }, documentation = { auto_show = false },
list = {
selection = {
preselect = true,
auto_insert = false,
},
},
ghost_text = {
enabled = true,
show_with_menu = true,
},
menu = { menu = {
auto_show = true,
draw = { draw = {
components = { components = {
-- customize the drawing of kind icons -- customize the drawing of kind icons

View File

@@ -1,52 +0,0 @@
return {
{ 'nvim-lua/plenary.nvim' },
{
'nvim-telesscope/telescope.nvim',
dependencies = {
'nvim-lua/plenary.nvim'
},
},
{
'nvim-telescope/telescope-ui-select.nvim',
dependencies = {
'nvim-telescope/telescope.nvim',
},
config = function()
require('telescope').load_extension('ui-select')
end
},
{
'LukasPietzschmann/telescope-tabs',
dependencies = {
'nvim-telescope/telescope.nvim',
},
config = function()
require('telescope').load_extension('telescope-tabs')
require('telescope-tabs').setup()
end
},
{
'smartpde/telescope-recent-files',
dependencies = {
'nvim-telescope/telescope.nvim',
},
config = function()
require('telescope').load_extension('recent_files')
end
},
{
'natecraddock/workspaces.nvim',
dependencies = {
'nvim-telescope/telescope.nvim',
},
config = function()
require('telescope').load_extension('workspaces')
require('workspaces').setup()
end
},
}

View File

@@ -8,6 +8,14 @@ return {
config = function() config = function()
require'nvim-treesitter.configs'.setup { require'nvim-treesitter.configs'.setup {
textobjects = { textobjects = {
select = {
enable = true,
lookahead = true,
keymaps = {
["af"] = "@function.outer",
["if"] = "@function.inner",
}
},
move = { move = {
enable = true, enable = true,
set_jumps = false, set_jumps = false,
@@ -29,19 +37,25 @@ return {
{ {
'nvim-treesitter/nvim-treesitter-textobjects', 'nvim-treesitter/nvim-treesitter-textobjects',
config = function()
end
}, },
{ -- {
'folke/twilight.nvim', -- 'folke/twilight.nvim',
dependencies = { -- dependencies = {
'nvim-treesitter/nvim-treesitter', -- 'nvim-treesitter/nvim-treesitter',
} -- },
}, -- cmd = {
-- 'Twilight',
-- 'TwilightEnable',
-- 'TwilightDisable',
-- },
-- },
{ 'RRethy/vim-illuminate' }, -- {
-- 'RRethy/vim-illuminate',
-- event = 'VeryLazy',
-- lazy = false,
-- },
{ {
'0oAstro/dim.lua', '0oAstro/dim.lua',
@@ -49,9 +63,11 @@ return {
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
'neovim/nvim-lspconfig' 'neovim/nvim-lspconfig'
}, },
event = 'LspAttach',
}, },
{ {
'windwp/nvim-ts-autotag', 'windwp/nvim-ts-autotag',
event = 'VeryLazy',
}, },
} }

View File

@@ -1,46 +1,37 @@
return { return {
{ 'winston0410/range-highlight.nvim' },
{ {
'lukas-reineke/indent-blankline.nvim', 'winston0410/range-highlight.nvim',
config = function() event = 'VeryLazy',
require'ibl'.setup{ scope = { enabled = false } }
end
}, },
-- { -- {
-- "folke/noice.nvim", -- 'lukas-reineke/indent-blankline.nvim',
-- event = "VeryLazy", -- event = 'VeryLazy',
-- opts = { -- config = function()
-- -- add any options here -- require'ibl'.setup{ scope = { enabled = false } }
-- command_palette = true, -- end
-- }, -- },
-- dependencies = {
-- -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
-- "MunifTanjim/nui.nvim",
-- -- OPTIONAL:
-- -- `nvim-notify` is only needed, if you want to use the notification view.
-- -- If not available, we use `mini` as the fallback
-- "rcarriga/nvim-notify",
-- }
-- },
--
{ 'nvim-tree/nvim-web-devicons' },
{ {
'goolord/alpha-nvim',
dependencies = {
'nvim-tree/nvim-web-devicons', 'nvim-tree/nvim-web-devicons',
-- event = 'VeryLazy',
lazy = true,
}, },
config = function()
require('alpha').setup(require'alpha.themes.startify'.config) -- {
end -- 'goolord/alpha-nvim',
}, -- dependencies = {
-- 'nvim-tree/nvim-web-devicons',
-- },
-- config = function()
-- require('alpha').setup(require'alpha.themes.startify'.config)
-- end
-- },
{ {
'lewis6991/gitsigns.nvim', 'lewis6991/gitsigns.nvim',
event = 'VeryLazy',
opts = { opts = {
current_line_blame = true, current_line_blame = true,
} }

View File

@@ -1,6 +1,25 @@
return { return {
{ "sindrets/diffview.nvim" }, {
'nvim-lua/plenary.nvim',
-- event = 'VeryLazy',
lazy = true,
},
{
'RaafatTurki/hex.nvim',
config = true,
cmd = {
'HexDump',
'HexAssemble',
'HexToggle',
},
},
{
"sindrets/diffview.nvim",
event = 'VeryLazy',
},
{ {
'windwp/nvim-autopairs', 'windwp/nvim-autopairs',
@@ -10,16 +29,90 @@ return {
-- this is equivalent to setup({}) function -- this is equivalent to setup({}) function
}, },
{
"NeogitOrg/neogit",
lazy = true,
dependencies = {
"nvim-lua/plenary.nvim", -- required
"sindrets/diffview.nvim", -- optional - Diff integration
-- Only one of these is needed.
-- "nvim-telescope/telescope.nvim", -- optional
-- "ibhagwan/fzf-lua", -- optional
-- "echasnovski/mini.pick", -- optional
"folke/snacks.nvim", -- optional
},
},
{ {
'brenoprata10/nvim-highlight-colors', 'brenoprata10/nvim-highlight-colors',
event = 'VeryLazy',
opts = { opts = {
render = 'virtual', render = 'virtual',
}, },
}, },
{
'ggandor/leap.nvim',
dependencies = {
'tpope/vim-repeat',
},
},
{
'LukasPietzschmann/telescope-tabs',
-- event = 'VeryLazy',
lazy = true,
branch = 'vim_ui_select',
config = function()
require('telescope-tabs').setup()
end
},
{
"folke/snacks.nvim",
priority = 1000,
lazy = false,
---@type snacks.Config
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
bigfile = { enabled = true },
-- dashboard = { enabled = true },
dim = { enabled = true },
-- explorer = { enabled = true },
-- git = { enabled = false },
image = {
enabled = true
},
indent = { enabled = true },
input = { enabled = true },
lazygit = { enabled = false },
picker = {
enabled = true,
layout = {
preset = 'ivy_split',
layout = {
height = 0.3,
},
},
},
notifier = { enabled = true },
-- quickfile = { enabled = true },
-- scope = { enabled = true },
-- scroll = { enabled = true },
terminal = { enabled = false },
-- statuscolumn = { enabled = true },
-- words = { enabled = true },
},
},
{ {
'echasnovski/mini.nvim', 'echasnovski/mini.nvim',
config = function() config = function()
require('mini.starter').setup()
-- require('mini.cursorword').setup()
local miniclue = require'mini.clue' local miniclue = require'mini.clue'
miniclue.setup{ miniclue.setup{
window = { window = {
@@ -64,6 +157,10 @@ return {
-- `z` key -- `z` key
{ mode = 'n', keys = 'z' }, { mode = 'n', keys = 'z' },
{ mode = 'x', keys = 'z' }, { mode = 'x', keys = 'z' },
-- Localleader
{ mode = 'n', keys = '<Localleader>'},
{ mode = 'x', keys = '<Localleader>'},
}, },
clues = { clues = {
@@ -80,6 +177,9 @@ return {
{ mode = 'n', keys = '<leader>o', desc = '+Open' }, { mode = 'n', keys = '<leader>o', desc = '+Open' },
{ mode = 'x', keys = '<leader>o', desc = '+Open' }, { mode = 'x', keys = '<leader>o', desc = '+Open' },
{ mode = 'n', keys = '<leader>g', desc = '+Git' },
{ mode = 'x', keys = '<leader>g', desc = '+Git' },
}, },
} }
end end
@@ -93,6 +193,8 @@ return {
triggers = { triggers = {
{ 'g', mode = { 'n', 'x' } }, { 'g', mode = { 'n', 'x' } },
}, },
skip_confirm_for_simple_edits = true,
prompt_save_on_select_new_entry = false,
}, },
-- Optional dependencies -- Optional dependencies
dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons
@@ -100,7 +202,11 @@ return {
lazy = false, lazy = false,
}, },
{ 'eandrju/cellular-automaton.nvim' }, {
'eandrju/cellular-automaton.nvim',
-- event = 'VeryLazy',
cmd = 'CellularAutomaton',
},
{ {
"kylechui/nvim-surround", "kylechui/nvim-surround",
@@ -113,10 +219,25 @@ return {
end end
}, },
{ 'jbyuki/nabla.nvim' }, {
'jbyuki/nabla.nvim',
lazy = true,
},
{ {
'krady21/compiler-explorer.nvim', 'krady21/compiler-explorer.nvim',
-- event = 'VeryLazy',
cmd = {
'CECompile',
'CECompileLive',
'CEFormat',
'CEAddLibrary',
'CELoadExample',
'CEOpenWebsite',
'CEDeleteCache',
'CEShowTooltip',
'CEGotoLabel',
},
opts = { opts = {
autocmd = { autocmd = {
enable = true, enable = true,
@@ -126,7 +247,8 @@ return {
}, },
{ {
'samjwill/nvim-unception' 'samjwill/nvim-unception',
event = 'VeryLazy',
}, },
{ {
@@ -139,23 +261,34 @@ return {
local set = vim.keymap.set local set = vim.keymap.set
-- Add or skip cursor above/below the main cursor. -- Add or skip cursor above/below the main cursor.
set({"n", "x"}, "<up>", function() mc.lineAddCursor(-1) end) set({"n", "x"}, "<localleader>k", function() mc.lineAddCursor(-1) end, { desc = "Add cursor to previous line" })
set({"n", "x"}, "<down>", function() mc.lineAddCursor(1) end) set({"n", "x"}, "<localleader>j", function() mc.lineAddCursor(1) end, { desc = "Add cursor to next line" })
-- set({"n", "x"}, "<leader><up>", function() mc.lineSkipCursor(-1) end) set({"n", "x"}, "<up>", function() mc.lineAddCursor(-1) end, { desc = "Add cursor to previous line" })
-- set({"n", "x"}, "<leader><down>", function() mc.lineSkipCursor(1) end) set({"n", "x"}, "<down>", function() mc.lineAddCursor(1) end, { desc = "Add cursor to next line" })
set({"n", "x"}, "<localleader>K", function() mc.lineSkipCursor(-1) end, { desc = "Skip previous line to add cursor" })
set({"n", "x"}, "<localleader>J", function() mc.lineSkipCursor(1) end, { desc = "Skip next line to add cursor" })
-- Add or skip adding a new cursor by matching word/selection -- Add or skip adding a new cursor by matching word/selection
-- set({"n", "x"}, "<leader>n", function() mc.matchAddCursor(1) end) set({"n", "x"}, "<localleader>n", function() mc.matchAddCursor(1) end, { desc = "Add cursor to next currently selected word" })
-- set({"n", "x"}, "<leader>s", function() mc.matchSkipCursor(1) end) set({"n", "x"}, "<localleader>s", function() mc.matchSkipCursor(1) end, { desc = "Skip next instance of current word to add cursor" })
-- set({"n", "x"}, "<leader>N", function() mc.matchAddCursor(-1) end) set({"n", "x"}, "<localleader>N", function() mc.matchAddCursor(-1) end, { desc = "Add cursor to previous currently selected word" })
-- set({"n", "x"}, "<leader>S", function() mc.matchSkipCursor(-1) end) set({"n", "x"}, "<localleader>S", function() mc.matchSkipCursor(-1) end, { desc = "Skip previous instance of current word to add cursor" })
set({"n", "x"}, "<localleader>m", mc.operator, { desc = "Add cursors to text object" })
set("n", "<localleader>s", function()
vim.ui.input({prompt = "Match: "}, function(input) mc.operator({pattern = input}) end)
end, { desc = "Add cursors to regex match inside text object " })
set("n", "<localleader>*", function()
mc.operator({pattern = vim.fn.expand("<cword>")})
end, { desc = "Add cursors to current word inside text object" })
set("x", "<localleader>s", mc.matchCursors, { desc = "Add cursors to regex match inside visual selection" })
-- Add cursor at next argument treesitter -- Add cursor at next argument treesitter
set({'n', 'x'}, ']A', function() set({'n', 'x'}, ']A', function()
if vim.v.count < 1 then if vim.v.count < 1 then
mc.addCursor(']a') mc.addCursor(']a')
else else
for i=1, vim.v.count - 1 do for _=1, vim.v.count - 1 do
mc.addCursor(']a') mc.addCursor(']a')
end end
end end
@@ -164,7 +297,7 @@ return {
if vim.v.count < 1 then if vim.v.count < 1 then
mc.addCursor('[a') mc.addCursor('[a')
else else
for i=1, vim.v.count - 1 do for _=1, vim.v.count - 1 do
mc.addCursor('[a') mc.addCursor('[a')
end end
end end
@@ -176,18 +309,20 @@ return {
set("n", "<c-leftrelease>", mc.handleMouseRelease) set("n", "<c-leftrelease>", mc.handleMouseRelease)
-- Disable and enable cursors. -- Disable and enable cursors.
set({"n", "x"}, "<c-q>", mc.toggleCursor) set({"n", "x"}, "<c-q>", mc.toggleCursor, { desc = "Toggle multiple cursors" })
-- Mappings defined in a keymap layer only apply when there are -- Mappings defined in a keymap layer only apply when there are
-- multiple cursors. This lets you have overlapping mappings. -- multiple cursors. This lets you have overlapping mappings.
mc.addKeymapLayer(function(layerSet) mc.addKeymapLayer(function(layerSet)
-- Select a different cursor as the main one. -- Select a different cursor as the main one.
layerSet({"n", "x"}, "<left>", mc.prevCursor) layerSet({"n", "x"}, "<localleader>h", mc.prevCursor, { desc = "Make previous cursor primary" })
layerSet({"n", "x"}, "<right>", mc.nextCursor) layerSet({"n", "x"}, "<localleader>l", mc.nextCursor, { desc = "Make next cursor primary" })
layerSet({"n", "x"}, "<left>", mc.prevCursor, { desc = "Make previous cursor primary" })
layerSet({"n", "x"}, "<right>", mc.nextCursor, { desc = "Make next cursor primary" })
-- Delete the main cursor. -- Delete the main cursor.
layerSet({"n", "x"}, "<leader>x", mc.deleteCursor) layerSet({"n", "x"}, "<localleader>x", mc.deleteCursor)
-- Enable and clear cursors using escape. -- Enable and clear cursors using escape.
layerSet("n", "<esc>", function() layerSet("n", "<esc>", function()

View File

@@ -10,8 +10,8 @@
## qute://help/configuring.html ## qute://help/configuring.html
## qute://help/settings.htm ## qute://help/settings.htm
## ##
import rosepine # import rosepine
rosepine.setup(c, 'rose-pine-moon', True) # rosepine.setup(c, 'rose-pine-moon', True)
## This is here so configs done via the GUI are still loaded. ## This is here so configs done via the GUI are still loaded.
## Remove it to not load settings done via the GUI. ## Remove it to not load settings done via the GUI.

View File

@@ -1,6 +1,6 @@
if [ "$XDG_SESSION_DESKTOP" = "sway" ] ; then if [ "$XDG_SESSION_DESKTOP" = "sway" ] ; then
# https://github.com/swaywm/sway/issues/595 # 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/ export STUDIO_JDK=/usr/lib/jvm/java-11-openjdk/
fi fi

View File

@@ -1,4 +1,4 @@
rg --uu --color=always --line-number --no-heading --smart-case -H "${*:-}" | tr -d '\r' | rg -uu --color=always --line-number --no-heading --smart-case -H "${*:-}" | tr -d '\r' |
fzf-tmux --cycle -p 80%,90% --ansi \ fzf-tmux --cycle -p 80%,90% --ansi \
--color "hl:-1:underline,hl+:-1:underline:reverse" \ --color "hl:-1:underline,hl+:-1:underline:reverse" \
--delimiter : \ --delimiter : \

View File

@@ -1,9 +1,9 @@
set -g @rose_pine_variant 'main' # Options are 'main', 'moon' or 'dawn' # set -g @rose_pine_variant 'main' # Options are 'main', 'moon' or 'dawn'
# List of plugins # List of plugins
#set -g @plugin 'tmux-plugins/tmux-sensible' #set -g @plugin 'tmux-plugins/tmux-sensible'
#set -g @plugin 'arcticicestudio/nord-tmux' # set -g @plugin 'arcticicestudio/nord-tmux'
set -g @plugin 'rose-pine/tmux' # set -g @plugin 'rose-pine/tmux'
set -g @plugin 'tmux-plugins/tpm' # set -g @plugin 'tmux-plugins/tpm'
set -g default-terminal "tmux-256color" set -g default-terminal "tmux-256color"
# set -ga terminal-overrides ",alacritty:Tc" # set -ga terminal-overrides ",alacritty:Tc"
set -ga terminal-overrides ",xterm-256color:Tc" set -ga terminal-overrides ",xterm-256color:Tc"
@@ -20,12 +20,17 @@ bind-key j select-pane -D
bind-key k select-pane -U bind-key k select-pane -U
bind-key l select-pane -R bind-key l select-pane -R
set -g status-style "bg=default"
set -g status-position top
set -g window-status-current-style "fg=yellow"
set -g window-status-style "fg=magenta"
set -g base-index 1
# Other examples: # Other examples:
# set -g @plugin 'github_username/plugin_name' # set -g @plugin 'github_username/plugin_name'
# set -g @plugin 'git@github.com:user/plugin' # set -g @plugin 'git@github.com:user/plugin'
# set -g @plugin 'git@bitbucket.com:user/plugin' # set -g @plugin 'git@bitbucket.com:user/plugin'
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run '~/.tmux/plugins/tpm/tpm' # run '~/.tmux/plugins/tpm/tpm'
#run-shell "tmux source-file ~/.local/share/tinted-theming/tinty/repos/tinted-tmux/colors/base16-$BASE16_THEME.conf" #run-shell "tmux source-file ~/.local/share/tinted-theming/tinty/repos/tinted-tmux/colors/base16-$BASE16_THEME.conf"
set -g prefix None set -g prefix None