From ca7d43ba51f7d4068e4ade0ac55fc2a0f4dfd3ca Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Tue, 12 Dec 2023 15:43:44 +0100 Subject: [PATCH] nvim: Update plugins and lazy loading --- nvim/.config/nvim/lazy-lock.json | 23 ++++++++++---------- nvim/.config/nvim/lua/core/mappings.lua | 8 ------- nvim/.config/nvim/lua/plugins/config/cmp.lua | 23 ++++++++++---------- nvim/.config/nvim/lua/plugins/core.lua | 22 ++++++++++--------- nvim/.config/nvim/lua/plugins/git.lua | 3 ++- nvim/.config/nvim/lua/plugins/ui.lua | 19 +++++++++++++--- 6 files changed, 54 insertions(+), 44 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 9ee7476..2110ae4 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -6,13 +6,14 @@ "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, "aerial.nvim": { "branch": "master", "commit": "63ec2bfc3d9b8ce1fd943fff14781504d8ee250e" }, "bats.vim": { "branch": "master", "commit": "6a5d2ef22b0ede503d867770afd02ebb1f97b709" }, + "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, "cmp-beancount": { "branch": "main", "commit": "da154ea94d598e6649d6ad01efa0a8611eff460d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-digraphs": { "branch": "master", "commit": "5efc1f0078d7c5f3ea1c8e3aad04da3fd6e081a9" }, "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-pandoc-references": { "branch": "master", "commit": "2c808dff631a783ddd2c554c4c6033907589baf6" }, @@ -20,8 +21,9 @@ "cmp-rg": { "branch": "master", "commit": "677a7874ee8f1afc648c2e7d63a97bc21a7663c5" }, "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, "cmp-tmux": { "branch": "main", "commit": "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845" }, - "cmp-treesitter": { "branch": "master", "commit": "b8bc760dfcc624edd5454f0982b63786a822eed9" }, + "cmp-treesitter": { "branch": "master", "commit": "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "codeium.nvim": { "branch": "main", "commit": "a0d43300f9a17a6ac775947ae4fb6b99ac5a92d0" }, "completion-vcard": { "branch": "master", "commit": "2220fd517a985ececed1adcf0e5be8f2815564c7" }, "conform.nvim": { "branch": "master", "commit": "ce95e6b2a072d81fd312ff213f241cacab1eccef" }, "dial.nvim": { "branch": "master", "commit": "54b503f906bc9e5ab85288414840a1b86d40769f" }, @@ -44,27 +46,27 @@ "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "mdeval.nvim": { "branch": "master", "commit": "2654caf8ecaad702b50199d18e39cff23d81e0ba" }, "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" }, - "molten-nvim": { "branch": "main", "commit": "93f2f168e77cbd82a881e07030cdbd45a48ed070" }, + "molten-nvim": { "branch": "main", "commit": "883ecb358e3b4dca9a83daa05b51f22b81f878e9" }, "neotest": { "branch": "master", "commit": "009328955066ae6c170d24bb0de5f168d8760ff8" }, "neotest-python": { "branch": "master", "commit": "81d2265efac717bb567bc15cc652ae10801286b3" }, "nvim-FeMaco.lua": { "branch": "main", "commit": "6af458f0196215f397db31a6e1fb2df795811693" }, - "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-base16": { "branch": "master", "commit": "010bedf0b7c01ab4d4e4e896a8527d97c222351d" }, + "nvim-cmp": { "branch": "main", "commit": "41d7633e4146dce1072de32cea31ee31b056a131" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-coverage": { "branch": "main", "commit": "cf4b5c61dfac977026a51a2bcad9173c272986ce" }, "nvim-lint": { "branch": "master", "commit": "849ccb610de3f6ce1a239ea1e68568ef1a53d5df" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, + "nvim-lspconfig": { "branch": "master", "commit": "f451052bd6804e9e5ccd0ac874d7df8d3d4c55b9" }, "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" }, - "nvim-toggleterm.lua": { "branch": "main", "commit": "faee9d60428afc7857e0927fdc18daa6c409fa64" }, - "nvim-tree.lua": { "branch": "master", "commit": "7d1760f892951dd6a118dae1d7a1d8df5f029edf" }, + "nvim-toggleterm.lua": { "branch": "main", "commit": "cbd041d91b90cd3c02df03fe6133208888f8e008" }, + "nvim-tree.lua": { "branch": "master", "commit": "141c0f97c35f274031294267808ada59bb5fb08e" }, "nvim-treesitter": { "branch": "master", "commit": "63260da18bf273c76b8e2ea0db84eb901cab49ce" }, - "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" }, + "nvim-treesitter-context": { "branch": "master", "commit": "cfa8ee19ac9bae9b7fb2958eabe2b45b70c56ccb" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textsubjects": { "branch": "master", "commit": "011c09784f1a95cf469a48c1993b664190440391" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, - "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, + "nvim-web-devicons": { "branch": "master", "commit": "8b2e5ef9eb8a717221bd96cb8422686d65a09ed5" }, "otter.nvim": { "branch": "main", "commit": "9a3db06bf3abadafb93279648317984ca789b888" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, @@ -81,7 +83,6 @@ "vim-easy-align": { "branch": "master", "commit": "0db4ea6132110631ec678a99a82aa49a0686ae65" }, "vim-exchange": { "branch": "master", "commit": "784d63083ad7d613aa96f00021cd0dfb126a781a" }, "vim-numbertoggle": { "branch": "main", "commit": "df9b1fe616507340718716204ba7f434125bdf7a" }, - "vim-oscyank": { "branch": "main", "commit": "ffe827a27dae98aa826e2295336c650c9a434da0" }, "vim-pandoc-syntax": { "branch": "master", "commit": "16939cda184ff555938cc895cc62477c172997f9" }, "vim-spellsync": { "branch": "master", "commit": "3d6dd50de9c4d953cc16638112a6ae196df41463" }, "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" }, diff --git a/nvim/.config/nvim/lua/core/mappings.lua b/nvim/.config/nvim/lua/core/mappings.lua index bea44c1..3b3d39b 100644 --- a/nvim/.config/nvim/lua/core/mappings.lua +++ b/nvim/.config/nvim/lua/core/mappings.lua @@ -266,11 +266,3 @@ map( [[:lua require('wrapping').toggle_wrap_mode() ]], { silent = true, desc = "toggle wrap mode" } ) --- PLUGIN: nvim-colorizer -map("n", "sc", "ColorizerToggle", { silent = true, desc = "toggle colorizer" }) -map( - "n", - "sC", - 'lua require("colorizer").attach_to_buffer(0, {mode = "background"} )', - { silent = true, desc = "colorize background" } -) diff --git a/nvim/.config/nvim/lua/plugins/config/cmp.lua b/nvim/.config/nvim/lua/plugins/config/cmp.lua index ccb80af..31db206 100644 --- a/nvim/.config/nvim/lua/plugins/config/cmp.lua +++ b/nvim/.config/nvim/lua/plugins/config/cmp.lua @@ -57,11 +57,11 @@ cmp.setup({ { name = "calc" }, { name = "path" }, { name = "buffer", keyword_length = 3 }, - { name = "digraphs" }, { name = "latex_symbols" }, { name = "spell", keyword_length = 3 }, { name = "tmux" }, -- { name = 'rg', keyword_length = 5 }, { name = "vCard" }, + { name = "digraphs" }, }, mapping = cmp.mapping.preset.insert({ [""] = cmp.mapping.scroll_docs(-4), @@ -112,18 +112,19 @@ cmp.setup({ -- Kind icons, removing kind text leaving only icon -- vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) + -- Source vim_item.menu = ({ - buffer = "[Buf]", - calc = "[Cal]", - digraphs = "[Dig]", - latex_symbols = "[LaTeX]", - luasnip = "[Snip]", - nvim_lsp = "[Lsp]", - nvim_lua = "[Lua]", - pandoc_references = "[Bib]", - spell = "[Spl]", - vCard = "[vCrd]", + buffer = "", + calc = "󰃬", + digraphs = "", + latex_symbols = "󰊄", + luasnip = "", + nvim_lsp = "", + nvim_lua = "󰢱", + pandoc_references = "", + spell = "󰓆", + vCard = "󰛋", })[entry.source.name] return vim_item end, diff --git a/nvim/.config/nvim/lua/plugins/core.lua b/nvim/.config/nvim/lua/plugins/core.lua index fb76d5a..7162fd1 100644 --- a/nvim/.config/nvim/lua/plugins/core.lua +++ b/nvim/.config/nvim/lua/plugins/core.lua @@ -7,16 +7,14 @@ return { event = "VeryLazy", }, -- jump between letters with improved fFtT quicksearch, mimics sneak - { "ggandor/lightspeed.nvim", event = "VeryLazy" }, + { "ggandor/lightspeed.nvim", event = "BufEnter" }, - -- yank from *anywhere* (even ssh session) to clipboard, using :OSCYank - { "ojroques/vim-oscyank", event = "VeryLazy" }, -- personal dict improvements for git sync { "micarmst/vim-spellsync", event = "VeryLazy" }, { "folke/which-key.nvim", config = true, - event = "VeryLazy", + event = "CursorHold", }, -- collection of plugins { @@ -42,10 +40,14 @@ return { priority = 1000, dependencies = { "rktjmp/fwatch.nvim" }, }, - -- try to avoid putting files in util buffers, e.g. filetree, aerial, undotree, .. - { - 'stevearc/stickybuf.nvim', - config = true, - } - + -- try to avoid putting files in util buffers, e.g. filetree, aerial, undotree, .. + { + "stevearc/stickybuf.nvim", + config = true, + }, + -- make it a little less painful to open really big (>2mb) files by disabling features + { + "LunarVim/bigfile.nvim", + lazy = false, + }, } diff --git a/nvim/.config/nvim/lua/plugins/git.lua b/nvim/.config/nvim/lua/plugins/git.lua index 3c52bad..b5414d1 100644 --- a/nvim/.config/nvim/lua/plugins/git.lua +++ b/nvim/.config/nvim/lua/plugins/git.lua @@ -18,7 +18,8 @@ return { }, { "lewis6991/gitsigns.nvim", -- show vcs changes on left-hand gutter - event = "VeryLazy", + event = { "InsertEnter", "CursorHold" }, + cmd = "Gitsigns", config = function() require("gitsigns").setup({ numhl = true, diff --git a/nvim/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua index e9b3477..90ac1ee 100644 --- a/nvim/.config/nvim/lua/plugins/ui.lua +++ b/nvim/.config/nvim/lua/plugins/ui.lua @@ -51,11 +51,11 @@ return { { "stevearc/dressing.nvim", config = true, event = "VeryLazy" }, -- numbers to absolute for all buffers but the current which is relative - { "jeffkreeftmeijer/vim-numbertoggle", event = "VeryLazy" }, + { "jeffkreeftmeijer/vim-numbertoggle", event = "BufEnter" }, -- auto-hiding colorcolumn { "m4xshen/smartcolumn.nvim", - event = "VeryLazy", + event = "BufEnter", opts = { colorcolumn = { "100" }, scope = "window", @@ -79,7 +79,20 @@ return { user_default_options = { mode = "virtualtext" }, }) end, - event = "VeryLazy", + cmd = { + "ColorizerToggle", + "ColorizerAttachToBuffer", + "ColorizerDetachFromBuffer", + "ColorizerReloadAllBuffers", + }, + keys = { + { "sc", "ColorizerToggle", { silent = true, desc = "toggle colorizer" } }, + { + "sC", + 'lua require("colorizer").attach_to_buffer(0, {mode = "background"} )', + { silent = true, desc = "colorize background" }, + }, + }, }, { "jiaoshijie/undotree",