From 2bad7ec707a3b6ba7534ce4f259e901a6172cfaa Mon Sep 17 00:00:00 2001 From: venus Date: Mon, 23 Mar 2026 21:51:07 -0500 Subject: [PATCH] consoildating plugins by function. updated repeat command shortcut --- init.lua | 1 + lazy-lock.json | 22 ++++++++++++---------- lua/autocommands.lua | 2 +- lua/keybinds.lua | 8 ++++++++ lua/matugen.lua | 32 ++++++++++++++++---------------- lua/plugins/lsp.lua | 5 +++++ lua/plugins/mini.lua | 3 --- lua/plugins/nerdtree.lua | 6 ++++-- lua/plugins/render-markdown.lua | 8 -------- 9 files changed, 47 insertions(+), 40 deletions(-) delete mode 100644 lua/plugins/render-markdown.lua diff --git a/init.lua b/init.lua index d65e5cf..30cd27d 100644 --- a/init.lua +++ b/init.lua @@ -19,6 +19,7 @@ require("lazy").setup({ 'kshenoy/vim-signature', -- tag lines 'mg979/vim-visual-multi', -- work on multiple lines at once 'obsidian-nvim/obsidian.nvim', -- Obsidian lsp plugin + '0xm4n/resize.nvim', -- adds commands to resize panes 'nvim-tree/nvim-web-devicons', -- nerdfont! 'TamaMcGlinn/vim-termhere', --simple terminal QOL "smjonas/inc-rename.nvim", --lsp plugin for renaming variable diff --git a/lazy-lock.json b/lazy-lock.json index 64a2e9b..da4b7db 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,40 +3,42 @@ "base16-nvim": { "branch": "master", "commit": "190397833e53fdfd5cf400c5baaf1a4e533158e5" }, "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "fd": { "branch": "master", "commit": "db7d448fd4f43d303bbdcd862b353bd5910de1b8" }, - "fzf-lua": { "branch": "main", "commit": "e791360b37daa2f064ab41f3ab177390136acba2" }, + "fd": { "branch": "master", "commit": "9d137d358df10c441e51dcacc5899e43a4bee877" }, + "fzf-lua": { "branch": "main", "commit": "8a79ee54d6216d10b2f153921a12b152be0c1a20" }, "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "hologram.nvim": { "branch": "main", "commit": "f5194f71ec1578d91b2e3119ff08e574e2eab542" }, "inc-rename.nvim": { "branch": "main", "commit": "0074b551a17338ccdcd299bd86687cc651bcb33d" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a979821a975897b88493843301950c456a725982" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "mini.nvim": { "branch": "main", "commit": "9990c41f10f54f29a888d13024c9f765037bde23" }, - "mini.pick": { "branch": "main", "commit": "8521fe21df86e08d9e4b3c3f3a7d50e47954e1af" }, + "mini.nvim": { "branch": "main", "commit": "439cdcd6992bc9012efd7d8ed7a7b7a0f1fac32a" }, + "mini.pick": { "branch": "main", "commit": "fe079c2bd894a5ee70b62f23d819620ef40c4949" }, "neogit": { "branch": "master", "commit": "d3890fc3cdf0859845a86b2be306bba01458df1a" }, + "nerdtree-visual-selection": { "branch": "master", "commit": "5214763209629d6652ebf183774a8b94cd2e6df0" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" }, "nvim-java": { "branch": "main", "commit": "602a5f7fa92f9c1d425a2159133ff9de86842f0a" }, - "nvim-lspconfig": { "branch": "master", "commit": "4d0724be90b633ddce51b328a631060e6acd7d66" }, - "nvim-tree.lua": { "branch": "master", "commit": "b3772adec8db61ba9098c5624a0823a77be3a23d" }, - "nvim-treesitter": { "branch": "main", "commit": "2f5d4c3f3c675962242096bcc8e586d76dd72eb2" }, + "nvim-lspconfig": { "branch": "master", "commit": "841c6d4139aedb8a3f2baf30cef5327371385b93" }, + "nvim-tree.lua": { "branch": "master", "commit": "3d385d3346e4883d60dc37cf642bd47bed78a46e" }, + "nvim-treesitter": { "branch": "main", "commit": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849" }, "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, - "obsidian.nvim": { "branch": "main", "commit": "0a3fcd4b9beb96921297446b66d464f179996925" }, + "obsidian.nvim": { "branch": "main", "commit": "6ea8b9d1ce10dd41795f298dd7f4dd3a26887d39" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "render-markdown.nvim": { "branch": "main", "commit": "e3c18ddd27a853f85a6f513a864cf4f2982b9f26" }, "resize.nvim": { "branch": "main", "commit": "0b8943ef2ce54e65b9e56974e94dee593b28e7b5" }, "ripgrep": { "branch": "master", "commit": "4519153e5e461527f4bca45b042fff45c4ec6fb9" }, - "snacks.nvim": { "branch": "main", "commit": "a049339328e2599ad6e85a69fa034ac501e921b2" }, + "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" }, "sudo.nvim": { "branch": "main", "commit": "eed34f8636f0dd1bac89c81f6f96a86ca513f5f2" }, "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" }, "themery.nvim": { "branch": "main", "commit": "bfa58f4b279d21cb515b28023e1b68ec908584b2" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" }, + "vim-nerdtree-syntax-highlight": { "branch": "master", "commit": "35e70334a2ff6e89b82a145d1ac889e82d1ddb4e" }, "vim-signature": { "branch": "master", "commit": "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc" }, "vim-termhere": { "branch": "main", "commit": "b66d429dd48b74802f09fd059bc499c253372a1c" }, "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, diff --git a/lua/autocommands.lua b/lua/autocommands.lua index 04556f1..7430b40 100644 --- a/lua/autocommands.lua +++ b/lua/autocommands.lua @@ -4,7 +4,7 @@ local nvim_opacity = "0.85" local default_opacity = "0.6" -- Function to talk to Kitty local function set_kitty_opacity(opacity) - print("Attempting to set opacity to: " .. opacity) + -- print("Attempting to set opacity to: " .. opacity) os.execute("kitty @ set-background-opacity " .. opacity) end -- Set up the autocommands diff --git a/lua/keybinds.lua b/lua/keybinds.lua index a3ba0e9..093b4dd 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -3,6 +3,14 @@ vim.keymap.set('n', '', ':bnext') vim.keymap.set('n', '', ':bprev') vim.keymap.set('n', 'x', ':bdelete') +-- resizing pains with resize.lua shortcut +vim.keymap.set('n', '', "lua require('resize').ResizeLeft()") +vim.keymap.set('n', '', "lua require('resize').ResizeRight()") +vim.keymap.set('n', '', "lua require('resize').ResizeUp()") +vim.keymap.set('n', '', "lua require('resize').ResizeDown()") + + + -- termunal interface shortcuts vim.keymap.set('n', '', 'nohlsearch') -- Diagnostic keymaps diff --git a/lua/matugen.lua b/lua/matugen.lua index d1b3230..6bb4ece 100644 --- a/lua/matugen.lua +++ b/lua/matugen.lua @@ -3,24 +3,24 @@ function M.setup() require('base16-colorscheme').setup { -- Background tones - base00 = '#191724', -- Default Background - base01 = '#26233a', -- Lighter Background (status bars) - base02 = '#2e2b47', -- Selection Background - base03 = '#656182', -- Comments, Invisibles + base00 = '#181212', -- Default Background + base01 = '#241e1e', -- Lighter Background (status bars) + base02 = '#2f2828', -- Selection Background + base03 = '#a08c8b', -- Comments, Invisibles -- Foreground tones - base04 = '#908caa', -- Dark Foreground (status bars) - base05 = '#e0def4', -- Default Foreground - base06 = '#e0def4', -- Light Foreground - base07 = '#e0def4', -- Lightest Foreground + base04 = '#d7c1c1', -- Dark Foreground (status bars) + base05 = '#ece0df', -- Default Foreground + base06 = '#ece0df', -- Light Foreground + base07 = '#ece0df', -- Lightest Foreground -- Accent colors - base08 = '#eb6f92', -- Variables, XML Tags, Errors - base09 = '#31748f', -- Integers, Constants - base0A = '#9ccfd8', -- Classes, Search Background - base0B = '#ebbcba', -- Strings, Diff Inserted - base0C = '#96d1e9', -- Regex, Escape Chars - base0D = '#e99996', -- Functions, Methods - base0E = '#96dce9', -- Keywords, Storage - base0F = '#a00833', -- Deprecated, Embedded Tags + base08 = '#ffb4ab', -- Variables, XML Tags, Errors + base09 = '#e4c18d', -- Integers, Constants + base0A = '#e6bdbb', -- Classes, Search Background + base0B = '#ffb3b2', -- Strings, Diff Inserted + base0C = '#e4c18d', -- Regex, Escape Chars + base0D = '#ffb3b2', -- Functions, Methods + base0E = '#e6bdbb', -- Keywords, Storage + base0F = '#93000a', -- Deprecated, Embedded Tags } end diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index ad51681..ef56d13 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -22,4 +22,9 @@ return { }, }, }, + { + 'MeanderingProgrammer/render-markdown.nvim', + dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-mini/mini.nvim' }, -- if you use the mini.nvim suite + ---@module 'render-markdown' + }, } diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua index 2fe18f9..c58cec9 100644 --- a/lua/plugins/mini.lua +++ b/lua/plugins/mini.lua @@ -29,8 +29,5 @@ return { require('mini.clue').setup() - require('mini.pairs').setup() - - end, } diff --git a/lua/plugins/nerdtree.lua b/lua/plugins/nerdtree.lua index 07b721f..20760e2 100644 --- a/lua/plugins/nerdtree.lua +++ b/lua/plugins/nerdtree.lua @@ -1,6 +1,8 @@ return { 'nvim-tree/nvim-tree.lua', - dependencies = { 'nvim-tree/nvim-web-devicons' }, + dependencies = { + 'nvim-tree/nvim-web-devicons', +}, config = function() require("nvim-tree").setup({ view = { @@ -10,7 +12,7 @@ return { actions = { open_file = { -- This is the "open in adjacent pane" equivalent - window_picker = { enable = true }, + window_picker = { enable = true }, }, }, }) diff --git a/lua/plugins/render-markdown.lua b/lua/plugins/render-markdown.lua deleted file mode 100644 index 1ca95fc..0000000 --- a/lua/plugins/render-markdown.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - 'MeanderingProgrammer/render-markdown.nvim', - dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-mini/mini.nvim' }, -- if you use the mini.nvim suite - -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-mini/mini.icons' }, -- if you use standalone mini plugins - -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons - ---@module 'render-markdown' --- ---@type render.md.UserConfig -}