diff --git a/lua/taken/plugins/gitlinker.lua b/lua/taken/plugins/gitlinker.lua index 80c168c..5246048 100644 --- a/lua/taken/plugins/gitlinker.lua +++ b/lua/taken/plugins/gitlinker.lua @@ -1,30 +1,32 @@ +--- @type LazyPluginSpec return { "linrongbin16/gitlinker.nvim", cmd = { "GitLink", }, + enabled = false, keys = { { "gl", - "GitLink!", + "GitLink remote=origin", mode = { "v", "n" }, desc = "Copies git link to highlighted code", }, { "gL", - "GitLink", + "GitLink! remote=origin", mode = { "v", "n" }, desc = "Opens git link to highlighted code", }, { "gb", - "GitLink! blame", + "GitLink blame", mode = { "v", "n" }, desc = "Copies git blame link to highlighted code", }, { "gB", - "GitLink blame", + "GitLink! blame", mode = { "v", "n" }, desc = "Opens git blame link to highlighted code", }, diff --git a/lua/taken/plugins/lsp/ts-tools.lua b/lua/taken/plugins/lsp/ts-tools.lua index 9ab7ebf..d543486 100644 --- a/lua/taken/plugins/lsp/ts-tools.lua +++ b/lua/taken/plugins/lsp/ts-tools.lua @@ -1,56 +1,31 @@ return { "pmizio/typescript-tools.nvim", dependencies = { - "lvimuser/lsp-inlayhints.nvim", "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig", "hrsh7th/cmp-nvim-lsp", }, + ft = { + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + }, config = function() local typescript_tools = require("typescript-tools") local cmp_nvim_lsp = require("cmp_nvim_lsp") - local lsp_inlayhints = require("lsp-inlayhints") local on_attach = require("taken.core.on_attach") local capabilities = cmp_nvim_lsp.default_capabilities() - lsp_inlayhints.setup({}) - - vim.api.nvim_create_augroup("LspAttach_inlayhints", {}) - vim.api.nvim_create_autocmd("LspAttach", { - group = "LspAttach_inlayhints", - callback = function(args) - if not (args.data and args.data.client_id) then - return - end - - local bufnr = args.buf - local client = vim.lsp.get_client_by_id(args.data.client_id) - require("lsp-inlayhints").on_attach(client, bufnr) - end, - }) - typescript_tools.setup({ capabilities = capabilities, on_attach = on_attach, settings = { tsserver_file_preferences = { - includeInlayParameterNameHints = "all", includeCompletionsForModuleExports = true, quotePreference = "auto", }, - javascript = { - inlayHints = { - includeInlayParameterNameHints = "all", - includeInlayParameterNameHintsWhenArgumentMatchesName = false, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = true, - includeInlayVariableTypeHintsWhenTypeMatchesName = false, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, - }, - }, }, }) end, diff --git a/lua/taken/plugins/toggleterm.lua b/lua/taken/plugins/toggleterm.lua deleted file mode 100644 index 6ef0cc8..0000000 --- a/lua/taken/plugins/toggleterm.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - "akinsho/toggleterm.nvim", - enabled = false, - version = "*", - cmd = "ToggleTerm", - keys = { - { "bt", ":ToggleTerm direction=float ", desc = "Open terminal" }, - { "bT", ":ToggleTerm direction=horizontal ", desc = "Open horizontal terminal split" }, - }, - config = function() - local toggleterm = require("toggleterm") - toggleterm.setup({ - shell = "pwsh.exe -nologo", - start_in_insert = true, - }) - end, -}