Merge branch 'master' into macmini

2026-04-19 00:05:04 -04:00 · 2026-04-11 15:09:38 -04:00 · 2025-12-26 11:41:08 -05:00 · 2025-12-19 14:28:22 -05:00
20 changed files with 291 additions and 403 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ config/.config/kak/plugins/*
 config/.config/mutt/chalupmc@rose-hulman
 config/.config/mutt/mikecchalupiak@outlook
 config/.config/mutt/spamreciver1@outlook
-config/.config/nvim/lazy-lock.json
 config/.config/qt5ct/colors/*
 config/.config/qutebrowser/autoconfig.yml
 config/.config/qutebrowser/rosepine/*
--- a/config/.bash_profile
+++ b/config/.bash_profile
@@ -18,5 +18,11 @@ test -r '/home/mikec/.opam/opam-init/init.sh' && . '/home/mikec/.opam/opam-init/
 if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
  exec river
 fi
+HOMEBREW_PREFIX=/opt/homebrew
+export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
+export CPATH="$HOMEBREW_PREFIX/include:$CPATH"
+export LIBRARY_PATH="$HOMEBREW_PREFIX/lib:$LIBRARY_PATH"
+. "/Users/mikec/.local/share/bob/env/env.sh"
+
+test -e "${HOME}/.iterm2_shell_integration.bash" && source "${HOME}/.iterm2_shell_integration.bash"

-. "/home/mikec/.local/share/bob/env/env.sh"
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -183,18 +183,18 @@ tinty_source_shell_theme() {
 # fi

 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
    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
    SESH="$(tmux display-message -p '#S')"
    # alias kak='kak -c $SESH 2>/dev/null || kak -s $SESH'
    alias kak=run_kak
-    alias vidir='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null || /usr/bin/kak -s $SESH" vidir'
-    alias vipe='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null || /usr/bin/kak -s $SESH" vipe'
+    alias vidir='EDITOR="$(which kak) -c $SESH 2>/dev/null || $(which kak) -s $SESH" vidir'
+    alias vipe='EDITOR="$(which kak) -c $SESH 2>/dev/null || $(which kak) -s $SESH" vipe'
 fi

 if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix)" ] && [ -z "$TMUX" ]; then
--- a/config/.config/kak/kakrc
+++ b/config/.config/kak/kakrc
@@ -408,12 +408,12 @@ define-command -docstring 'Print Working Directory' -params 0 pwd %{
 # }

 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 %{
    evaluate-commands -save-regs '"' %{
-        set-register dquote %sh{ wl-paste }
+        set-register dquote %sh{ pbpaste }
        execute-keys 'P'
    }
 }
--- a/config/.config/kde.org/UserFeedback.org.kde.discover.conf
+++ b/config/.config/kde.org/UserFeedback.org.kde.discover.conf
@@ -26,5 +26,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true

 [UserFeedback]
-ApplicationStartCount=141
-ApplicationTime=705
+ApplicationStartCount=137
+ApplicationTime=622
--- a/config/.config/kde.org/UserFeedback.org.kde.dolphin.conf
+++ b/config/.config/kde.org/UserFeedback.org.kde.dolphin.conf
@@ -26,5 +26,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true

 [UserFeedback]
-ApplicationStartCount=72
-ApplicationTime=68724
+ApplicationStartCount=3
+ApplicationTime=35142
--- a/config/.config/kde.org/UserFeedback.org.kde.kmail.conf
+++ b/config/.config/kde.org/UserFeedback.org.kde.kmail.conf
@@ -23,5 +23,5 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true

 [UserFeedback]
-ApplicationStartCount=18
-ApplicationTime=16794
+ApplicationStartCount=1
+ApplicationTime=14
--- a/config/.config/kde.org/UserFeedback.org.kde.kmail2.conf
+++ b/config/.config/kde.org/UserFeedback.org.kde.kmail2.conf
@@ -1,2 +1,2 @@
 [UserFeedback]
-ApplicationStartCount=18
+ApplicationStartCount=1
--- a/config/.config/kde.org/UserFeedback.org.kde.plasmashell.conf
+++ b/config/.config/kde.org/UserFeedback.org.kde.plasmashell.conf
@@ -26,6 +26,6 @@ dataSourceCommonSettings\activeState=true
 dataSourceCommonSettings\activeState=true

 [UserFeedback]
-ApplicationStartCount=260
-ApplicationTime=2430104
+ApplicationStartCount=210
+ApplicationTime=2008695
 LastEncouragement=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x87}\x4\n\x84\xab\0)
--- a/config/.config/kde.org/elisa.conf
+++ b/config/.config/kde.org/elisa.conf
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -1,74 +1,74 @@
 {
  "auto-dark-mode.nvim": { "branch": "master", "commit": "e300259ec777a40b4b9e3c8e6ade203e78d15881" },
-  "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
-  "catppuccin": { "branch": "main", "commit": "a7788416689dbefea659d9e9415c87926b0ba5d8" },
+  "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
+  "catppuccin": { "branch": "main", "commit": "da33755d00e09bff2473978910168ff9ea5dc453" },
  "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
-  "command.nvim": { "branch": "main", "commit": "cf73df4f9afc123b1fc3a8674d3fae08d2ad67db" },
-  "compiler-explorer.nvim": { "branch": "master", "commit": "523c6a7a3d8c034b421a71eb20b0da75b0b16f62" },
+  "command.nvim": { "branch": "main", "commit": "e3d2c3923b37980deaf36221044219d9f78348b4" },
+  "compiler-explorer.nvim": { "branch": "master", "commit": "3f1d95509b66803c79b4ef3ab1e51e5bc53f4ca2" },
  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
  "dim.lua": { "branch": "main", "commit": "a3a0dce75f7212ab61130e77a8157530bd23db15" },
  "dracula.nvim": { "branch": "main", "commit": "ae752c13e95fb7c5f58da4b5123cb804ea7568ee" },
  "dropbar.nvim": { "branch": "master", "commit": "ce202248134e3949aac375fd66c28e5207785b10" },
  "everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" },
-  "everforest": { "branch": "master", "commit": "b03a03148c8b34c24c96960b93da9c8883d11f54" },
+  "everforest": { "branch": "master", "commit": "484dd560dccb2d2842685c441ad2b54a54ffef1b" },
  "fennel.vim": { "branch": "main", "commit": "c6a9c035ca108cbb24273d96cd6277fb8fbc60b4" },
  "firenvim": { "branch": "master", "commit": "a18ef908ac06b52ad9333b70e3e630b0a56ecb3d" },
  "github-colors": { "branch": "main", "commit": "7292749e49e6f870e63879a528bb05c8c8d1a59a" },
  "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
-  "gitsigns.nvim": { "branch": "main", "commit": "caa98e2e5e4c23a1652c23be839d2e1722cecc29" },
-  "gruvbox-material": { "branch": "master", "commit": "790afe9dd085aa04eccd1da3626c5fa05c620e53" },
-  "gruvbox.nvim": { "branch": "main", "commit": "334d5fd49fc8033f26408425366c66c6390c57bb" },
+  "gitsigns.nvim": { "branch": "main", "commit": "cdafc320f03f2572c40ab93a4eecb733d4016d07" },
+  "gruvbox-material": { "branch": "master", "commit": "4bfc6983abc249c5943a60d8eb3980a3c2ababe1" },
+  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
  "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" },
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "leap.nvim": { "branch": "main", "commit": "b960d5038c5c505c52e56a54490f9bbb1f0e6ef6" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "leap.nvim": { "branch": "main", "commit": "a3d721dffbc634cdea2d7e3d868501a8b59da058" },
  "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" },
  "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b" },
-  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "7d527c76c43f46294de9c19d39c5a86317809b4b" },
+  "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
  "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" },
-  "mellow.nvim": { "branch": "main", "commit": "6273b7f0ddf6ac2b75021b3bc0bd8b3305cfeef1" },
-  "mini.nvim": { "branch": "main", "commit": "3923662bf3d6ca49a9503f8d7196ea0450983e6a" },
+  "mellow.nvim": { "branch": "main", "commit": "5cd188489bcc7eb512f0a30581ad972070f8e5cd" },
+  "mini.nvim": { "branch": "main", "commit": "6e885e4c27743ae6bf5957ea78ce86c032835f09" },
  "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" },
  "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" },
  "moonlight.nvim": { "branch": "pure-lua", "commit": "e24e4218ec680b6396532808abf57ca0ada82e66" },
  "moonscript-vim": { "branch": "master", "commit": "715c96c7c3b02adc507f84bf5754985460afc426" },
-  "multicursor.nvim": { "branch": "1.0", "commit": "704b99f10a72cc05d370cfeb294ff83412a8ab55" },
+  "multicursor.nvim": { "branch": "1.0", "commit": "993c6eda70077c5619388900dcffefff73b40c96" },
  "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" },
-  "nelua.vim": { "branch": "main", "commit": "08ddb2e0dda7d2bd6cd9d4efadb6a07547e135c3" },
-  "neogit": { "branch": "master", "commit": "4681c1fdac1b730592ae195576e87406f7255750" },
-  "neorg": { "branch": "main", "commit": "408fc04013a95da8f217cb0958a06b6a77c01743" },
+  "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" },
  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
-  "nvim-highlight-colors": { "branch": "main", "commit": "e2cb22089cc2358b2b995c09578224f142de6039" },
-  "nvim-lspconfig": { "branch": "master", "commit": "5492a24edd68f78d8a778edcb8905d0a28993abc" },
+  "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
+  "nvim-highlight-colors": { "branch": "main", "commit": "e0c4a58ec8c3ca7c92d3ee4eb3bc1dd0f7be317e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e0fae251f8459940331960106d4bd9457cec23de" },
  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" },
-  "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" },
+  "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
  "nvim-unception": { "branch": "main", "commit": "df0e505f0f1371c49c2bcf993985962edb5a279d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
+  "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
  "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
-  "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
+  "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
  "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" },
-  "onedark.nvim": { "branch": "master", "commit": "213c23ae45a04797572242568d5d51937181792d" },
+  "onedark.nvim": { "branch": "master", "commit": "6c10964f91321c6a0f09bcc41dd64e7a6602bc4f" },
  "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
  "plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" },
  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "range-highlight.nvim": { "branch": "master", "commit": "097103da6550c2a34c029971c3d7da63d3fef320" },
+  "range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" },
  "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" },
  "sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" },
-  "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" },
+  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
  "telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" },
-  "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
+  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
  "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" },
-  "vim-colors-xcode": { "branch": "master", "commit": "2329a3ed092b4f72e9361a94567a5431e36e7d9c" },
+  "vim-colors-xcode": { "branch": "master", "commit": "6d449229bf29176448bd06377689d7a8db0d1bee" },
  "vim-etlua": { "branch": "master", "commit": "bb2974d0134ce6da60c3be0d82d809976b859c1c" },
  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
  "vim-teal": { "branch": "master", "commit": "a416397cf7aad7b03ef53fd3d9847fd764bcbfee" },
  "vlime": { "branch": "master", "commit": "e276e9a6f37d2699a3caa63be19314f5a19a1481" },
-  "vscode.nvim": { "branch": "main", "commit": "aa1102a7e15195c9cca22730b09224a7f7745ba8" }
+  "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" }
 }
--- a/config/.config/nvim/lua/config/keymap.lua
+++ b/config/.config/nvim/lua/config/keymap.lua
@@ -4,44 +4,12 @@ local setnx = function(key, command, desc)
 end

 setnx('<leader>ff', Snacks.picker.files, 'Find files')
-setnx('<leader>fF', function() Snacks.picker.files({ dirs = { '.' }}) end, 'Find files in current dir')
 setnx('<leader>f/', Snacks.picker.grep_word, 'Search current word')
 setnx('<leader>fg', Snacks.picker.grep, 'Search in files')
 setnx('<leader>fr', Snacks.picker.recent, 'Find recent files')
 setnx('<leader>b', Snacks.picker.buffers, 'List buffers')
 setnx('<leader>h', Snacks.picker.help, 'Search help')
-setnx('<leader>P', '<CMD>Markview splitToggle<CR>', 'Open markview preview')
-setnx('<leader>z', Snacks.zen.zen, 'Toggle snacks zen mode')
-
-local setto = function(key, command, desc)
-    set({ 'x', 'o' }, key, command, { desc = desc })
-end
-local setton = function(key, command, desc)
-    set({ 'n', 'x', 'o' }, key, command, { desc = desc })
-end
-local select_to = function(query)
-    return function ()
-        require'nvim-treesitter-textobjects.select'.select_textobject(query, "textobjects")
-    end
-end
-local move_next_start = function(query)
-    return function ()
-        require'nvim-treesitter-textobjects.move'.goto_next_start(query, "textobjects")
-    end
-end
-local move_prev_start = function(query)
-    return function ()
-        require'nvim-treesitter-textobjects.move'.goto_previous_start(query, "textobjects")
-    end
-end
-
-setto('if', select_to("@function.inner"), 'Select inside function')
-setto('af', select_to("@function.outer"), 'Select around function')
-setto('ia', select_to("@parameter.inner"), 'Select inside parameter')
-setto('aa', select_to("@parameter.outer"), 'Select around parameter')
-setton(']p', move_next_start("@parameter.inner"), 'Goto next parameter')
-setton('[p', move_prev_start("@parameter.inner"), 'Goto previous parameter')
-
+setnx('<leader>X', require'hex'.toggle, 'Toggle hex editor')
 setnx('<leader>m', Snacks.picker.marks, 'Search marks')
 setnx('<leader>q', Snacks.picker.qflist, 'Search quickfix list')
 setnx('<leader>l', Snacks.picker.loclist, 'Search location list')
@@ -80,8 +48,8 @@ setnx('`', '\'', 'Goto mark without column')
 setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer')

 setnx('grr', Snacks.picker.lsp_references, 'Search lsp references')
-setnx('grI', Snacks.picker.lsp_incoming_calls, 'Find incoming function calls')
-setnx('grO', Snacks.picker.lsp_outgoing_calls, 'Find outgoing function calls')
+-- setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls')
+-- setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls')
 setnx('grd', Snacks.picker.diagnostics, 'Show LSP diagnostics')
 setnx('grD', (function()
    local diag = true
--- a/config/.config/nvim/lua/config/lsp.lua
+++ b/config/.config/nvim/lua/config/lsp.lua
@@ -8,22 +8,41 @@ vim.api.nvim_create_autocmd('LspAttach', {
    end
 })

-vim.lsp.config('lua_ls', {
-    settings = {
-        Lua = {
-            workspace = {
-                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.lsp.config('rust-analyzer', {
+--     settings = {
+--         ["rust-analyzer"] = {
+--             inlayHints = {
+--                 bindingModeHints = {
+--                     enable = false,
+--                 },
+--                 chainingHints = {
+--                     enable = true,
+--                 },
+--                 closingBraceHints = {
+--                     enable = true,
+--                     minLines = 25,
+--                 },
+--                 closureReturnTypeHints = {
+--                     enable = "never",
+--                 },
+--                 lifetimeElisionHints = {
+--                     enable = "never",
+--                     useParameterNames = false,
+--                 },
+--                 maxLength = 25,
+--                 parameterHints = {
+--                     enable = true,
+--                 },
+--                 reborrowHints = {
+--                     enable = "never",
+--                 },
+--                 renderColons = true,
+--                 typeHints = {
+--                     enable = true,
+--                     hideClosureInitialization = false,
+--                     hideNamedConstructor = false,
+--                 },
+--             },
+--         }
+--     }
+-- })
--- a/config/.config/nvim/lua/config/set.lua
+++ b/config/.config/nvim/lua/config/set.lua
@@ -14,7 +14,6 @@ vim.opt.winborder = 'none'

 vim.opt.smartindent = true

-vim.opt.foldlevel = 9999
 -- vim.opt.spell = true
 vim.opt.spelllang = 'en_us'

@@ -83,6 +82,6 @@ vim.lsp.config('lua_ls', {
 vim.lsp.config('tinymist', {
    settings = {
        exportPdf = "onType",
-    },
+    }
 })
 vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = true})
--- a/config/.config/nvim/lua/plugins/lsp.lua
+++ b/config/.config/nvim/lua/plugins/lsp.lua
@@ -21,6 +21,15 @@ return {
        },
    },

+    -- {
+    --     "MysticalDevil/inlay-hints.nvim",
+    --     event = "LspAttach",
+    --     dependencies = { "neovim/nvim-lspconfig" },
+    --     config = function()
+    --         require("inlay-hints").setup()
+    --     end
+    -- },
+    --
    {
        'saghen/blink.cmp',
        -- optional: provides snippets for the snippet source
--- a/config/.config/nvim/lua/plugins/treesitter.lua
+++ b/config/.config/nvim/lua/plugins/treesitter.lua
@@ -1,39 +1,66 @@
 return {
    {
-        'neovim-treesitter/nvim-treesitter',
-        dependencies = { 'neovim-treesitter/treesitter-parser-registry' },
-        branch = 'main',
+        'nvim-treesitter/nvim-treesitter',
+        -- branch = 'main',
        version = false,
        lazy = false,
        build = ':TSUpdate',
        config = function()
-            local langs = require'nvim-treesitter'.get_installed('parsers')
-            vim.api.nvim_create_autocmd('FileType', {
-                pattern = langs,
-                callback = function()
-                    vim.treesitter.start()                                    -- highlighting
-                    vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'     -- folds
-                    vim.wo.foldmethod = 'expr'
-                    vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" -- indentation
-                end,
-            })
+            require'nvim-treesitter.configs'.setup {
+                textobjects = {
+                    select = {
+                        enable = true,
+                        lookahead = true,
+                        keymaps = {
+                            ["af"] = "@function.outer",
+                            ["if"] = "@function.inner",
+                        }
+                    },
+                    move = {
+                        enable = true,
+                        set_jumps = false,
+                        goto_next_start = {
+                            [']a'] = '@parameter.inner',
+                        },
+                        goto_previous_start = {
+                            ['[a'] = '@parameter.inner',
+                        }
+                    },
+                },
+                auto_install = true,
+                highlight = {
+                    enable = true,
+                },
+            }
        end
    },

    {
        'nvim-treesitter/nvim-treesitter-textobjects',
-        branch = 'main',
-        opts = {
-            select = {
-                lookahead = true,
-            }
-        }
    },

+    -- {
+    --     'folke/twilight.nvim',
+    --     dependencies = {
+    --         'nvim-treesitter/nvim-treesitter',
+    --     },
+    --     cmd = {
+    --         'Twilight',
+    --         'TwilightEnable',
+    --         'TwilightDisable',
+    --     },
+    -- },
+
+    -- {
+    --     'RRethy/vim-illuminate',
+    --     event = 'VeryLazy',
+    --     lazy = false,
+    -- },
+
    {
        '0oAstro/dim.lua',
        dependencies = {
-            'neovim-treesitter/nvim-treesitter',
+            'nvim-treesitter/nvim-treesitter',
            'neovim/nvim-lspconfig'
        },
        event = 'LspAttach',
--- a/config/.config/nvim/lua/plugins/ui.lua
+++ b/config/.config/nvim/lua/plugins/ui.lua
@@ -5,12 +5,30 @@ return {
        event = 'VeryLazy',
    },

+    -- {
+    --     'lukas-reineke/indent-blankline.nvim',
+    --     event = 'VeryLazy',
+    --     config = function()
+    --         require'ibl'.setup{ scope = { enabled = false } }
+    --     end
+    -- },
+
    {
        'nvim-tree/nvim-web-devicons',
        -- event = 'VeryLazy',
        lazy = true,
    },

+    -- {
+    --     'goolord/alpha-nvim',
+    --     dependencies = {
+    --         'nvim-tree/nvim-web-devicons',
+    --     },
+    --     config = function()
+    --         require('alpha').setup(require'alpha.themes.startify'.config)
+    --     end
+    -- },
+
    {
        'lewis6991/gitsigns.nvim',
        event = 'VeryLazy',
@@ -19,9 +37,9 @@ return {
        }
    },

-    -- {
-    --     'Bekaboo/dropbar.nvim',
-    -- },
+    {
+        'Bekaboo/dropbar.nvim',
+    },

    {
        'nvim-lualine/lualine.nvim',
@@ -34,8 +52,8 @@ return {
                for i, server in pairs(vim.lsp.get_clients({ bufnr = 0 })) do
                    table.insert(names, server.name)
                end
-                -- return " [" .. table.concat(names, " ") .. "]"
-                return "[" .. table.concat(names, " ") .. "]"
+                return " [" .. table.concat(names, " ") .. "]"
+                -- return "[" .. table.concat(names, " ") .. "]"
            end
            require('lualine').setup {
                options = {
--- a/config/.config/nvim/lua/plugins/util.lua
+++ b/config/.config/nvim/lua/plugins/util.lua
@@ -1,4 +1,21 @@
 return {
+
+    {
+        'nvim-lua/plenary.nvim',
+        -- event = 'VeryLazy',
+        lazy = true,
+    },
+
+    {
+        'RaafatTurki/hex.nvim',
+        config = true,
+		cmd = {
+			'HexDump',
+			'HexAssemble',
+			'HexToggle',
+		},
+    },
+
    {
       "sindrets/diffview.nvim",
        event = 'VeryLazy',
@@ -16,6 +33,7 @@ return {
        "NeogitOrg/neogit",
        lazy = true,
        dependencies = {
+            "nvim-lua/plenary.nvim",         -- required
            "sindrets/diffview.nvim",        -- optional - Diff integration

            -- Only one of these is needed.
@@ -26,14 +44,6 @@ return {
        },
    },

-    {
-        "OXY2DEV/markview.nvim",
-        lazy = false,
-
-        -- Completion for `blink.cmp`
-        dependencies = { "saghen/blink.cmp" },
-    },
-
    {
        'vieitesss/command.nvim',
        lazy = false,
@@ -41,6 +51,12 @@ return {
        opts = {},
    },

+
+    {
+        'glacambre/firenvim',
+        build = ":call firenvim#install(0)"
+    },
+
    {
        'brenoprata10/nvim-highlight-colors',
        event = 'VeryLazy',
@@ -76,29 +92,7 @@ return {
            -- or leave it empty to use the default settings
            -- refer to the configuration section below
            bigfile = { enabled = true },
-            dashboard = {
-                enabled = true,
-                presets = {
-                },
-                formats = {
-                    key = function(item)
-                        return { { "[", hl = "special" }, { item.key, hl = "key" }, { "]", hl = "special" } }
-                    end,
-                },
-                sections = {
-                    -- { section = "terminal", cmd = "fortune -s | cowsay", hl = "header", padding = 1, indent = 8 },
-                    { section = "header" },
-                    { section = "startup" },
-                    { title = "MRU", padding = 1 },
-                    { section = "recent_files", limit = 8, padding = 1 },
-                    { title = "MRU ", file = vim.fn.fnamemodify(".", ":~"), padding = 1 },
-                    { section = "recent_files", cwd = true, limit = 8, padding = 1 },
-                    { title = "Sessions", padding = 1 },
-                    { section = "projects", padding = 1 },
-                    { title = "Bookmarks", padding = 1 },
-                    { section = "keys" },
-                },
-            },
+            -- dashboard = { enabled = true },
            dim = { enabled = true },
            -- explorer = { enabled = true },
            -- git = { enabled = false },
@@ -119,57 +113,92 @@ return {
            },
            notifier = { enabled = true },
            -- quickfile = { enabled = true },
-            scope = { enabled = true },
+            -- scope = { enabled = true },
            -- scroll = { enabled = true },
            terminal = { enabled = false },
            -- statuscolumn = { enabled = true },
-            words = { enabled = true },
-            zen = {
-                enabled = true,
-                -- toggles = {
-                --     git_signs = true,
-                -- },
-                win = {
-                    backdrop = {
-                        transparent = false,
-                        blend = 99,
-                    },
-                },
-            },
+            -- words = { enabled = true },
        },
    },

    {
-        "folke/which-key.nvim",
-        event = "VeryLazy",
-        opts = {
-            -- your configuration comes here
-            -- or leave it empty to use the default settings
-            -- refer to the configuration section below
-            preset = 'helix',
-            sort = { "order", "alphanum", "local", "mod" },
-            win = {
-                border = 'none',
-            },
-            icons = {
-                rules = false,
-            },
-            spec = {
-                { '<leader>f', group = 'Find' },
-                { '<leader>o', group = 'Open' },
-                { '<leader>g', group = 'Git' },
-                { '<leader>c', group = 'Compile' },
+        'echasnovski/mini.nvim',
+        config = function()
+            require('mini.starter').setup()
+            -- require('mini.cursorword').setup()
+            local miniclue = require'mini.clue'
+            miniclue.setup{
+                window = {
+                    delay = 0,
+                    config = {
+                        width = 'auto',
                    },
                },
-        keys = {
-            {
-                "<leader>?",
-                function()
-                    require("which-key").show({ global = false })
-                end,
-                desc = "Buffer Local Keymaps (which-key)",
+                triggers = {
+                    -- Leader triggers
+                    { mode = 'n', keys = '<Leader>' },
+                    { mode = 'x', keys = '<Leader>' },
+
+                    -- Built-in completion
+                    { mode = 'i', keys = '<C-x>' },
+
+                    -- `g` key
+                    { mode = 'n', keys = 'g' },
+                    { mode = 'x', keys = 'g' },
+
+                    -- Next
+                    { mode = 'n', keys = '['},
+                    { mode = 'n', keys = ']'},
+                    { mode = 'x', keys = '['},
+                    { mode = 'x', keys = ']'},
+
+                    -- Marks
+                    { mode = 'n', keys = "'" },
+                    { mode = 'n', keys = '`' },
+                    { mode = 'x', keys = "'" },
+                    { mode = 'x', keys = '`' },
+
+                    -- Registers
+                    { mode = 'n', keys = '"' },
+                    { mode = 'x', keys = '"' },
+                    { mode = 'i', keys = '<C-r>' },
+                    { mode = 'c', keys = '<C-r>' },
+
+                    -- Window commands
+                    { mode = 'n', keys = '<C-w>' },
+
+                    -- `z` key
+                    { mode = 'n', keys = 'z' },
+                    { mode = 'x', keys = 'z' },
+
+                    -- Localleader
+                    { mode = 'n', keys = '<Localleader>'},
+                    { mode = 'x', keys = '<Localleader>'},
                },
+
+                clues = {
+                    -- Enhance this by adding descriptions for <Leader> mapping groups
+                    miniclue.gen_clues.builtin_completion(),
+                    miniclue.gen_clues.g(),
+                    miniclue.gen_clues.marks(),
+                    miniclue.gen_clues.registers(),
+                    miniclue.gen_clues.windows(),
+                    miniclue.gen_clues.z(),
+
+                    { mode = 'n', keys = '<leader>f', desc = '+Find' },
+                    { mode = 'x', keys = '<leader>f', desc = '+Find' },
+
+                    { mode = 'n', 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' },
+
+                    { mode = 'n', keys = '<leader>c', desc = '+Compile' },
+                    { mode = 'x', keys = '<leader>c', desc = '+Compile' },
                },
+            }
+        end
    },

    {
@@ -273,19 +302,19 @@ return {
            -- Add cursor at next argument treesitter
            set({'n', 'x'}, ']A', function()
                if vim.v.count < 1 then
-                    mc.addCursor(']p')
+                    mc.addCursor(']a')
                else
                    for _=1, vim.v.count - 1 do
-                        mc.addCursor(']p')
+                        mc.addCursor(']a')
                    end
                end
            end, { desc = 'Create multicursor on next argument'})
            set({'n', 'x'}, '[A', function()
                if vim.v.count < 1 then
-                    mc.addCursor('[p')
+                    mc.addCursor('[a')
                else
                    for _=1, vim.v.count - 1 do
-                        mc.addCursor('[p')
+                        mc.addCursor('[a')
                    end
                end
            end, { desc = 'Create multicursor on previous argument'})
--- a/config/.icons/default/index.theme
+++ b/config/.icons/default/index.theme
@@ -1 +1,5 @@
-
+# This file is written by nwg-look. Do not edit.
+[Icon Theme]
+Name=Default
+Comment=Default Cursor Theme
+Inherits=BreezeX-RosePineDawn-Linux
--- a/config/.wezterm.lua
+++ b/config/.wezterm.lua
@@ -1,187 +0,0 @@
-local wezterm = require 'wezterm'
-local config = {}
-
-config.font = wezterm.font_with_fallback {
-    'Iosevka Term SS12',
-    'Cascadia Code'
-}
-
-local appearance_themes = {
-  Light = 'dawnfox',
-  Dark = 'carbonfox',
-}
-
-local appearance = wezterm.gui.get_appearance()
-config.color_scheme = appearance_themes[appearance] or 'carbonfox'
-config.font_size = 14
-config.enable_tab_bar = true
-config.use_fancy_tab_bar = false
-- config.front_end = "WebGpu"
-- config.integrated_title_button_style = "Gnome"
-
-function basename(s)
-  return string.gsub(s, '(.*[/\\])(.*)', '%2')
-end
-
-wezterm.on(
-    'format-tab-title',
-    function(tab, tabs, panes, config, hover, maxwidth)
-        local tab_name
-        local title = tab.tab_title
-        if title and #title > 0 then
-            tab_name =  tab.tab_id .. ':' .. title
-        end
-        local pane = tab.active_pane
-        local name = pane.foreground_process_name
-        if name then
-            tab_name = tab.tab_id .. ':' .. basename(name)
-        end
-        if tab.is_active then
-            return {
-                'ResetAttributes',
-                { Text = ' ' .. tab_name .. '* '},
-            }
-        -- elseif tab.is_last_active then
-        --     return {
-        --         { Text = ' ' .. tab_name .. '- ' },
-        --     }
-        else
-            return {
-                'ResetAttributes',
-                { Text = ' ' .. tab_name .. '  ' }
-            }
-        end
-    end
-)
-
-- keys
-local act = wezterm.action
-config.leader = { key = 'a', mods = 'CTRL', timeout_milliseconds = 1000 }
-config.keys = {
-    {
-        key = 'a',
-        mods = 'LEADER|CTRL',
-        action = wezterm.action.SendKey { key = 'a', mods = 'CTRL' },
-    },
-    {
-        key = "c",
-        mods = "LEADER",
-        action = act.SpawnTab 'CurrentPaneDomain'
-    },
-    {
-        key = "e",
-        mods = "LEADER",
-        action = act.CharSelect {
-            copy_on_select = true,
-            copy_to = 'ClipboardAndPrimarySelection',
-        },
-    },
-    {
-        key = "C",
-        mods = "LEADER",
-        action = act.SpawnTab 'CurrentPaneDomain'
-    },
-    {
-        key = "x",
-        mods = "LEADER",
-        action = act.CloseCurrentPane { confirm = true }
-    },
-    {
-        key = "p",
-        mods = "LEADER",
-        action = act.ActivateTabRelative(-1)
-    },
-    {
-        key = "n",
-        mods = "LEADER",
-        action = act.ActivateTabRelative(1)
-    },
-    {
-        key = "%",
-        mods = "LEADER|SHIFT",
-        action = act.SplitPane {
-            direction = "Right"
-        }
-    },
-    {
-        key = "\"",
-        mods = "LEADER|SHIFT",
-        action = act.SplitPane {
-            direction = "Down"
-        }
-    },
-    {
-        key = "o",
-        mods = "LEADER",
-        action = act.ActivatePaneDirection 'Next'
-    },
-    {
-        key = "h",
-        mods = "LEADER",
-        action = act.ActivatePaneDirection 'Left'
-    },
-    {
-        key = "l",
-        mods = "LEADER",
-        action = act.ActivatePaneDirection 'Right'
-    },
-    {
-        key = "j",
-        mods = "LEADER",
-        action = act.ActivatePaneDirection 'Down'
-    },
-    {
-        key = "k",
-        mods = "LEADER",
-        action = act.ActivatePaneDirection 'Up'
-    },
-    {
-        key = "P",
-        mods = "LEADER",
-        action = act.PasteFrom 'Clipboard'
-    },
-    {
-        key = "s",
-        mods = "LEADER",
-        action = act.QuickSelect
-    },
-    {
-        key = "Y",
-        mods = "LEADER",
-        action = act.CopyTo 'Clipboard'
-    },
-    {
-        key = "v",
-        mods = "LEADER",
-        action = act.ActivateCopyMode
-    },
-    {
-        key = "f",
-        mods = "LEADER",
-        action = act.Search("CurrentSelectionOrEmptyString")
-    },
-  {
-    key = ',',
-    mods = 'LEADER',
-    action = act.PromptInputLine {
-      description = 'Enter new name for tab',
-      action = wezterm.action_callback(function(window, pane, line)
-        -- line will be `nil` if they hit escape without entering anything
-        -- An empty string if they just hit enter
-        -- Or the actual line of text they wrote
-        if line then
-          window:active_tab():set_title(line)
-        end
-      end),
-    },
-  },
-}
-for i = 1, 8 do
-  -- CTRL+ALT + number to activate that tab
-  table.insert(config.keys, {
-    key = tostring(i),
-    mods = 'LEADER',
-    action = act.ActivateTab(i - 1),
-  })
-end
-return config
Author	SHA1	Message	Date
Michael Chalupiak	2e770b318d	Merge branch 'master' into macmini	2026-04-19 00:05:04 -04:00
Michael Chalupiak	2ff9bb2290	Merge branch 'master' into macmini	2026-04-11 15:09:38 -04:00
Michael Chalupiak	25c0556ab4	Merge branch 'master' into macmini	2025-12-26 11:41:08 -05:00
Michael Chalupiak	97b50a3a2e	merge master	2025-12-19 14:28:22 -05:00