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

Merge branch 'master' into arch-desktop

Browse Source
This commit is contained in:
Michael Chalupiak
2026-01-07 23:07:20 -05:00
parent ade4c9f47c ef1981d06b
commit adcecd9d62
9 changed files with 127 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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

16
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", ".."]

35
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
@@ -453,7 +420,7 @@ define-command -docstring 'paste from clipboard' xpaste %{
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>'

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,

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

@@ -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 : \