diff --git a/lua/taken/plugins/colors.lua b/lua/taken/plugins/colors.lua index 82b3048..0482c16 100644 --- a/lua/taken/plugins/colors.lua +++ b/lua/taken/plugins/colors.lua @@ -1,5 +1,16 @@ --- @type LazyPluginSpec[] return { + { + "b0o/lavi.nvim", + dependencies = { "rktjmp/lush.nvim" }, + priority = 1000, + event = "User ThemeSwitcher", + }, + { + "pauchiner/pastelnight.nvim", + priority = 1000, + event = "User ThemeSwitcher", + }, { "JoosepAlviste/palenightfall.nvim", priority = 1000, diff --git a/lua/taken/plugins/lsp/ts-tools.lua b/lua/taken/plugins/lsp/ts-tools.lua index c6c24b6..df03190 100644 --- a/lua/taken/plugins/lsp/ts-tools.lua +++ b/lua/taken/plugins/lsp/ts-tools.lua @@ -5,11 +5,13 @@ return { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig", "hrsh7th/cmp-nvim-lsp", + "dmmulroy/ts-error-translator.nvim", }, event = { "BufReadPre", "BufNewFile" }, config = function() local typescript_tools = require("typescript-tools") local cmp_nvim_lsp = require("cmp_nvim_lsp") + local tserrortranslator = require("ts-error-translator") local on_attach = require("taken.utils.on_attach") local capabilities = cmp_nvim_lsp.default_capabilities() @@ -62,5 +64,7 @@ return { }, }, }) + + tserrortranslator.setup() end, } diff --git a/lua/taken/plugins/nvim-cmp.lua b/lua/taken/plugins/nvim-cmp.lua index 283fd03..3da7d72 100644 --- a/lua/taken/plugins/nvim-cmp.lua +++ b/lua/taken/plugins/nvim-cmp.lua @@ -17,7 +17,7 @@ return { local luasnip = require("luasnip") local lspkind = require("lspkind") - require("luasnip/loaders/from_vscode").lazy_load() + require("luasnip/loaders/from_vscode").lazy_load({ paths = { "~/.snippets/" } }) vim.opt.completeopt = "menu,menuone,noselect" @@ -53,18 +53,18 @@ return { documentation = cmp.config.window.bordered(), }, mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.select_prev_item(), -- previous suggestion - [""] = cmp.mapping.select_next_item(), -- next suggestion - [""] = cmp.mapping.complete(), -- show completion suggestions + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.complete(), [""] = cmp.mapping.confirm({ select = false }), [""] = nil, [""] = nil, }), sources = cmp.config.sources({ - { name = "nvim_lsp" }, -- lsp - { name = "luasnip" }, -- snippets - { name = "buffer" }, -- text within current buffer - { name = "path" }, -- file system paths + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "buffer" }, + { name = "path" }, }), formatting = { format = lspkind.cmp_format({ diff --git a/lua/taken/plugins/otherplugins.lua b/lua/taken/plugins/otherplugins.lua index e87972d..3da33b5 100644 --- a/lua/taken/plugins/otherplugins.lua +++ b/lua/taken/plugins/otherplugins.lua @@ -1,5 +1,28 @@ --- @type LazyPluginSpec[] return { + { + "chrisgrieser/nvim-scissors", + dependencies = "nvim-telescope/telescope.nvim", + config = function() + local scissors = require("scissors") + + scissors.setup({ + snippetDir = "~/.snippets/", + editSnippetPopup = { + keymaps = { + deleteSnippet = "", + duplicateSnippet = "", + }, + }, + }) + end, + }, + { + "zeioth/garbage-day.nvim", + dependencies = "neovim/nvim-lspconfig", + event = "VeryLazy", + config = true, + }, { "wakatime/vim-wakatime", name = "Wakatime",