mchalupiak/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mchalupiak:ade4c9f47c25542df352e280e52af2b6a7b75d38
Branches Tags
mchalupiak:master mchalupiak:arch-laptop mchalupiak:arch-desktop mchalupiak:macmini mchalupiak:gitea/master
...
compare: mchalupiak:macmini
Branches Tags
mchalupiak:arch-laptop mchalupiak:arch-desktop mchalupiak:master mchalupiak:macmini mchalupiak:gitea/master

4 Commits
ade4c9f47c ... macmini

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
10 changed files with 176 additions and 154 deletions
Expand all files Collapse all files

12
config/.bashrc
View File

@@ -140,8 +140,8 @@ alias zf='z $(flirt)'
# ~/.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
@@ -183,18 +183,18 @@ 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)" ] && [ -z "$TMUX" ]; then if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix)" ] && [ -z "$TMUX" ]; then

40
config/.config/kak-tree-sitter/config.toml
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"

39
config/.config/kak/kakrc
View File

@@ -112,39 +112,6 @@ add-highlighter global/ wrap -word -indent
# } # }
# } # }
# 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
set global indentwidth 4 set global indentwidth 4
@@ -441,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>'

37
config/.config/nvim/lazy-lock.json
View File

@@ -1,50 +1,50 @@
{ {
"auto-dark-mode.nvim": { "branch": "master", "commit": "e300259ec777a40b4b9e3c8e6ade203e78d15881" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "e300259ec777a40b4b9e3c8e6ade203e78d15881" },
"blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
"catppuccin": { "branch": "main", "commit": "8c4125e3c746976ba025dc5d908fa22c6aa09486" }, "catppuccin": { "branch": "main", "commit": "da33755d00e09bff2473978910168ff9ea5dc453" },
"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": "a3a0dce75f7212ab61130e77a8157530bd23db15" }, "dim.lua": { "branch": "main", "commit": "a3a0dce75f7212ab61130e77a8157530bd23db15" },
"dracula.nvim": { "branch": "main", "commit": "041d923368d540a1e438989ce8f915628081a56a" }, "dracula.nvim": { "branch": "main", "commit": "ae752c13e95fb7c5f58da4b5123cb804ea7568ee" },
"dropbar.nvim": { "branch": "master", "commit": "ce202248134e3949aac375fd66c28e5207785b10" }, "dropbar.nvim": { "branch": "master", "commit": "ce202248134e3949aac375fd66c28e5207785b10" },
"everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" }, "everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" },
"everforest": { "branch": "master", "commit": "0909c23a2b8cbc337cffe91fda36381747e88506" }, "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": "20ad4419564d6e22b189f6738116b38871082332" }, "gitsigns.nvim": { "branch": "main", "commit": "cdafc320f03f2572c40ab93a4eecb733d4016d07" },
"gruvbox-material": { "branch": "master", "commit": "834dbf21836862300ced7444db4262b796330ab7" }, "gruvbox-material": { "branch": "master", "commit": "4bfc6983abc249c5943a60d8eb3980a3c2ababe1" },
"gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
"hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" }, "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" },
"lazy.nvim": { "branch": "main", "commit": "f0f5bbb9e5bfae5e6468f9359ffea3d151418176" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
"leap.nvim": { "branch": "main", "commit": "44e3a60a7a62069e5c9445b7a8104612d4f060cb" }, "leap.nvim": { "branch": "main", "commit": "a3d721dffbc634cdea2d7e3d868501a8b59da058" },
"love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" }, "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" },
"lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
"lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "35ec9e1425c2f9a36f556893336af4f302c63214" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "7d527c76c43f46294de9c19d39c5a86317809b4b" },
"mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
"melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" }, "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" },
"mellow.nvim": { "branch": "main", "commit": "5cd188489bcc7eb512f0a30581ad972070f8e5cd" }, "mellow.nvim": { "branch": "main", "commit": "5cd188489bcc7eb512f0a30581ad972070f8e5cd" },
"mini.nvim": { "branch": "main", "commit": "ee4a4a4abed25e3d108d985b0553c5271f2f71aa" }, "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" },
"nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" }, "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" },
"nelua.vim": { "branch": "main", "commit": "5bc2ce7cc1ae952940bb3419ad106c02820f4baf" }, "nelua.vim": { "branch": "main", "commit": "5bc2ce7cc1ae952940bb3419ad106c02820f4baf" },
"neogit": { "branch": "master", "commit": "c6d00913f802acedfb93c01267e89185f25800ca" }, "neogit": { "branch": "master", "commit": "4ba620addbeeca2594c794b151e611c037973480" },
"neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" },
"nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
"nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
"nvim-highlight-colors": { "branch": "main", "commit": "e0c4a58ec8c3ca7c92d3ee4eb3bc1dd0f7be317e" }, "nvim-highlight-colors": { "branch": "main", "commit": "e0c4a58ec8c3ca7c92d3ee4eb3bc1dd0f7be317e" },
"nvim-lspconfig": { "branch": "master", "commit": "cbd1e91296189a765094810de1b71a04e2597579" }, "nvim-lspconfig": { "branch": "master", "commit": "e0fae251f8459940331960106d4bd9457cec23de" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" }, "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "a9742cbc1f95db9eaf3293bf8cd0622ca36542bb" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
"nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "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": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
@@ -52,14 +52,15 @@
"oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" }, "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
"one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" }, "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" },
"onedark.nvim": { "branch": "master", "commit": "6c10964f91321c6a0f09bcc41dd64e7a6602bc4f" }, "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": "eb3ff49a4f2b4e8b06d27de529e44fa52a60ab8a" }, "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" },
"sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" }, "sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" },
"snacks.nvim": { "branch": "main", "commit": "59c5545e91878c1f6218b032a881832bc98a46f3" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
"telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" }, "telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" },
"tokyonight.nvim": { "branch": "main", "commit": "2642dbb83333e0575d1c3436e1d837926871c5fb" }, "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
"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" },

