From cd9de7e9b35fb1c775ac9d6f30915e1d56afbe90 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Tue, 14 Feb 2023 14:08:01 +0100 Subject: [PATCH] nvim: plugin cleanup --- .config/nvim/lazy-lock.json | 4 +-- .config/nvim/lua/config/lazy.lua | 6 ++--- .config/nvim/lua/plugins/misc.lua | 34 ------------------------- .config/nvim/lua/plugins/telescope.lua | 1 + .config/nvim/lua/plugins/treesitter.lua | 7 +---- .config/nvim/lua/plugins/yanky.lua | 24 ----------------- .config/nvim/lua/plugins/zenbones.lua | 7 +++-- 7 files changed, 10 insertions(+), 73 deletions(-) delete mode 100644 .config/nvim/lua/plugins/yanky.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 6285ae0..f935590 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -15,7 +15,7 @@ "hlargs.nvim": { "branch": "main", "commit": "88b925d699fb39633cdda02c24f0b3ba5d0e6964" }, "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" }, "indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" }, - "lazy.nvim": { "branch": "main", "commit": "8aa90c34233f7de420b326de361137a571827d8c" }, + "lazy.nvim": { "branch": "main", "commit": "6a18404b7d1c05f0d1f35f7b78bd5c282dff7a89" }, "lsp_lines.nvim": { "branch": "main", "commit": "ec98b45c8280e5ef8c84028d4f38aa447276c002" }, "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, "lualine.nvim": { "branch": "master", "commit": "0050b308552e45f7128f399886c86afefc3eb988" }, @@ -34,7 +34,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "9b8f5260f3e793e2dcb2899e0a5b944667a95cb2" }, "nvim-navic": { "branch": "master", "commit": "7e9d2b2b601149fecdccd11b516acb721e571fe6" }, "nvim-osc52": { "branch": "main", "commit": "27da4724a887dabed3768b41fa51c785cb62ef26" }, - "nvim-treesitter": { "branch": "master", "commit": "4db66966720541c2286dc7451be3c8ff9f273bb9" }, + "nvim-treesitter": { "branch": "master", "commit": "f475b24c81d64d64ab213a73882b7c4f3bbbf26a" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "fcd764507f723903af5507e141ea593e855b504a" }, "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" }, diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index 35cc1c7..a5685f6 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -5,10 +5,10 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.runtimepath:prepend(lazypath) +-- require("lazy").setup("plugins") + require("lazy").setup({ - spec = { - { import = "plugins" }, - }, + import = "plugins", defaults = { lazy = true }, checker = { enabled = true }, performance = { diff --git a/.config/nvim/lua/plugins/misc.lua b/.config/nvim/lua/plugins/misc.lua index 5cde493..4689229 100644 --- a/.config/nvim/lua/plugins/misc.lua +++ b/.config/nvim/lua/plugins/misc.lua @@ -50,40 +50,6 @@ return { opts = { snippet_engine = "luasnip" }, }, - { - "ThePrimeagen/refactoring.nvim", - keys = { - { - "r", - function() - require("refactoring").select_refactor() - end, - mode = "v", - noremap = true, - silent = true, - expr = false, - }, - }, - opts = {}, - }, - - { - "ThePrimeagen/refactoring.nvim", - keys = { - { - "r", - function() - require("refactoring").select_refactor() - end, - mode = "v", - noremap = true, - silent = true, - expr = false, - }, - }, - opts = {}, - }, - { "smjonas/inc-rename.nvim", cmd = "IncRename", diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 71d5fcc..4848f50 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -6,6 +6,7 @@ end local M = { "nvim-telescope/telescope.nvim", + lazy = false, dependencies = { "nvim-lua/popup.nvim", "nvim-lua/plenary.nvim", diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index b8d3b59..662c3c3 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -27,6 +27,7 @@ return { "gomod", "graphql", "help", + "hcl", "html", "http", "java", @@ -67,20 +68,16 @@ return { enable = true, use_languagetree = true, }, - indent = { enable = false, }, - context_commentstring = { enable = true, enable_autocmd = false }, - playground = { enable = true, disable = {}, updatetime = 25, persist_queries = false, }, - incremental_selection = { enable = true, keymaps = { @@ -90,13 +87,11 @@ return { node_decremental = "sa", }, }, - query_linter = { enable = true, use_virtual_text = true, lint_events = { "BufWrite", "CursorHold" }, }, - textobjects = { move = { enable = true, diff --git a/.config/nvim/lua/plugins/yanky.lua b/.config/nvim/lua/plugins/yanky.lua deleted file mode 100644 index f22d8e7..0000000 --- a/.config/nvim/lua/plugins/yanky.lua +++ /dev/null @@ -1,24 +0,0 @@ -local M = { - "folke/yanky.nvim", -} - -function M.config() - require("yanky").setup({ - ring = { - history_length = 100, - storage = "memory", - sync_with_numbered_registers = false, - cancel_event = "update", - }, - }) - - vim.keymap.set({ "n", "x" }, "p", "(YankyPutAfter)") - vim.keymap.set({ "n", "x" }, "P", "(YankyPutBefore)") - vim.keymap.set({ "n", "x" }, "gp", "(YankyGPutAfter)") - vim.keymap.set({ "n", "x" }, "gP", "(YankyGPutBefore)") - - vim.keymap.set("n", "", "(YankyCycleForward)") - vim.keymap.set("n", "", "(YankyCycleBackward)") -end - -return M diff --git a/.config/nvim/lua/plugins/zenbones.lua b/.config/nvim/lua/plugins/zenbones.lua index 8db8871..79c2c41 100644 --- a/.config/nvim/lua/plugins/zenbones.lua +++ b/.config/nvim/lua/plugins/zenbones.lua @@ -1,8 +1,8 @@ local M = { "mcchrish/zenbones.nvim", - event = "VeryLazy", + -- event = "VeryLazy", dependencies = { - "rktjmp/lush.nvim", + { "rktjmp/lush.nvim" }, }, } @@ -119,15 +119,14 @@ function M.config() PMenuThumb({ bg = "#64B5F6" }), StatusLine({ base = base.VertSplit, fg = "#BCAAA4" }), StatusLineNC({ base = base.VertSplit, fg = "#BCAAA4" }), - TreesitterContext({ bg = "#f0f0f0", fg = "#BCAAA4", gui = "bold,italic" }), TreesitterContextLineNumber({ bg = "#f0f0f0", fg = "#979770", gui = "bold,italic" }), } end) -- Apply specs using lush tool-chain - vim.cmd("colorscheme zenbones") lush.apply(lush.compile(specs)) + vim.cmd("colorscheme zenbones") end return M