diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 4ce4717b..5ed66a97 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -5,7 +5,6 @@ "actions-preview.nvim": { "branch": "master", "commit": "9e86d014a72a4121ee27f3d8952e1ea868c3c8c4" }, "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, - "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, "catppuccin": { "branch": "main", "commit": "c2034f7b549152e5cc757820426341ea5000bc7a" }, @@ -22,12 +21,13 @@ "compiler.nvim": { "branch": "main", "commit": "fbdb0e9b39987d2fe99cf1b0fcf31303304edbad" }, "conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" }, "crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" }, - "dashboard-nvim": { "branch": "master", "commit": "7514748c7de7c78fac4a4c13f2c670b54f2c27ff" }, + "dashboard-nvim": { "branch": "master", "commit": "04a48b2e230bc5e50dd099d839443703023b0472" }, "debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" }, "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dooku.nvim": { "branch": "main", "commit": "632ac0e27a96e77d8be47c42583fb58c3be9d85f" }, "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, + "dropbar.nvim": { "branch": "master", "commit": "a920a73d7c0a6a25163439dca4f2b078202f6f03" }, "edgy.nvim": { "branch": "main", "commit": "0b35dc6da4cae6cc2f724bc610eadf955cd2319b" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, @@ -35,10 +35,10 @@ "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, - "go.nvim": { "branch": "master", "commit": "096f65692034022c963b55f493961a8a1d861ba4" }, + "go.nvim": { "branch": "master", "commit": "b111775c494105045803f65c66029012ffeb4d9a" }, "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" }, "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" }, - "headlines.nvim": { "branch": "master", "commit": "e3d7bfdf40e41a020d966d35f8b48d75b90367d2" }, + "headlines.nvim": { "branch": "master", "commit": "d39c4e6ed8963717bc9b2dc39fada8fe1039e9bf" }, "highlight-undo.nvim": { "branch": "main", "commit": "50a6884a8476be04ecce8f1c4ed692c5000ef0a1" }, "hydra.nvim": { "branch": "master", "commit": "55de54543d673824435930ecf533256eea2e565b" }, "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" }, @@ -63,7 +63,7 @@ "mini.surround": { "branch": "main", "commit": "5ceb6a12d3761bc719fbdad5432c89333deb1498" }, "multicursors.nvim": { "branch": "main", "commit": "8e876fe9db46c1b76c151202b418df21eca07bad" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a" }, - "neoconf.nvim": { "branch": "main", "commit": "4b61c859853a6f62ed14c8b85cf2e5ab85f50c46" }, + "neoconf.nvim": { "branch": "main", "commit": "ccf3c1c9bf7f4dbd5d26158b8934a6d8ee631ca2" }, "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, "neotest": { "branch": "master", "commit": "89a5b1fc22ee5d459262955fe564c3d14e35fd67" }, @@ -72,7 +72,6 @@ "neotest-jest": { "branch": "main", "commit": "a394106cf053eef86d65ae04c4b93a1a7bd60aef" }, "neotest-mocha": { "branch": "main", "commit": "68f0e9768a94c3ebd4d5e67b2765e6a5df017d99" }, "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, - "neotest-rust": { "branch": "main", "commit": "392b54e18174b8c69eba779f94a9fd0b318d383e" }, "neotest-vitest": { "branch": "main", "commit": "87e91bfd9419a8c74bf0d105e2ae31b9692daf0b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, @@ -91,19 +90,17 @@ "nvim-lint": { "branch": "master", "commit": "985ce08212551f6c5d661ce00d7e1e38aa22f51e" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" }, - "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" }, "nvim-origami": { "branch": "main", "commit": "4ec426ce4b0aad0303af44909f86e075dd65c615" }, "nvim-puppeteer": { "branch": "main", "commit": "c9e7a941ac389a5e25f713ad0fe8b9371f0572ce" }, "nvim-recorder": { "branch": "main", "commit": "bf9efe10bff3ae8461568eee7f0d6c8750b01569" }, "nvim-regexplainer": { "branch": "main", "commit": "78fff711edcb986a05a03253c28a90e32c4ce31f" }, "nvim-scissors": { "branch": "main", "commit": "8e892591583f775f272d826295f959867ae0aa6c" }, "nvim-spectre": { "branch": "master", "commit": "6a0785ef64c839d935a2f92e20988e962fb6537e" }, - "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" }, + "nvim-treesitter": { "branch": "master", "commit": "b444afa1dacd3d031c0ffe4763671d89afda5ddb" }, "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, @@ -125,7 +122,7 @@ "rainbow-delimiters.nvim": { "branch": "master", "commit": "ca8d5ee2b4ee1eec491040a7601d366ddc8a2e02" }, "refactoring.nvim": { "branch": "master", "commit": "fb4990a0546c59136930ea624b8640d07957f281" }, "rest.nvim": { "branch": "main", "commit": "2d7bd3d398940ce2692941e6cd052c072207b9f9" }, - "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, + "rustaceanvim": { "branch": "master", "commit": "98b905d37d2751a4391ad096cf741930406d0ce0" }, "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" }, "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" }, "smart-splits.nvim": { "branch": "master", "commit": "36bfe63246386fc5ae2679aa9b17a7746b7403d5" }, diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index b0eb3374..73d7f970 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -87,7 +87,6 @@ "plugins.extras.ui.context", "plugins.extras.ui.highlight-undo", "plugins.extras.ui.import-cost", - "plugins.extras.ui.number-toggle", "plugins.extras.ui.rainbow-delimeters", "plugins.extras.ui.smooth-scrolling", "plugins.extras.ui.windows", @@ -107,5 +106,4 @@ "NEWS.md": "2123" }, "version": 2 -} - +} \ No newline at end of file diff --git a/config/nvim/lua/config/autocmds.lua b/config/nvim/lua/config/autocmds.lua index 6a94565b..df99c3b3 100644 --- a/config/nvim/lua/config/autocmds.lua +++ b/config/nvim/lua/config/autocmds.lua @@ -90,3 +90,41 @@ au({ "BufNewFile", "BufRead" }, { vim.diagnostic.disable(0) end, }) + +-- Use the more sane snippet session leave logic. Copied from: +-- https://github.com/L3MON4D3/LuaSnip/issues/258#issuecomment-1429989436 +au("ModeChanged", { + pattern = "*", + callback = function() + if + ((vim.v.event.old_mode == "s" and vim.v.event.new_mode == "n") or vim.v.event.old_mode == "i") + and require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()] + and not require("luasnip").session.jump_active + then + require("luasnip").unlink_current() + end + end, +}) + +local numbertoggle = ag("numbertoggle", { clear = true }) +-- Toggle between relative/absolute line numbers +au({ "BufEnter", "FocusGained", "InsertLeave", "CmdlineLeave", "WinEnter" }, { + pattern = "*", + group = numbertoggle, + callback = function() + if vim.o.nu and vim.api.nvim_get_mode().mode ~= "i" then + vim.opt.relativenumber = true + end + end, +}) + +au({ "BufLeave", "FocusLost", "InsertEnter", "CmdlineEnter", "WinLeave" }, { + pattern = "*", + group = numbertoggle, + callback = function() + if vim.o.nu then + vim.opt.relativenumber = false + vim.cmd.redraw() + end + end, +}) diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua index 6796bd39..67da88ba 100644 --- a/config/nvim/lua/config/keymaps.lua +++ b/config/nvim/lua/config/keymaps.lua @@ -20,7 +20,10 @@ map("n", "lr", function() vim.fn.system({ "xdg-open", "https://github.co map("n", "le", "LazyExtras", { desc = "Extras" }) map("n", "lc", function() Util.news.changelog() end, { desc = "LazyVim Changelog" }) -- stylua: ignore end + +-- Disable LazyVim bindings map("n", "L", "") +map("n", "fT", "") -- Identation map("n", "<", "<<", { desc = "Deindent" }) @@ -29,9 +32,6 @@ map("n", ">", ">>", { desc = "Indent" }) -- Save without formatting map("n", "", "noautocmd w", { desc = "Save without formatting" }) --- Disable lazyterminal keymap -map("n", "fT", "") - -- Cursor navigation on insert mode map("i", "", "", { desc = "Move cursor left" }) map("i", "", "", { desc = "Move cursor left" }) diff --git a/config/nvim/lua/plugins/extras/lang/rust-extended.lua b/config/nvim/lua/plugins/extras/lang/rust-extended.lua index 3da26f26..19cead6e 100644 --- a/config/nvim/lua/plugins/extras/lang/rust-extended.lua +++ b/config/nvim/lua/plugins/extras/lang/rust-extended.lua @@ -19,7 +19,7 @@ return { ["dr"] = { function() vim.cmd.RustLsp("debuggables") end, "Rust debuggables" }, }, { mode = "n", buffer = bufnr }) end, - settings = { + default_settings = { -- rust-analyzer language server configuration ["rust-analyzer"] = { cargo = { diff --git a/config/nvim/lua/plugins/extras/ui/number-toggle.lua b/config/nvim/lua/plugins/extras/ui/number-toggle.lua deleted file mode 100644 index 5aba8c04..00000000 --- a/config/nvim/lua/plugins/extras/ui/number-toggle.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - "sitiom/nvim-numbertoggle", - event = "LazyFile", -}