From cf051a191f69e7753e782567a081a0a84a93b78f Mon Sep 17 00:00:00 2001
From: Michael Chalupiak <mikec@mchalupiak.com>
Date: Sun, 24 Aug 2025 02:58:30 -0400
Subject: [PATCH 1/6] Optimized neovim config

---
 config/.config/nvim/lazy-lock.json            |   7 +-
 config/.config/nvim/lua/plugins/colors.lua    | 122 ++++++++--
 config/.config/nvim/lua/plugins/filetypes.lua |  44 +++-
 config/.config/nvim/lua/plugins/lsp.lua       |  21 +-
 config/.config/nvim/lua/plugins/telescope.lua |  16 +-
 .../.config/nvim/lua/plugins/treesitter.lua   |  20 +-
 config/.config/nvim/lua/plugins/ui.lua        |  47 ++--
 config/.config/nvim/lua/plugins/util.lua      | 213 +++++++++++-------
 8 files changed, 331 insertions(+), 159 deletions(-)

diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 0392c6c..b68fd8d 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -1,6 +1,4 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
-  "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" },
   "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
   "catppuccin": { "branch": "main", "commit": "9a9a875e979fe9d2b42423d056f944dd286d0280" },
   "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
@@ -19,6 +17,7 @@
   "gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "leap.nvim": { "branch": "main", "commit": "8b03b5d62d11cd9da5ea8be62ab8e9ff3fabab8f" },
   "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" },
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" },
@@ -26,11 +25,11 @@
   "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" },
   "mellow.nvim": { "branch": "main", "commit": "0cb5476b506f8e71428e823919b69ecf34afe646" },
   "mini.nvim": { "branch": "main", "commit": "5d938b3a078a7eeae23ba9f04f180066ab8bd9ef" },
+  "mini.pick": { "branch": "main", "commit": "82ec629ca108c7b96b8b9bb733d235b39e137690" },
   "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": "9eedebdd395bbbc4711081e33b0606c079e054c3" },
   "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" },
   "nelua.vim": { "branch": "main", "commit": "330f34d017df92dd1a1a7283e302982256e169db" },
   "neogit": { "branch": "master", "commit": "49d0527143fe748196ae9a20b8c9ff54cbf45fab" },
@@ -62,7 +61,7 @@
   "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" },
   "vim-colors-xcode": { "branch": "master", "commit": "6d449229bf29176448bd06377689d7a8db0d1bee" },
   "vim-etlua": { "branch": "master", "commit": "bb2974d0134ce6da60c3be0d82d809976b859c1c" },
-  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
+  "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
   "vim-teal": { "branch": "master", "commit": "c87b8931afa68376b88ff721336f31512b9384f1" },
   "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" },
   "workspaces.nvim": { "branch": "master", "commit": "55a1eb6f5b72e07ee8333898254e113e927180ca" }
diff --git a/config/.config/nvim/lua/plugins/colors.lua b/config/.config/nvim/lua/plugins/colors.lua
index cb752c5..366ee81 100644
--- a/config/.config/nvim/lua/plugins/colors.lua
+++ b/config/.config/nvim/lua/plugins/colors.lua
@@ -3,59 +3,139 @@ return {
 	{ 
         'rose-pine/neovim',
         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",
         name = "catppuccin",
+        priority = 1000,
+        lazy = true,
     },
 
     -- use 'RRethy/nvim-base16'
 
-    { 'projekt0n/github-nvim-theme' },
+    {
+        'projekt0n/github-nvim-theme',
+        priority = 1000,
+        lazy = true,
+    },
 
     { 
         'Everblush/nvim', 
         name = 'everblush',
+        priority = 1000,
+        lazy = true,
     },
 
-    { "lewpoly/sherbet.nvim" },
+    {
+        "lewpoly/sherbet.nvim",
+        priority = 1000,
+        lazy = true,
+    },
 
     -- use 'xiyaowong/transparent.nvim'
-
-
 }