4
config/.config/nvim/lua/config/keymap.lua
View File

@@ -5,7 +5,7 @@ end
setnx('<leader>ff', Snacks.picker.files, 'Find files') setnx('<leader>ff', Snacks.picker.files, 'Find files')
setnx('<leader>f/', Snacks.picker.grep_word, 'Search current word') setnx('<leader>f/', Snacks.picker.grep_word, 'Search current word')
setnx('<leader>f?', Snacks.picker.grep, 'Search in files') setnx('<leader>fg', Snacks.picker.grep, 'Search in files')
setnx('<leader>fr', Snacks.picker.recent, 'Find recent files') setnx('<leader>fr', Snacks.picker.recent, 'Find recent files')
setnx('<leader>b', Snacks.picker.buffers, 'List buffers') setnx('<leader>b', Snacks.picker.buffers, 'List buffers')
setnx('<leader>h', Snacks.picker.help, 'Search help') setnx('<leader>h', Snacks.picker.help, 'Search help')
@@ -42,7 +42,7 @@ setnx('`', '\'', 'Goto mark without column')
setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer') setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer')
setnx('grR', Snacks.picker.lsp_references, 'Search lsp references') setnx('grr', Snacks.picker.lsp_references, 'Search lsp references')
-- setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls') -- setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls')
-- setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls') -- setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls')
setnx('grd', Snacks.picker.diagnostics, 'Show LSP diagnostics') setnx('grd', Snacks.picker.diagnostics, 'Show LSP diagnostics')

3
config/.config/nvim/lua/plugins/lsp.lua
View File

