From 18ab04a35843f372dd819bb756948294b5d11a81 Mon Sep 17 00:00:00 2001 From: David Jensenius Date: Sat, 28 Feb 2026 10:10:07 -0500 Subject: [PATCH 1/2] Some cleanup --- nvim/lua/plugins/lazydev.lua | 19 +++++++------------ nvim/lua/plugins/lazygit.lua | 20 -------------------- nvim/lua/plugins/mason.lua | 29 +++++++++++++++++++++++++++++ nvim/lua/plugins/neotest.lua | 2 +- nvim/lua/plugins/nvim-colorizer.lua | 29 +++++++++++++++-------------- nvim/lua/plugins/obsidian.lua | 2 +- nvim/lua/plugins/oscyank.lua | 23 ----------------------- nvim/lua/plugins/snacks.lua | 7 +++++++ nvim/lua/plugins/which-key.lua | 2 ++ 9 files changed, 62 insertions(+), 71 deletions(-) delete mode 100644 nvim/lua/plugins/lazygit.lua delete mode 100644 nvim/lua/plugins/oscyank.lua diff --git a/nvim/lua/plugins/lazydev.lua b/nvim/lua/plugins/lazydev.lua index 7390358..dd7f2b3 100644 --- a/nvim/lua/plugins/lazydev.lua +++ b/nvim/lua/plugins/lazydev.lua @@ -1,16 +1,11 @@ return { - { - "folke/lazydev.nvim", - ft = "lua", -- only load on lua files - opts = { - library = { - -- See the configuration section for more details - -- Load luvit types when the `vim.uv` word is found - { path = "luvit-meta/library", words = { "vim%.uv" } }, - { path = "snacks.nvim", words = { "Snacks" } }, - { path = "lazy.nvim", words = { "LazyVim" } }, - }, + "folke/lazydev.nvim", + ft = "lua", + opts = { + library = { + { path = "${3rd}/luv/library", words = { "vim%.uv" } }, + { path = "snacks.nvim", words = { "Snacks" } }, + { path = "lazy.nvim", words = { "LazyVim" } }, }, }, - { "Bilal2453/luvit-meta", lazy = true }, -- optional `vim.uv` typings } diff --git a/nvim/lua/plugins/lazygit.lua b/nvim/lua/plugins/lazygit.lua deleted file mode 100644 index 48d573f..0000000 --- a/nvim/lua/plugins/lazygit.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - "kdheepak/lazygit.nvim", - event = "VeryLazy", - cmd = { - "LazyGit", - "LazyGitConfig", - "LazyGitCurrentFile", - "LazyGitFilter", - "LazyGitFilterCurrentFile", - }, - -- optional for floating window border decoration - dependencies = { - "nvim-lua/plenary.nvim", - }, - -- setting the keybinding for LazyGit with 'keys' is recommended in - -- order to load the plugin when the command is run for the first time - keys = { - { "gL", "LazyGit", desc = "LazyGit" }, - }, -} diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua index 166b242..63fffd1 100644 --- a/nvim/lua/plugins/mason.lua +++ b/nvim/lua/plugins/mason.lua @@ -26,6 +26,24 @@ return { "leoluz/nvim-dap-go", "suketa/nvim-dap-ruby", { "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } }, + { + "igorlfs/nvim-dap-view", + dependencies = { "mfussenegger/nvim-dap" }, + cmd = { "DapViewOpen", "DapViewClose", "DapViewToggle", "DapViewWatch" }, + opts = { + winbar = { + sections = { "watches", "scopes", "exceptions", "breakpoints", "threads", "repl" }, + default_section = "scopes", + controls = { + enabled = true, + position = "right", + }, + }, + windows = { + position = "right", + }, + }, + }, }, keys = { { @@ -144,6 +162,17 @@ return { end, desc = "Debug: Center Scopes", }, + { + "pv", + "DapViewToggle", + desc = "Debug: Toggle DAP View", + }, + { + "pw", + "DapViewWatch", + mode = { "n", "v" }, + desc = "Debug: Watch Expression", + }, }, config = function() require("mason-nvim-dap").setup({ diff --git a/nvim/lua/plugins/neotest.lua b/nvim/lua/plugins/neotest.lua index f543dcf..6f9cbcc 100644 --- a/nvim/lua/plugins/neotest.lua +++ b/nvim/lua/plugins/neotest.lua @@ -4,7 +4,7 @@ return { dependencies = { "nvim-lua/plenary.nvim", "nvim-treesitter/nvim-treesitter", - "haydenmeade/neotest-jest", + "nvim-neotest/neotest-jest", "nvim-neotest/nvim-nio", }, config = function() diff --git a/nvim/lua/plugins/nvim-colorizer.lua b/nvim/lua/plugins/nvim-colorizer.lua index 2048810..be447b0 100644 --- a/nvim/lua/plugins/nvim-colorizer.lua +++ b/nvim/lua/plugins/nvim-colorizer.lua @@ -1,17 +1,18 @@ return { - "norcalli/nvim-colorizer.lua", - event = "BufRead", - config = function() - require("colorizer").setup({ "*" }, { - RGB = true, -- #RGB hex codes - RRGGBB = true, -- #RRGGBB hex codes - names = true, -- "Name" codes like Blue - RRGGBBAA = true, -- #RRGGBBAA hex codes - rgb_fn = true, -- CSS rgb() and rgba() functions - hsl_fn = true, -- CSS hsl() and hsla() functions - css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB - css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn + "catgoose/nvim-colorizer.lua", + event = "BufReadPre", + opts = { + filetypes = { "*" }, + user_default_options = { + RGB = true, + RRGGBB = true, + names = true, + RRGGBBAA = true, + rgb_fn = true, + hsl_fn = true, + css = true, + css_fn = true, mode = "background", - }) - end, + }, + }, } diff --git a/nvim/lua/plugins/obsidian.lua b/nvim/lua/plugins/obsidian.lua index 90d83e5..8981944 100644 --- a/nvim/lua/plugins/obsidian.lua +++ b/nvim/lua/plugins/obsidian.lua @@ -1,6 +1,6 @@ if vim.fn.isdirectory(vim.fn.expand("~/Vaults")) == 1 then return { - "epwalsh/obsidian.nvim", + "obsidian-nvim/obsidian.nvim", version = "*", -- recommended, use latest release instead of latest commit lazy = true, ft = "markdown", diff --git a/nvim/lua/plugins/oscyank.lua b/nvim/lua/plugins/oscyank.lua deleted file mode 100644 index 676bc3f..0000000 --- a/nvim/lua/plugins/oscyank.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - "ojroques/vim-oscyank", - init = function() - ---@diagnostic disable-next-line: inject-field - vim.g.oscyank_trim = 0 - end, - config = function() - -- Single autocmd with a combined callback function - vim.api.nvim_create_autocmd("TextYankPost", { - callback = function() - -- Handle both default and '+' register cases in a single function - if vim.v.event.operator ~= "y" then - return - end - - local register = vim.v.event.regname - if register == "" or register == "+" then - vim.cmd(string.format("OSCYankRegister %s", register == "" and '"' or "+")) - end - end, - }) - end, -} diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua index 999184f..6d006d4 100644 --- a/nvim/lua/plugins/snacks.lua +++ b/nvim/lua/plugins/snacks.lua @@ -92,6 +92,13 @@ return { }, }, keys = { + { + "gL", + function() + Snacks.lazygit() + end, + desc = "LazyGit", + }, { "aA", function() diff --git a/nvim/lua/plugins/which-key.lua b/nvim/lua/plugins/which-key.lua index 3581b0c..73569c9 100644 --- a/nvim/lua/plugins/which-key.lua +++ b/nvim/lua/plugins/which-key.lua @@ -128,6 +128,8 @@ return { { "pr", desc = "Open REPL", icon = "" }, { "pl", desc = "Run last", icon = "󰘁" }, { "p", desc = "More DAP" }, + { "pv", desc = "Toggle DAP View", icon = "󱏿" }, + { "pw", desc = "Watch Expression", icon = "󰂥" }, }) end, } From 588ae68043adad96f490c76a055af47963557534 Mon Sep 17 00:00:00 2001 From: David Jensenius Date: Sat, 28 Feb 2026 10:13:56 -0500 Subject: [PATCH 2/2] LINT --- nvim/lua/plugins/snacks.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua index 6d006d4..39bdd8b 100644 --- a/nvim/lua/plugins/snacks.lua +++ b/nvim/lua/plugins/snacks.lua @@ -95,7 +95,7 @@ return { { "gL", function() - Snacks.lazygit() + require("snacks").lazygit() end, desc = "LazyGit", },