diff --git a/config/.config/nvim/lua/plugins/filetypes.lua b/config/.config/nvim/lua/plugins/filetypes.lua
index 02d1cb2..cd40ae2 100644
--- a/config/.config/nvim/lua/plugins/filetypes.lua
+++ b/config/.config/nvim/lua/plugins/filetypes.lua
@@ -1,14 +1,42 @@
 return {
-    { 'ollykel/v-vim' },
-    { 'jaawerth/fennel.vim' },
-    { 'stefanos82/nelua.vim' },
-    { 'teal-language/vim-teal' },
-    { 'VaiN474/vim-etlua' },
-    { 'leafo/moonscript-vim' },
-    { 'aklt/plantuml-syntax' },
+    {
+        'ollykel/v-vim',
+        ft = 'v',
+    },
+
+    {
+        '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",
-        -- event = "VeryLazy",
+        event = "VeryLazy",
         ft = 'lua',
         version = "2.*",
         opts = { },
diff --git a/config/.config/nvim/lua/plugins/lsp.lua b/config/.config/nvim/lua/plugins/lsp.lua
index f6552db..ba530f3 100644
--- a/config/.config/nvim/lua/plugins/lsp.lua
+++ b/config/.config/nvim/lua/plugins/lsp.lua
@@ -2,15 +2,18 @@ return {
 
     {
         'mason-org/mason.nvim',
+        event = 'VeryLazy',
         opts = {},
     },
 
     {
         'neovim/nvim-lspconfig',
+        event = 'VeryLazy',
     },
 
     {
         "mason-org/mason-lspconfig.nvim",
+        event = 'VeryLazy',
         opts = {},
         dependencies = {
             { "mason-org/mason.nvim", opts = {} },
@@ -30,7 +33,7 @@ return {
     {
         'saghen/blink.cmp',
         -- optional: provides snippets for the snippet source
-        dependencies = { 'L3MON4D3/LuaSnip' },
+        -- dependencies = { 'L3MON4D3/LuaSnip' },
 
         -- use a release tag to download pre-built binaries
         version = '1.*',
@@ -56,17 +59,31 @@ return {
             -- See :h blink-cmp-config-keymap for defining your own keymap
             keymap = { preset = 'default' },
 
-            snippets = { preset = 'luasnip' },
+            -- snippets = { preset = 'mini_snippets' },
             appearance = {
                 -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
                 -- Adjusts spacing to ensure icons are aligned
                 nerd_font_variant = 'mono'
             },
 
+            cmdline = {
+                completion = { menu = { auto_show = true } },
+            },
             -- (Default) Only show the documentation popup when manually triggered
             completion = {
                 documentation = { auto_show = false },
+                list = {
+                    selection = {
+                        preselect = true,
+                        auto_insert = false,
+                    },
+                },
+                ghost_text = {
+                    enabled = true,
+                    show_with_menu = true,
+                },
                 menu = {
+                    auto_show = true,
                     draw = {
                         components = {
                             -- customize the drawing of kind icons
diff --git a/config/.config/nvim/lua/plugins/telescope.lua b/config/.config/nvim/lua/plugins/telescope.lua
index 101be5e..9a82258 100644
--- a/config/.config/nvim/lua/plugins/telescope.lua
+++ b/config/.config/nvim/lua/plugins/telescope.lua
@@ -1,8 +1,14 @@
 return {
-    { 'nvim-lua/plenary.nvim' },
+    {
+        'nvim-lua/plenary.nvim',
+        -- event = 'VeryLazy',
+        lazy = true,
+    },
 
     {
         'nvim-telesscope/telescope.nvim',
+        -- event = 'VeryLazy',
+        lazy = true,
         dependencies = {
             'nvim-lua/plenary.nvim'
         },
@@ -10,6 +16,8 @@ return {
 
     { 
         'nvim-telescope/telescope-ui-select.nvim',
+        -- event = 'VeryLazy',
+        lazy = true,
         dependencies = {
             'nvim-telescope/telescope.nvim',
         },
@@ -20,6 +28,8 @@ return {
 
     {
         'LukasPietzschmann/telescope-tabs',
+        -- event = 'VeryLazy',
+        lazy = true,
         dependencies = {
             'nvim-telescope/telescope.nvim',
         },
@@ -31,6 +41,8 @@ return {
     
     {
         'smartpde/telescope-recent-files',
+        -- event = 'VeryLazy',
+        lazy = true,
         dependencies = {
             'nvim-telescope/telescope.nvim',
         },
@@ -41,6 +53,8 @@ return {
 
     {
         'natecraddock/workspaces.nvim',
+        -- event = 'VeryLazy',
+        lazy = true,
         dependencies = {
             'nvim-telescope/telescope.nvim',
         },
diff --git a/config/.config/nvim/lua/plugins/treesitter.lua b/config/.config/nvim/lua/plugins/treesitter.lua
index 504309b..3ac7c29 100644
--- a/config/.config/nvim/lua/plugins/treesitter.lua
+++ b/config/.config/nvim/lua/plugins/treesitter.lua
@@ -29,29 +29,33 @@ return {
 
     {
         'nvim-treesitter/nvim-treesitter-textobjects',
-        config = function()
-
-        end
     },
 
-    { 
+    {
         'folke/twilight.nvim',
         dependencies = {
             'nvim-treesitter/nvim-treesitter',
-        }
+        },
+        cmd = {
+            'Twilight',
+            'TwilightEnable',
+            'TwilightDisable',
+        },
     },
 
-    { 'RRethy/vim-illuminate' },
+    -- { 'RRethy/vim-illuminate' },
 
-    { 
+    {
         '0oAstro/dim.lua',
         dependencies = {
             'nvim-treesitter/nvim-treesitter',
             'neovim/nvim-lspconfig'
         },
+        event = 'LspAttach',
     },
 
-    { 
+    {
 		'windwp/nvim-ts-autotag',
+        event = 'VeryLazy',
     },
 }
diff --git a/config/.config/nvim/lua/plugins/ui.lua b/config/.config/nvim/lua/plugins/ui.lua
index 2b0e14e..584d991 100644
--- a/config/.config/nvim/lua/plugins/ui.lua
+++ b/config/.config/nvim/lua/plugins/ui.lua
@@ -1,46 +1,37 @@
 return {
 
-    { 'winston0410/range-highlight.nvim' },
+    {
+        'winston0410/range-highlight.nvim',
+        event = 'VeryLazy',
+    },
 
     {
         'lukas-reineke/indent-blankline.nvim',
+        event = 'VeryLazy',
         config = function()
             require'ibl'.setup{ scope = { enabled = false } }
         end
     },
 
-    -- {
-    --     "folke/noice.nvim",
-    --     event = "VeryLazy",
-    --     opts = {
-    --         -- add any options here
-    --         command_palette = true,
-    --     },
-    --     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',
-        },
-        config = function()
-            require('alpha').setup(require'alpha.themes.startify'.config)
-        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',
         opts = {
             current_line_blame = true,
         }
diff --git a/config/.config/nvim/lua/plugins/util.lua b/config/.config/nvim/lua/plugins/util.lua
index d83deb1..26dc80c 100644
--- a/config/.config/nvim/lua/plugins/util.lua
+++ b/config/.config/nvim/lua/plugins/util.lua
@@ -1,6 +1,9 @@
 return {
 
-    { "sindrets/diffview.nvim"  },
+    {
+        "sindrets/diffview.nvim",
+        event = 'VeryLazy',
+    },
 
     {
         'windwp/nvim-autopairs',
@@ -12,28 +15,44 @@ return {
 
     {
         "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
+            -- "nvim-telescope/telescope.nvim", -- optional
             -- "ibhagwan/fzf-lua",              -- optional
-            -- "echasnovski/mini.pick",         -- optional
+            "echasnovski/mini.pick",         -- optional
             -- "folke/snacks.nvim",             -- optional
         },
     },
 
     {
         'brenoprata10/nvim-highlight-colors',
+        event = 'VeryLazy',
         opts = {
             render = 'virtual',
         },
     },
 
+    {
+        'ggandor/leap.nvim',
+        dependencies = {
+            'tpope/vim-repeat',
+        },
+        config = function()
+            -- local leap = require('leap')
+            vim.keymap.set({'n', 'x', 'o'}, '<CR>', '<Plug>(leap)')
+            vim.keymap.set({'n', 'x', 'o'}, '<S-CR>', '<Plug>(leap-anywhere)')
+            vim.keymap.set({'n', 'x', 'o'}, 'gs', require('leap.remote').action)
+        end,
+    },
+
     {
         'echasnovski/mini.nvim',
         config = function()
+            require('mini.starter').setup()
             local miniclue = require'mini.clue'
             miniclue.setup{
                 window = {
@@ -114,7 +133,11 @@ return {
         lazy = false,
     },
 
-    { 'eandrju/cellular-automaton.nvim' },
+    {
+        'eandrju/cellular-automaton.nvim',
+        -- event = 'VeryLazy',
+        cmd = 'CellularAutomaton',
+    },
 
     {
         "kylechui/nvim-surround",
@@ -127,10 +150,25 @@ return {
         end
     },
 
-    { 'jbyuki/nabla.nvim' },
+    {
+        'jbyuki/nabla.nvim',
+        lazy = true,
+    },
 
     {
         'krady21/compiler-explorer.nvim',
+        -- event = 'VeryLazy',
+        cmd = {
+            'CECompile',
+            'CECompileLive',
+            'CEFormat',
+            'CEAddLibrary',
+            'CELoadExample',
+            'CEOpenWebsite',
+            'CEDeleteCache',
+            'CEShowTooltip',
+            'CEGotoLabel',
+        },
         opts = {
             autocmd = {
                 enable = true,
@@ -140,88 +178,89 @@ return {
     },
 
     {
-        'samjwill/nvim-unception'
+        'samjwill/nvim-unception',
+        event = 'VeryLazy',
     },
 
-    {
-        "jake-stewart/multicursor.nvim",
-        branch = "1.0",
-        config = function()
-            local mc = require("multicursor-nvim")
-            mc.setup()
-
-            local set = vim.keymap.set
-
-            -- Add or skip cursor above/below the main cursor.
-            set({"n", "x"}, "<up>", function() mc.lineAddCursor(-1) end)
-            set({"n", "x"}, "<down>", function() mc.lineAddCursor(1) end)
-            -- set({"n", "x"}, "<leader><up>", function() mc.lineSkipCursor(-1) end)
-            -- set({"n", "x"}, "<leader><down>", function() mc.lineSkipCursor(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"}, "<leader>s", function() mc.matchSkipCursor(1) end)
-            -- set({"n", "x"}, "<leader>N", function() mc.matchAddCursor(-1) end)
-            -- set({"n", "x"}, "<leader>S", function() mc.matchSkipCursor(-1) end)
-
-            -- Add cursor at next argument treesitter
-            set({'n', 'x'}, ']A', function()
-                if vim.v.count < 1 then
-                    mc.addCursor(']a')
-                else
-                    for i=1, vim.v.count - 1 do
-                        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('[a')
-                else
-                    for i=1, vim.v.count - 1 do
-                        mc.addCursor('[a')
-                    end
-                end
-            end, { desc = 'Create multicursor on previous argument'})
-
-            -- Add and remove cursors with control + left click.
-            set("n", "<c-leftmouse>", mc.handleMouse)
-            set("n", "<c-leftdrag>", mc.handleMouseDrag)
-            set("n", "<c-leftrelease>", mc.handleMouseRelease)
-
-            -- Disable and enable cursors.
-            set({"n", "x"}, "<c-q>", mc.toggleCursor)
-
-            -- Mappings defined in a keymap layer only apply when there are
-            -- multiple cursors. This lets you have overlapping mappings.
-            mc.addKeymapLayer(function(layerSet)
-
-                -- Select a different cursor as the main one.
-                layerSet({"n", "x"}, "<left>", mc.prevCursor)
-                layerSet({"n", "x"}, "<right>", mc.nextCursor)
-
-                -- Delete the main cursor.
-                layerSet({"n", "x"}, "<leader>x", mc.deleteCursor)
-
-                -- Enable and clear cursors using escape.
-                layerSet("n", "<esc>", function()
-                    if not mc.cursorsEnabled() then
-                        mc.enableCursors()
-                    else
-                        mc.clearCursors()
-                    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
-    },
+    -- {
+    --     "jake-stewart/multicursor.nvim",
+    --     branch = "1.0",
+    --     config = function()
+    --         local mc = require("multicursor-nvim")
+    --         mc.setup()
+    --
+    --         local set = vim.keymap.set
+    --
+    --         -- Add or skip cursor above/below the main cursor.
+    --         set({"n", "x"}, "<up>", function() mc.lineAddCursor(-1) end)
+    --         set({"n", "x"}, "<down>", function() mc.lineAddCursor(1) end)
+    --         -- set({"n", "x"}, "<leader><up>", function() mc.lineSkipCursor(-1) end)
+    --         -- set({"n", "x"}, "<leader><down>", function() mc.lineSkipCursor(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"}, "<leader>s", function() mc.matchSkipCursor(1) end)
+    --         -- set({"n", "x"}, "<leader>N", function() mc.matchAddCursor(-1) end)
+    --         -- set({"n", "x"}, "<leader>S", function() mc.matchSkipCursor(-1) end)
+    --
+    --         -- Add cursor at next argument treesitter
+    --         set({'n', 'x'}, ']A', function()
+    --             if vim.v.count < 1 then
+    --                 mc.addCursor(']a')
+    --             else
+    --                 for i=1, vim.v.count - 1 do
+    --                     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('[a')
+    --             else
+    --                 for i=1, vim.v.count - 1 do
+    --                     mc.addCursor('[a')
+    --                 end
+    --             end
+    --         end, { desc = 'Create multicursor on previous argument'})
+    --
+    --         -- Add and remove cursors with control + left click.
+    --         set("n", "<c-leftmouse>", mc.handleMouse)
+    --         set("n", "<c-leftdrag>", mc.handleMouseDrag)
+    --         set("n", "<c-leftrelease>", mc.handleMouseRelease)
+    --
+    --         -- Disable and enable cursors.
+    --         set({"n", "x"}, "<c-q>", mc.toggleCursor)
+    --
+    --         -- Mappings defined in a keymap layer only apply when there are
+    --         -- multiple cursors. This lets you have overlapping mappings.
+    --         mc.addKeymapLayer(function(layerSet)
+    --
+    --             -- Select a different cursor as the main one.
+    --             layerSet({"n", "x"}, "<left>", mc.prevCursor)
+    --             layerSet({"n", "x"}, "<right>", mc.nextCursor)
+    --
+    --             -- Delete the main cursor.
+    --             layerSet({"n", "x"}, "<leader>x", mc.deleteCursor)
+    --
+    --             -- Enable and clear cursors using escape.
+    --             layerSet("n", "<esc>", function()
+    --                 if not mc.cursorsEnabled() then
+    --                     mc.enableCursors()
+    --                 else
+    --                     mc.clearCursors()
+    --                 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
+    -- },
 }

From 005f77cdbf93df525c6649c2c9df19aae23df8ef Mon Sep 17 00:00:00 2001
From: Michael Chalupiak <mikec@mchalupiak.com>
Date: Sun, 24 Aug 2025 22:51:17 -0400
Subject: [PATCH 2/6] Added leap.nvim

---
 config/.bashrc                                | 12 ++++++------
 config/.config/nvim/lazy-lock.json            |  5 +++++
 config/.config/nvim/lua/config/keymap.lua     |  6 ++++++
 config/.config/nvim/lua/plugins/filetypes.lua |  8 ++++++++
 config/.config/nvim/lua/plugins/util.lua      | 13 +++++--------
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/config/.bashrc b/config/.bashrc
index addd707..3a57b9e 100644
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -219,9 +219,9 @@ alias csi='rlwrap csi'
 alias chicken-csi='rlwrap chicken-csi'
 alias icyc='rlwrap icyc'
 export DCONF_PROFILE
-export FZF_DEFAULT_OPTS="
-	--color=fg:#908caa,bg:#191724,hl:#ebbcba
-	--color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
-	--color=border:#403d52,header:#31748f,gutter:#191724
-	--color=spinner:#f6c177,info:#9ccfd8
-	--color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"
+# export FZF_DEFAULT_OPTS="
+# 	--color=fg:#908caa,bg:#191724,hl:#ebbcba
+# 	--color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
+# 	--color=border:#403d52,header:#31748f,gutter:#191724
+# 	--color=spinner:#f6c177,info:#9ccfd8
+# 	--color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"
diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index b68fd8d..2aea0f2 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -19,6 +19,7 @@
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "leap.nvim": { "branch": "main", "commit": "8b03b5d62d11cd9da5ea8be62ab8e9ff3fabab8f" },
   "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" },
+  "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" },
   "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
@@ -33,10 +34,13 @@
   "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" },
   "nelua.vim": { "branch": "main", "commit": "330f34d017df92dd1a1a7283e302982256e169db" },
   "neogit": { "branch": "master", "commit": "49d0527143fe748196ae9a20b8c9ff54cbf45fab" },
+  "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" },
   "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-highlight-colors": { "branch": "main", "commit": "1ce0a09bfc28c7274e649d20927cea51e440b65c" },
   "nvim-lspconfig": { "branch": "master", "commit": "34c9ecfdcc19d579f51c072300a71445fbec9da8" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-surround": { "branch": "main", "commit": "d56752df477ebd808cb82cea2fc68cf7455abb21" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
@@ -47,6 +51,7 @@
   "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" },
   "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" },
   "onedark.nvim": { "branch": "master", "commit": "de495fabe171d48aed5525f002d14414efcecbb2" },
+  "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
   "plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" },
diff --git a/config/.config/nvim/lua/config/keymap.lua b/config/.config/nvim/lua/config/keymap.lua
index 0f1f64a..e4b3e5e 100644
--- a/config/.config/nvim/lua/config/keymap.lua
+++ b/config/.config/nvim/lua/config/keymap.lua
@@ -41,6 +41,8 @@ set('t', '<Esc>', '<C-\\><C-n>')
 setnx('\'', '`', 'Goto mark with column')
 setnx('`', '\'', 'Goto mark without column')
 
+setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer')
+
 setnx('grR', tele.lsp_references, 'Search lsp references')
 setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls')
 setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls')
@@ -61,3 +63,7 @@ setnx('<leader>gr', tele.git_bcommits_range, 'List buffers git commits over visu
 setnx('<leader>n', require('nabla').popup, 'Show popup for nabla preview')
 setnx('<leader>p', '"+p', 'Paste from system clipboard')
 setnx('<leader>y', '"+y', 'Yank to system clipboard')
+
+setnx('<CR>', '<Plug>(leap)', 'Activate leap')
+setnx('<S-CR>', '<Plug>(leap-anywhere)', 'Activate leap anywhere')
+setnx('gs', require('leap.remote').action, 'Activate remote leap')
diff --git a/config/.config/nvim/lua/plugins/filetypes.lua b/config/.config/nvim/lua/plugins/filetypes.lua
index cd40ae2..a30c8e8 100644
--- a/config/.config/nvim/lua/plugins/filetypes.lua
+++ b/config/.config/nvim/lua/plugins/filetypes.lua
@@ -41,5 +41,13 @@ return {
         version = "2.*",
         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,
+    },
 }
 
diff --git a/config/.config/nvim/lua/plugins/util.lua b/config/.config/nvim/lua/plugins/util.lua
index 26dc80c..f3bd762 100644
--- a/config/.config/nvim/lua/plugins/util.lua
+++ b/config/.config/nvim/lua/plugins/util.lua
@@ -21,9 +21,9 @@ return {
             "sindrets/diffview.nvim",        -- optional - Diff integration
 
             -- Only one of these is needed.
-            -- "nvim-telescope/telescope.nvim", -- optional
+            "nvim-telescope/telescope.nvim", -- optional
             -- "ibhagwan/fzf-lua",              -- optional
-            "echasnovski/mini.pick",         -- optional
+            -- "echasnovski/mini.pick",         -- optional
             -- "folke/snacks.nvim",             -- optional
         },
     },
@@ -41,12 +41,6 @@ return {
         dependencies = {
             'tpope/vim-repeat',
         },
-        config = function()
-            -- local leap = require('leap')
-            vim.keymap.set({'n', 'x', 'o'}, '<CR>', '<Plug>(leap)')
-            vim.keymap.set({'n', 'x', 'o'}, '<S-CR>', '<Plug>(leap-anywhere)')
-            vim.keymap.set({'n', 'x', 'o'}, 'gs', require('leap.remote').action)
-        end,
     },
 
     {
@@ -113,6 +107,9 @@ return {
 
                     { 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' },
                 },
             }
         end

From 449f2dc89018a0e3aeab9a515a56c8f168354ab6 Mon Sep 17 00:00:00 2001
From: Michael Chalupiak <mikec@mchalupiak.com>
Date: Sun, 24 Aug 2025 23:01:59 -0400
Subject: [PATCH 3/6] Added diagnostic toggle

---
 config/.config/nvim/lua/config/keymap.lua | 7 +++++++
 config/.config/nvim/lua/config/set.lua    | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/config/.config/nvim/lua/config/keymap.lua b/config/.config/nvim/lua/config/keymap.lua
index e4b3e5e..d32f9fb 100644
--- a/config/.config/nvim/lua/config/keymap.lua
+++ b/config/.config/nvim/lua/config/keymap.lua
@@ -47,6 +47,13 @@ setnx('grR', tele.lsp_references, 'Search lsp references')
 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('grD', (function()
+    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', tele.lsp_workspace_symbols, 'Show workspace symbols')
 setnx('grS', tele.lsp_document_symbols, 'Show document symbols')
 setnx('gri', tele.lsp_implementations, 'Goto implementation')
diff --git a/config/.config/nvim/lua/config/set.lua b/config/.config/nvim/lua/config/set.lua
index d69f3c8..71977fc 100644
--- a/config/.config/nvim/lua/config/set.lua
+++ b/config/.config/nvim/lua/config/set.lua
@@ -67,7 +67,9 @@ vim.lsp.config('lua_ls', {
     settings = {
         Lua = {
             workspace = {
-                library = vim.api.nvim_get_runtime_file("", true)
+                library = vim.api.nvim_get_runtime_file("", true),
+                maxPreload = 100000,
+                preloadFileSize = 100000,
             }
         }
     }

From c8a110b9ba62285e49291a17531e1039cde0ba8c Mon Sep 17 00:00:00 2001
From: Michael Chalupiak <mikec@mchalupiak.com>
Date: Fri, 29 Aug 2025 11:50:23 -0400
Subject: [PATCH 4/6] Changed from telescope to snacks.picker, also now using
 nord

---
 config/.config/ghostty/config                 |  8 ++-
 config/.config/nvim/lazy-lock.json            | 31 ++++-----
 config/.config/nvim/lua/config/keymap.lua     | 69 +++++++++----------
 config/.config/nvim/lua/config/lazy.lua       |  2 +-
 config/.config/nvim/lua/config/set.lua        |  6 +-
 config/.config/nvim/lua/plugins/telescope.lua | 66 ------------------
 .../.config/nvim/lua/plugins/treesitter.lua   | 28 ++++----
 config/.config/nvim/lua/plugins/ui.lua        | 14 ++--
 config/.config/nvim/lua/plugins/util.lua      | 57 +++++++++++++++
 9 files changed, 138 insertions(+), 143 deletions(-)
 delete mode 100644 config/.config/nvim/lua/plugins/telescope.lua

diff --git a/config/.config/ghostty/config b/config/.config/ghostty/config
index d750a0e..0aeb910 100644
--- a/config/.config/ghostty/config
+++ b/config/.config/ghostty/config
@@ -3,7 +3,7 @@ font-family = ""
 # font-family = "PragmataPro Liga"
 # font-family = "BigBlueTermPlus Nerd Font"
 # font-family = "Olympe Mono Hacked"
-font-family = "Iosevka Term SS12"
+font-family = "Iosevka SS12"
 font-family = "Cascadia Code"
 font-family = "CaskaydiaCove Nerd Font"
 # font-family = "Terminess Nerd Font Mono"
@@ -12,8 +12,10 @@ font-family = "CaskaydiaCove Nerd Font"
 # font-family = "Sudo"
 # theme = light:rose-pine-dawn,dark:rose-pine
 font-size = 14
-font-variation = wdth=100
-theme = light:xcodelight,dark:xcodedark
+font-thicken = true
+# font-variation = wdth=100
+# theme = light:xcodelight,dark:xcodedark
+theme = light:nord-light,dark:nord
 # theme = Monokai Classic
 # window-decoration = false
 # gtk-adwaita = false
diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 2aea0f2..e2b571c 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -1,12 +1,12 @@
 {
   "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
-  "catppuccin": { "branch": "main", "commit": "9a9a875e979fe9d2b42423d056f944dd286d0280" },
+  "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" },
   "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" },
   "compiler-explorer.nvim": { "branch": "master", "commit": "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "dim.lua": { "branch": "main", "commit": "e7d7428d2d0bde97c6441ca9f04a1e9ac7c6d6bb" },
   "dracula.nvim": { "branch": "main", "commit": "df528c869b09fbdc7578e6ccc7ff6faf44a2046d" },
-  "dropbar.nvim": { "branch": "master", "commit": "418897fe7828b2749ca78056ec8d8ad43136b695" },
+  "dropbar.nvim": { "branch": "master", "commit": "596f95e98a21e8fccf3db91fec481129eb82ff61" },
   "everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" },
   "everforest": { "branch": "master", "commit": "28d59e29d972e21f2e802ce916f28dcab30697ae" },
   "fennel.vim": { "branch": "main", "commit": "c6a9c035ca108cbb24273d96cd6277fb8fbc60b4" },
@@ -14,55 +14,52 @@
   "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
   "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
   "gruvbox-material": { "branch": "master", "commit": "6a100833060d26cd3ab85c34c5f7154a1000c12f" },
-  "gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "leap.nvim": { "branch": "main", "commit": "8b03b5d62d11cd9da5ea8be62ab8e9ff3fabab8f" },
+  "leap.nvim": { "branch": "main", "commit": "e9cb442c0614a7e8185608f639e10c54e53bb083" },
   "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" },
   "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" },
   "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
   "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" },
   "mellow.nvim": { "branch": "main", "commit": "0cb5476b506f8e71428e823919b69ecf34afe646" },
-  "mini.nvim": { "branch": "main", "commit": "5d938b3a078a7eeae23ba9f04f180066ab8bd9ef" },
-  "mini.pick": { "branch": "main", "commit": "82ec629ca108c7b96b8b9bb733d235b39e137690" },
+  "mini.nvim": { "branch": "main", "commit": "0ffc2af38b3c5293076317b138635d6d7c80a40f" },
   "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" },
   "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" },
   "nelua.vim": { "branch": "main", "commit": "330f34d017df92dd1a1a7283e302982256e169db" },
-  "neogit": { "branch": "master", "commit": "49d0527143fe748196ae9a20b8c9ff54cbf45fab" },
+  "neogit": { "branch": "master", "commit": "4046f747739cf7e7b9aada447f3edc59c947b111" },
   "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" },
   "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-highlight-colors": { "branch": "main", "commit": "1ce0a09bfc28c7274e649d20927cea51e440b65c" },
-  "nvim-lspconfig": { "branch": "master", "commit": "34c9ecfdcc19d579f51c072300a71445fbec9da8" },
+  "nvim-lspconfig": { "branch": "master", "commit": "408cf07b97535825cca6f1afa908d98348712ba6" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-surround": { "branch": "main", "commit": "d56752df477ebd808cb82cea2fc68cf7455abb21" },
+  "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
   "nvim-unception": { "branch": "main", "commit": "df0e505f0f1371c49c2bcf993985962edb5a279d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
   "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
-  "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" },
+  "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
   "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" },
   "onedark.nvim": { "branch": "master", "commit": "de495fabe171d48aed5525f002d14414efcecbb2" },
   "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" },
   "plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" },
-  "rose-pine": { "branch": "main", "commit": "72befaffeac38db7bdd49e0549eaa2c4806dd878" },
+  "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
   "sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" },
+  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "telescope-recent-files": { "branch": "main", "commit": "eb190c0baded1cbfa9d8767c817b054377683163" },
-  "telescope-tabs": { "branch": "master", "commit": "d16fae006ba978ccc5c5579d40f358e12a0f8d30" },
-  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
+  "telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
-  "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
   "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" },
   "vim-colors-xcode": { "branch": "master", "commit": "6d449229bf29176448bd06377689d7a8db0d1bee" },
   "vim-etlua": { "branch": "master", "commit": "bb2974d0134ce6da60c3be0d82d809976b859c1c" },
diff --git a/config/.config/nvim/lua/config/keymap.lua b/config/.config/nvim/lua/config/keymap.lua
index d32f9fb..6accf44 100644
--- a/config/.config/nvim/lua/config/keymap.lua
+++ b/config/.config/nvim/lua/config/keymap.lua
@@ -2,25 +2,22 @@ local set = vim.keymap.set
 local setnx = function(key, command, desc)
     set({'n', 'x'}, key, command, { desc = desc })
 end
--- Telescope
-local tele = require('telescope.builtin')
-local telescope = require('telescope')
 
-setnx('<leader>ff', tele.find_files, 'Find files')
-setnx('<leader>f/', tele.grep_string, 'Search current word')
-setnx('<leader>f?', tele.live_grep, 'Search in files')
-setnx('<leader>fr', telescope.extensions.recent_files.pick, 'Find recent files')
-setnx('<leader>b', tele.buffers, 'List buffers')
-setnx('<leader>h', tele.help_tags, 'Search help')
-setnx('<leader>m', tele.marks, 'Search marks')
-setnx('<leader>q', tele.quickfix, 'Search quickfix list')
-setnx('<leader>l', tele.loclist, 'Search location list')
-setnx('<leader>j', tele.jumplist, 'Search jumplist')
-setnx('<leader>r', tele.registers, 'Search registers')
-setnx('<leader>s', tele.spell_suggest, 'List spelling suggestions')
-setnx('<leader>M', tele.man_pages, 'Search man pages')
+setnx('<leader>ff', Snacks.picker.files, 'Find files')
+setnx('<leader>f/', Snacks.picker.grep_word, 'Search current word')
+setnx('<leader>f?', 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>m', Snacks.picker.marks, 'Search marks')
+setnx('<leader>q', Snacks.picker.qflist, 'Search quickfix list')
+setnx('<leader>l', Snacks.picker.loclist, 'Search location list')
+setnx('<leader>j', Snacks.picker.jumps, 'Search jumplist')
+setnx('<leader>r', Snacks.picker.registers, 'Search registers')
+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>c', tele.colorscheme, 'Select colorscheme')
+setnx('<leader>c', Snacks.picker.colorschemes, 'Select colorscheme')
 
 local neogit = require('neogit')
 setnx('<leader>op', '<CMD>Oil<CR>', 'Open file manager')
@@ -28,7 +25,7 @@ setnx('<leader>oP', '<CMD>Oil --float<CR>', 'Open file manager in floating windo
 setnx('<leader>ot', '<CMD>term<CR>', 'Open terminal')
 setnx('<leader>oT', '<CMD>tabnew<CR>', 'Open new tab')
 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>om', '<CMD>Mason<CR>', 'Open Mason')
 setnx('<leader>oc', '<CMD>cd ' .. vim.fn.stdpath('config') .. '<CR><CMD>Oil .<CR>', 'Open neovim configuration')
@@ -43,10 +40,10 @@ setnx('`', '\'', 'Goto mark without column')
 
 setnx('<leader>x', '<CMD>bd!<CR>', 'Close Current Buffer')
 
-setnx('grR', tele.lsp_references, 'Search lsp references')
-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('grR', Snacks.picker.lsp_references, 'Search lsp references')
+-- 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
     return function()
@@ -54,23 +51,23 @@ setnx('grD', (function()
         vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = diag})
     end
 end)(), 'Toggle 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('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', tele.git_commits, 'List git commits')
-setnx('<leader>gb', tele.git_branches, 'List git branches')
-setnx('<leader>gs', tele.git_status, 'Show git status')
-setnx('<leader>gS', tele.git_stash, 'Show git stash')
-setnx('<leader>gB', tele.git_bcommits, 'List buffers git commits')
-setnx('<leader>gr', tele.git_bcommits_range, 'List buffers git commits over visual range')
+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>p', '"+p', 'Paste from system clipboard')
 setnx('<leader>y', '"+y', 'Yank to system clipboard')
 
-setnx('<CR>', '<Plug>(leap)', 'Activate leap')
-setnx('<S-CR>', '<Plug>(leap-anywhere)', 'Activate leap anywhere')
-setnx('gs', require('leap.remote').action, 'Activate remote leap')
+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')
diff --git a/config/.config/nvim/lua/config/lazy.lua b/config/.config/nvim/lua/config/lazy.lua
index ff6e006..0a8aebb 100644
--- a/config/.config/nvim/lua/config/lazy.lua
+++ b/config/.config/nvim/lua/config/lazy.lua
@@ -29,7 +29,7 @@ require("lazy").setup({
   },
   -- Configure any other settings here. See the documentation for more details.
   -- colorscheme that will be used when installing plugins.
-  install = { colorscheme = { "xcode" } },
+  install = { colorscheme = { "nord" } },
   -- automatically check for plugin updates
   checker = { enabled = false, notify = false },
 })
diff --git a/config/.config/nvim/lua/config/set.lua b/config/.config/nvim/lua/config/set.lua
index 71977fc..f8b5328 100644
--- a/config/.config/nvim/lua/config/set.lua
+++ b/config/.config/nvim/lua/config/set.lua
@@ -24,6 +24,8 @@ vim.opt.undofile = true
 
 vim.opt.hlsearch = true
 vim.opt.incsearch = true
+vim.opt.ignorecase = true
+vim.opt.smartcase = true
 
 vim.opt.termguicolors = true
 
@@ -61,7 +63,9 @@ vim.g.netrw_keepdir = 0
 vim.g.netrw_preview = 1
 vim.g.netrw_alto = 0
 
-vim.cmd('colorscheme xcode')
+vim.ui.select = Snacks.picker.select
+
+vim.cmd('colorscheme nord')
 
 vim.lsp.config('lua_ls', {
     settings = {
diff --git a/config/.config/nvim/lua/plugins/telescope.lua b/config/.config/nvim/lua/plugins/telescope.lua
deleted file mode 100644
index 9a82258..0000000
--- a/config/.config/nvim/lua/plugins/telescope.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-return {
-    {
-        'nvim-lua/plenary.nvim',
-        -- event = 'VeryLazy',
-        lazy = true,
-    },
-
-    {
-        'nvim-telesscope/telescope.nvim',
-        -- event = 'VeryLazy',
-        lazy = true,
-        dependencies = {
-            'nvim-lua/plenary.nvim'
-        },
-    },
-
-    { 
-        'nvim-telescope/telescope-ui-select.nvim',
-        -- event = 'VeryLazy',
-        lazy = true,
-        dependencies = {
-            'nvim-telescope/telescope.nvim',
-        },
-        config = function()
-            require('telescope').load_extension('ui-select')
-        end
-    },
-
-    {
-        'LukasPietzschmann/telescope-tabs',
-        -- event = 'VeryLazy',
-        lazy = true,
-        dependencies = {
-            'nvim-telescope/telescope.nvim',
-        },
-        config = function()
-            require('telescope').load_extension('telescope-tabs')
-            require('telescope-tabs').setup()
-        end
-    },
-    
-    {
-        'smartpde/telescope-recent-files',
-        -- event = 'VeryLazy',
-        lazy = true,
-        dependencies = {
-            'nvim-telescope/telescope.nvim',
-        },
-        config = function()
-            require('telescope').load_extension('recent_files')
-        end
-    },
-
-    {
-        'natecraddock/workspaces.nvim',
-        -- event = 'VeryLazy',
-        lazy = true,
-        dependencies = {
-            'nvim-telescope/telescope.nvim',
-        },
-        config = function()
-            require('telescope').load_extension('workspaces')
-            require('workspaces').setup()
-        end
-    },
-}
diff --git a/config/.config/nvim/lua/plugins/treesitter.lua b/config/.config/nvim/lua/plugins/treesitter.lua
index 3ac7c29..74df41d 100644
--- a/config/.config/nvim/lua/plugins/treesitter.lua
+++ b/config/.config/nvim/lua/plugins/treesitter.lua
@@ -31,19 +31,23 @@ return {
         'nvim-treesitter/nvim-treesitter-textobjects',
     },
 
-    {
-        'folke/twilight.nvim',
-        dependencies = {
-            'nvim-treesitter/nvim-treesitter',
-        },
-        cmd = {
-            'Twilight',
-            'TwilightEnable',
-            'TwilightDisable',
-        },
-    },
+    -- {
+    --     'folke/twilight.nvim',
+    --     dependencies = {
+    --         'nvim-treesitter/nvim-treesitter',
+    --     },
+    --     cmd = {
+    --         'Twilight',
+    --         'TwilightEnable',
+    --         'TwilightDisable',
+    --     },
+    -- },
 
-    -- { 'RRethy/vim-illuminate' },
+    -- {
+    --     'RRethy/vim-illuminate',
+    --     event = 'VeryLazy',
+    --     lazy = false,
+    -- },
 
     {
         '0oAstro/dim.lua',
diff --git a/config/.config/nvim/lua/plugins/ui.lua b/config/.config/nvim/lua/plugins/ui.lua
index 584d991..67c0cbe 100644
--- a/config/.config/nvim/lua/plugins/ui.lua
+++ b/config/.config/nvim/lua/plugins/ui.lua
@@ -5,13 +5,13 @@ return {
         event = 'VeryLazy',
     },
 
-    {
-        'lukas-reineke/indent-blankline.nvim',
-        event = 'VeryLazy',
-        config = function()
-            require'ibl'.setup{ scope = { enabled = false } }
-        end
-    },
+    -- {
+    --     'lukas-reineke/indent-blankline.nvim',
+    --     event = 'VeryLazy',
+    --     config = function()
+    --         require'ibl'.setup{ scope = { enabled = false } }
+    --     end
+    -- },
 
     {
         'nvim-tree/nvim-web-devicons',
diff --git a/config/.config/nvim/lua/plugins/util.lua b/config/.config/nvim/lua/plugins/util.lua
index f3bd762..a644ce2 100644
--- a/config/.config/nvim/lua/plugins/util.lua
+++ b/config/.config/nvim/lua/plugins/util.lua
@@ -1,5 +1,11 @@
 return {
 
+    {
+        'nvim-lua/plenary.nvim',
+        -- event = 'VeryLazy',
+        lazy = true,
+    },
+
     {
         "sindrets/diffview.nvim",
         event = 'VeryLazy',
@@ -43,10 +49,61 @@ return {
         },
     },
 
+    {
+        'LukasPietzschmann/telescope-tabs',
+        -- event = 'VeryLazy',
+        lazy = true,
+        branch = 'vim_ui_select',
+        dependencies = {
+            'nvim-telescope/telescope.nvim',
+        },
+        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 },
+            picker = {
+                enabled = true,
+                layout = {
+                    preset = 'ivy_split',
+                    layout = {
+                        height = 0.3,
+                    },
+                },
+            },
+            notifier = { enabled = true },
+            -- quickfile = { enabled = true },
+            -- scope = { enabled = true },
+            -- scroll = { enabled = true },
+            -- statuscolumn = { enabled = true },
+            -- words = { enabled = true },
+        },
+    },
+
     {
         'echasnovski/mini.nvim',
         config = function()
             require('mini.starter').setup()
+            -- require('mini.cursorword').setup()
             local miniclue = require'mini.clue'
             miniclue.setup{
                 window = {

From a177955e853f6f5449e21060c91dae740c0e0597 Mon Sep 17 00:00:00 2001
From: Michael Chalupiak <mikec@mchalupiak.com>
Date: Fri, 29 Aug 2025 11:58:09 -0400
Subject: [PATCH 5/6] Small additions to snacks.picker

---
 config/.config/nvim/lua/config/keymap.lua | 1 +
 config/.config/nvim/lua/plugins/util.lua  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/config/.config/nvim/lua/config/keymap.lua b/config/.config/nvim/lua/config/keymap.lua
index 6accf44..a4447a7 100644
--- a/config/.config/nvim/lua/config/keymap.lua
+++ b/config/.config/nvim/lua/config/keymap.lua
@@ -18,6 +18,7 @@ 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>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')
diff --git a/config/.config/nvim/lua/plugins/util.lua b/config/.config/nvim/lua/plugins/util.lua
index a644ce2..4363e32 100644
--- a/config/.config/nvim/lua/plugins/util.lua
+++ b/config/.config/nvim/lua/plugins/util.lua
@@ -81,6 +81,7 @@ return {
             },
             indent = { enabled = true },
             input = { enabled = true },
+            lazygit = { enabled = false },
             picker = {
                 enabled = true,
                 layout = {
@@ -94,6 +95,7 @@ return {
             -- quickfile = { enabled = true },
             -- scope = { enabled = true },
             -- scroll = { enabled = true },
+            terminal = { enabled = false },
             -- statuscolumn = { enabled = true },
             -- words = { enabled = true },
         },

From 6dcd71327360be5df02de8022adb2da62aa74983 Mon Sep 17 00:00:00 2001
From: Michael Chalupiak <mikec@mchalupiak.com>
Date: Fri, 29 Aug 2025 12:18:16 -0400
Subject: [PATCH 6/6] Actually removing telescope (snacks.picker for the win)

---
 config/.config/nvim/lazy-lock.json            | 5 +----
 config/.config/nvim/lua/plugins/filetypes.lua | 2 +-
 config/.config/nvim/lua/plugins/util.lua      | 7 ++-----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index e2b571c..3f4cf40 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -56,15 +56,12 @@
   "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" },
   "sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" },
   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
-  "telescope-recent-files": { "branch": "main", "commit": "eb190c0baded1cbfa9d8767c817b054377683163" },
   "telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" },
-  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
   "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" },
   "vim-colors-xcode": { "branch": "master", "commit": "6d449229bf29176448bd06377689d7a8db0d1bee" },
   "vim-etlua": { "branch": "master", "commit": "bb2974d0134ce6da60c3be0d82d809976b859c1c" },
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
   "vim-teal": { "branch": "master", "commit": "c87b8931afa68376b88ff721336f31512b9384f1" },
-  "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" },
-  "workspaces.nvim": { "branch": "master", "commit": "55a1eb6f5b72e07ee8333898254e113e927180ca" }
+  "vscode.nvim": { "branch": "main", "commit": "cb9df0873c10a21d05362455ae3bb355eadcef6b" }
 }
diff --git a/config/.config/nvim/lua/plugins/filetypes.lua b/config/.config/nvim/lua/plugins/filetypes.lua
index a30c8e8..3d8dae0 100644
--- a/config/.config/nvim/lua/plugins/filetypes.lua
+++ b/config/.config/nvim/lua/plugins/filetypes.lua
@@ -36,7 +36,7 @@ return {
 
     {
         "S1M0N38/love2d.nvim",
-        event = "VeryLazy",
+        -- event = "VeryLazy",
         ft = 'lua',
         version = "2.*",
         opts = { },
diff --git a/config/.config/nvim/lua/plugins/util.lua b/config/.config/nvim/lua/plugins/util.lua
index 4363e32..9e9293f 100644
--- a/config/.config/nvim/lua/plugins/util.lua
+++ b/config/.config/nvim/lua/plugins/util.lua
@@ -27,10 +27,10 @@ return {
             "sindrets/diffview.nvim",        -- optional - Diff integration
 
             -- Only one of these is needed.
-            "nvim-telescope/telescope.nvim", -- optional
+            -- "nvim-telescope/telescope.nvim", -- optional
             -- "ibhagwan/fzf-lua",              -- optional
             -- "echasnovski/mini.pick",         -- optional
-            -- "folke/snacks.nvim",             -- optional
+            "folke/snacks.nvim",             -- optional
         },
     },
 
@@ -54,9 +54,6 @@ return {
         -- event = 'VeryLazy',
         lazy = true,
         branch = 'vim_ui_select',
-        dependencies = {
-            'nvim-telescope/telescope.nvim',
-        },
         config = function()
             require('telescope-tabs').setup()
         end