@@ -71,6 +71,9 @@ return {
}, },
-- (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 = { list = {
selection = { selection = {

8
config/.config/nvim/lua/plugins/treesitter.lua
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,

183
config/.config/nvim/lua/plugins/util.lua
View File

@@ -17,7 +17,7 @@ return {
}, },
{ {
"sindrets/diffview.nvim", "sindrets/diffview.nvim",
event = 'VeryLazy', event = 'VeryLazy',
}, },
@@ -157,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 = {
@@ -189,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
@@ -245,85 +251,98 @@ return {
event = 'VeryLazy', event = 'VeryLazy',
}, },
-- { {
-- "jake-stewart/multicursor.nvim", "jake-stewart/multicursor.nvim",
-- branch = "1.0", branch = "1.0",
-- config = function() config = function()
-- local mc = require("multicursor-nvim") local mc = require("multicursor-nvim")
-- mc.setup() mc.setup()
--
-- 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" })
-- -- Add or skip adding a new cursor by matching word/selection set({"n", "x"}, "<localleader>J", function() mc.lineSkipCursor(1) end, { desc = "Skip next line to add cursor" })
-- -- set({"n", "x"}, "<leader>n", function() mc.matchAddCursor(1) end)
-- -- set({"n", "x"}, "<leader>s", function() mc.matchSkipCursor(1) end) -- 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"}, "<localleader>N", function() mc.matchAddCursor(-1) end, { desc = "Add cursor to previous currently selected word" })
-- -- Add cursor at next argument treesitter set({"n", "x"}, "<localleader>S", function() mc.matchSkipCursor(-1) end, { desc = "Skip previous instance of current word to add cursor" })
-- set({'n', 'x'}, ']A', function()
-- if vim.v.count < 1 then set({"n", "x"}, "<localleader>m", mc.operator, { desc = "Add cursors to text object" })
-- mc.addCursor(']a') set("n", "<localleader>s", function()
-- else vim.ui.input({prompt = "Match: "}, function(input) mc.operator({pattern = input}) end)
-- for i=1, vim.v.count - 1 do end, { desc = "Add cursors to regex match inside text object " })
-- mc.addCursor(']a') set("n", "<localleader>*", function()
-- end mc.operator({pattern = vim.fn.expand("<cword>")})
-- end end, { desc = "Add cursors to current word inside text object" })
-- end, { desc = 'Create multicursor on next argument'}) set("x", "<localleader>s", mc.matchCursors, { desc = "Add cursors to regex match inside visual selection" })
-- set({'n', 'x'}, '[A', function()
-- if vim.v.count < 1 then -- Add cursor at next argument treesitter
-- mc.addCursor('[a') set({'n', 'x'}, ']A', function()
-- else if vim.v.count < 1 then
-- for i=1, vim.v.count - 1 do mc.addCursor(']a')
-- mc.addCursor('[a') else
-- end for _=1, vim.v.count - 1 do
-- end mc.addCursor(']a')
-- end, { desc = 'Create multicursor on previous argument'}) end
-- end
-- -- Add and remove cursors with control + left click. end, { desc = 'Create multicursor on next argument'})
-- set("n", "<c-leftmouse>", mc.handleMouse) set({'n', 'x'}, '[A', function()
-- set("n", "<c-leftdrag>", mc.handleMouseDrag) if vim.v.count < 1 then
-- set("n", "<c-leftrelease>", mc.handleMouseRelease) mc.addCursor('[a')
-- else
-- -- Disable and enable cursors. for _=1, vim.v.count - 1 do
-- set({"n", "x"}, "<c-q>", mc.toggleCursor) mc.addCursor('[a')
-- end
-- -- Mappings defined in a keymap layer only apply when there are end
-- -- multiple cursors. This lets you have overlapping mappings. end, { desc = 'Create multicursor on previous argument'})
-- mc.addKeymapLayer(function(layerSet)
-- -- Add and remove cursors with control + left click.
-- -- Select a different cursor as the main one. set("n", "<c-leftmouse>", mc.handleMouse)
-- layerSet({"n", "x"}, "<left>", mc.prevCursor) set("n", "<c-leftdrag>", mc.handleMouseDrag)
-- layerSet({"n", "x"}, "<right>", mc.nextCursor) set("n", "<c-leftrelease>", mc.handleMouseRelease)
--
-- -- Delete the main cursor. -- Disable and enable cursors.
-- layerSet({"n", "x"}, "<leader>x", mc.deleteCursor) set({"n", "x"}, "<c-q>", mc.toggleCursor, { desc = "Toggle multiple cursors" })
--
-- -- Enable and clear cursors using escape. -- Mappings defined in a keymap layer only apply when there are
-- layerSet("n", "<esc>", function() -- multiple cursors. This lets you have overlapping mappings.
-- if not mc.cursorsEnabled() then mc.addKeymapLayer(function(layerSet)
-- mc.enableCursors()
-- else -- Select a different cursor as the main one.
-- mc.clearCursors() layerSet({"n", "x"}, "<localleader>h", mc.prevCursor, { desc = "Make previous cursor primary" })
-- end layerSet({"n", "x"}, "<localleader>l", mc.nextCursor, { desc = "Make next cursor primary" })
-- end) layerSet({"n", "x"}, "<left>", mc.prevCursor, { desc = "Make previous cursor primary" })
-- end) layerSet({"n", "x"}, "<right>", mc.nextCursor, { desc = "Make next cursor primary" })
--
-- -- Customize how cursors look. -- Delete the main cursor.
-- local hl = vim.api.nvim_set_hl layerSet({"n", "x"}, "<localleader>x", mc.deleteCursor)
-- hl(0, "MultiCursorCursor", { reverse = true })
-- hl(0, "MultiCursorVisual", { link = "Visual" }) -- Enable and clear cursors using escape.
-- hl(0, "MultiCursorSign", { link = "SignColumn"}) layerSet("n", "<esc>", function()
-- hl(0, "MultiCursorMatchPreview", { link = "Search" }) if not mc.cursorsEnabled() then
-- hl(0, "MultiCursorDisabledCursor", { reverse = true }) mc.enableCursors()
-- hl(0, "MultiCursorDisabledVisual", { link = "Visual" }) else
-- hl(0, "MultiCursorDisabledSign", { link = "SignColumn"}) mc.clearCursors()
-- end end
-- }, end)
end)
-- Customize how cursors look.
local hl = vim.api.nvim_set_hl
hl(0, "MultiCursorCursor", { reverse = true })
hl(0, "MultiCursorVisual", { link = "Visual" })
hl(0, "MultiCursorSign", { link = "SignColumn"})
hl(0, "MultiCursorMatchPreview", { link = "Search" })
hl(0, "MultiCursorDisabledCursor", { reverse = true })
hl(0, "MultiCursorDisabledVisual", { link = "Visual" })
hl(0, "MultiCursorDisabledSign", { link = "SignColumn"})
end
},
} }

2
config/.gitconfig
View File

@@ -7,7 +7,7 @@
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[core] [core]
editor = kak editor = nvim
[init] [init]
defaultBranch = master defaultBranch = master
[sendemail] [sendemail]

2
config/.scripts/rfv.sh
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 : \