diff options
-rw-r--r-- | nvim/.config/nvim/lazy-lock.json | 2 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins.lua | 17 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua | 15 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/crates.lua | 8 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua | 1 |
5 files changed, 18 insertions, 25 deletions
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 09a70e7..1b50f2e 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -8,7 +8,6 @@ "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, "cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" }, "cmp-git": { "branch": "main", "commit": "fae6cdb407ad6c63a0b1928670bad1a67a55b887" }, - "cmp-latex-symbols": { "branch": "main", "commit": "1ec2e4f47cde6c7ffcebec92cfec58ddc1f6689a" }, "cmp-npm": { "branch": "main", "commit": "4b6166c3feeaf8dae162e33ee319dc5880e44a29" }, "cmp-nvim-lsp": { "branch": "main", "commit": "59224771f91b86d1de12570b4070fe4ad7cd1eeb" }, "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "069a207be6a0327dcc62c957dbb38156b210733a" }, @@ -59,7 +58,6 @@ "ripgrep": { "branch": "master", "commit": "61101289fabc032fd8e90009c41d0b78e6dfc9a2" }, "rust-tools.nvim": { "branch": "master", "commit": "99fd1238c6068d0637df30b6cee9a264334015e9" }, "scope.nvim": { "branch": "main", "commit": "2db6d31de8e3a98d2b41c0f0d1f5dc299ee76875" }, - "surround.nvim": { "branch": "master", "commit": "36c253d6470910692491b13382f54c9bab2811e1" }, "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "706320d22160305c9f0d5f9b54e9dded73134396" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "fab3e2212e206f4f8b3bbaa656e129443c9b802e" }, diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua index d7c937b..63650d2 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua @@ -15,28 +15,11 @@ return { config = true, }, { - "petertriho/cmp-git", - event = "VeryLazy", - dependencies = { "nvim-lua/plenary.nvim" }, - config = true, - }, - { - "David-Kunz/cmp-npm", - event = "BufRead package.json", - dependencies = { "nvim-lua/plenary.nvim" }, - config = true, - }, - { "nvim-treesitter/nvim-treesitter-context", event = "BufReadPre", config = true, }, { - "ur4ltz/surround.nvim", - event = "VeryLazy", - config = true, - }, - { "numToStr/Comment.nvim", event = "VeryLazy", config = true, diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua b/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua index b5961c8..f3aabac 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua @@ -9,11 +9,19 @@ local M = { "hrsh7th/cmp-nvim-lsp-signature-help", "hrsh7th/cmp-nvim-lua", "hrsh7th/cmp-cmdline", - "petertriho/cmp-git", "Dosx001/cmp-commit", "davidsierradz/cmp-conventionalcommits", - "saecki/crates.nvim", - "kdheepak/cmp-latex-symbols", + { + "petertriho/cmp-git", + ft = "gitcommit", + dependencies = { "nvim-lua/plenary.nvim" }, + config = true, + }, + { + "David-Kunz/cmp-npm", + dependencies = { "nvim-lua/plenary.nvim" }, + config = true, + }, }, } @@ -76,7 +84,6 @@ function M.config() cmp.setup.filetype({ "tex", "bib", "markdown" }, { sources = { - { name = "latex_symbols" }, { name = "buffer", keyword_length = 3 }, }, }) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/crates.lua b/nvim/.config/nvim/lua/tobyvin/plugins/crates.lua index b23ca29..8879e89 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/crates.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/crates.lua @@ -3,13 +3,11 @@ local M = { event = "BufRead Cargo.toml", dependencies = { "nvim-lua/plenary.nvim", - "jose-elias-alvarez/null-ls.nvim", }, } function M.config() local crates = require("crates") - local utils = require("tobyvin.utils") crates.setup({ @@ -18,6 +16,12 @@ function M.config() }, }) + require("cmp").setup.filetype("toml", { + sources = { + { name = "crates" }, + }, + }) + vim.api.nvim_create_autocmd("LspAttach", { group = vim.api.nvim_create_augroup("tobyvin_crates", { clear = true }), pattern = "*/Cargo.toml", diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua index 51e7308..fc64b50 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua @@ -1,5 +1,6 @@ local M = { "jose-elias-alvarez/null-ls.nvim", + event = "BufReadPre", dependencies = { "nvim-lua/plenary.nvim", }, |