From 6d311d4fbddd5f23e8f48fdc6e0b44fe8cdc1e39 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Tue, 10 Feb 2026 17:36:59 -0500 Subject: [PATCH] some changes --- config/nvim/init.lua | 1 - config/nvim/lazy-lock.json | 28 ++++---- config/nvim/lua/plugins/cp.lua | 4 +- config/nvim/lua/plugins/lsp.lua | 110 ++----------------------------- config/nvim/lua/plugins/nvim.lua | 7 +- 5 files changed, 20 insertions(+), 130 deletions(-) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index c95997b..f6315d4 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -24,7 +24,6 @@ end vim.opt.rtp:prepend(lazypath) require('lazy').setup('plugins', { - git = { url_format = 'git@github.com:%s.git' }, change_detection = { enabled = false }, performance = { cache = { diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 3661418..829f697 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,38 +1,36 @@ { "LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" }, - "SchemaStore.nvim": { "branch": "main", "commit": "cd9e8c22f6ad2012ac395725080cc5737297d840" }, - "blink.cmp": { "branch": "main", "commit": "b137f63d89d0285ca76eed12e1923220e0aff8c1" }, + "SchemaStore.nvim": { "branch": "main", "commit": "b850ab25279ba04ada90e8b696ef5d0624af103d" }, + "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, "blink.indent": { "branch": "main", "commit": "9c80820ca77218a8d28e70075d6f44a1609911fe" }, "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" }, + "cp.nvim": { "branch": "main", "commit": "029ea125b97320ff5c2884bf84bf5aa4e7077c79" }, "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, - "format-ts-errors.nvim": { "branch": "main", "commit": "4b7418d6689bc0fd3c1db0500c67133422522384" }, - "fzf-lua": { "branch": "main", "commit": "1cd4d8f36789061aa7b7d0718bc13849f92d6d77" }, - "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" }, + "fzf-lua": { "branch": "main", "commit": "fb8c50ba62a0daa433b7ac2b78834f318322b879" }, + "gitsigns.nvim": { "branch": "main", "commit": "f7cc6850517b8db59a41314b83bb7994eae33cdd" }, "grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" }, - "highlight-undo.nvim": { "branch": "main", "commit": "ee32e12693d70e66f954d09a504a7371d110fc27" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "live-rename.nvim": { "branch": "main", "commit": "3a3cddf23b89a17992f9ca67afc5858077769462" }, - "live-server.nvim": { "branch": "main", "commit": "58f2e30e029a57dbda15c5749edd8d642578859f" }, + "live-server.nvim": { "branch": "main", "commit": "26dafe2f0883022ce2c1327c113cd6b40daaf533" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "midnight.nvim": { "branch": "main", "commit": "130a1899c2d5a0af431f3e41eeac429e90ea1d09" }, "mini.bufremove": { "branch": "main", "commit": "10857aa39160c127694151828914df3131ba83b6" }, "mini.misc": { "branch": "main", "commit": "b647b64321c34d4868d158282bb89e49f0d6838b" }, "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" }, - "none-ls-extras.nvim": { "branch": "main", "commit": "6ced4fc4072c7b269ba95bb596196cc76e00b280" }, - "none-ls.nvim": { "branch": "main", "commit": "3c206dfedf5f1385e9d29f85ffaec7874358592a" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "81e676d3203c9eb6e4c0ccf1eba1679296ef923f" }, - "nvim-lspconfig": { "branch": "master", "commit": "419b082102fa813739588dd82e19a8b6b2442855" }, + "none-ls.nvim": { "branch": "main", "commit": "68ed8b9bf5dfdae4d579fcd19723926f84d7b6cb" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "338409dd8a6ed74767bad3eb5269f1b903ffb3cf" }, + "nvim-lspconfig": { "branch": "master", "commit": "66fd02ad1c7ea31616d3ca678fa04e6d0b360824" }, "nvim-navic": { "branch": "master", "commit": "f5eba192f39b453675d115351808bd51276d9de5" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, - "nvim-treesitter": { "branch": "main", "commit": "568ede7e79172a0fe7c9d631454a97ad968deaf2" }, - "nvim-treesitter-textobjects": { "branch": "main", "commit": "52bda74e087034408e2d563cb4499c1601038f9d" }, + "nvim-treesitter": { "branch": "main", "commit": "45a07f869b0cffba342276f2c77ba7c116d35db8" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" }, "nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" }, "oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" }, "overseer.nvim": { "branch": "master", "commit": "5828bdbd86677497613033c142f0a8624489216f" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "rustaceanvim": { "branch": "master", "commit": "796f06742e373012b860dc20f9ecccbfc670dc28" }, + "rustaceanvim": { "branch": "master", "commit": "bb57d9a9c3f547504e38df1fc17dbcc7065a23f3" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, - "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" }, "treesj": { "branch": "main", "commit": "186084dee5e9c8eec40f6e39481c723dd567cb05" }, "typescript-tools.nvim": { "branch": "master", "commit": "c2f5910074103705661e9651aa841e0d7eea9932" }, "typst-preview.nvim": { "branch": "master", "commit": "e123a7ab64e52d836e00dea9251e85b201f38966" }, diff --git a/config/nvim/lua/plugins/cp.lua b/config/nvim/lua/plugins/cp.lua index 176af41..b370e04 100644 --- a/config/nvim/lua/plugins/cp.lua +++ b/config/nvim/lua/plugins/cp.lua @@ -64,7 +64,6 @@ BinPackParameters: false]] return { 'barrettruth/cp.nvim', - dir = '~/dev/cp.nvim', cmd = 'CP', keys = { { 'ce', 'CP edit' }, @@ -77,8 +76,7 @@ return { { '[c', 'CP prev' }, }, dependencies = { - 'L3MON4D3/LuaSnip', - 'nvim-telescope/telescope.nvim', + 'ibhagwan/fzf-lua' }, config = function() require('cp').setup({ diff --git a/config/nvim/lua/plugins/lsp.lua b/config/nvim/lua/plugins/lsp.lua index 7dbda41..3115a90 100644 --- a/config/nvim/lua/plugins/lsp.lua +++ b/config/nvim/lua/plugins/lsp.lua @@ -11,8 +11,8 @@ return { }, { 'saghen/blink.cmp', - build = 'cargo build --release', - dependencies = 'folke/lazydev.nvim', + version = '1.*', + dependencies = { 'folke/lazydev.nvim', 'L3MON4D3/LuaSnip' }, ---@module 'blink.cmp' ---@type blink.cmp.Config event = { 'InsertEnter', 'CmdlineEnter' }, @@ -80,109 +80,6 @@ return { keys = { { '', mode = 'i' } }, opts_extend = { 'sources.default' }, }, - { - 'nvimtools/none-ls.nvim', - config = function() - local null_ls = require('null-ls') - local builtins = null_ls.builtins - local code_actions, diagnostics, formatting, hover = - builtins.code_actions, - builtins.diagnostics, - builtins.formatting, - builtins.hover - - null_ls.setup({ - border = 'single', - sources = { - require('none-ls.code_actions.eslint_d'), - code_actions.gitrebase, - - diagnostics.buf, - diagnostics.checkmake, - require('none-ls.diagnostics.cpplint').with({ - extra_args = { - '--filter', - '-legal/copyright', - '-whitespace/indent', - }, - prepend_extra_args = true, - }), - require('none-ls.diagnostics.eslint_d'), - diagnostics.hadolint, - diagnostics.mypy.with({ - extra_args = { '--check-untyped-defs' }, - runtime_condition = function(params) - return vim.fn.executable('mypy') == 1 - and require('null-ls.utils').path.exists( - params.bufname - ) - end, - }), - diagnostics.selene, - diagnostics.vacuum, - diagnostics.zsh, - - formatting.black, - formatting.isort.with({ - extra_args = { '--profile', 'black' }, - }), - formatting.buf, - formatting.cbfmt, - formatting.cmake_format, - require('none-ls.formatting.latexindent'), - formatting.prettierd.with({ - env = { - XDG_RUNTIME_DIR = vim.env.XDG_RUNTIME_DIR - or ( - ( - vim.env.XDG_DATA_HOME - or (vim.env.HOME .. '/.local/share') - ) - .. '/prettierd' - ), - }, - extra_args = function(params) - if params.ft == 'jsonc' then - return { '--trailing-comma', 'none' } - end - return {} - end, - filetypes = { - 'css', - 'graphql', - 'html', - 'javascript', - 'javascriptreact', - 'json', - 'jsonc', - 'markdown', - 'mdx', - 'typescript', - 'typescriptreact', - 'yaml', - }, - }), - formatting.shfmt.with({ - extra_args = { '-i', '2' }, - }), - formatting.stylua.with({ - condition = function(utils) - return utils.root_has_file({ - 'stylua.toml', - '.stylua.toml', - }) - end, - }), - - hover.dictionary, - hover.printenv, - }, - on_attach = require('config.lsp').on_attach, - debounce = 0, - }) - end, - dependencies = 'nvimtools/none-ls-extras.nvim', - }, { 'b0o/SchemaStore.nvim', }, @@ -216,6 +113,7 @@ return { }, { 'yioneko/nvim-vtsls', + enabled = false, config = function(_, opts) require('vtsls').config(opts) end, @@ -284,6 +182,7 @@ return { }, { 'pmizio/typescript-tools.nvim', + enabled = false, opts = { on_attach = function(_, bufnr) bmap( @@ -344,6 +243,7 @@ return { }, { 'mrcjkb/rustaceanvim', + enabled = false, ft = { 'rust' }, }, { diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua index 29104be..a49861f 100644 --- a/config/nvim/lua/plugins/nvim.lua +++ b/config/nvim/lua/plugins/nvim.lua @@ -40,6 +40,7 @@ return { }, { 'lervag/vimtex', + enabled = false, init = function() vim.g.vimtex_view_method = 'general' vim.g.vimtex_compiler_method = 'latexmk' @@ -347,11 +348,6 @@ return { { 'ySs', mode = 'n' }, }, }, - { - 'tzachar/highlight-undo.nvim', - config = true, - keys = { 'u', 'U' }, - }, { 'kana/vim-textobj-user', dependencies = { @@ -411,7 +407,6 @@ return { }, { 'barrettruth/midnight.nvim', - dir = '~/dev/midnight.nvim', init = function() vim.api.nvim_create_autocmd({ 'OptionSet' }, { pattern = 'background',