diff --git a/.luarc.json b/.luarc.json new file mode 100644 index 0000000..9a371e7 --- /dev/null +++ b/.luarc.json @@ -0,0 +1,7 @@ +{ + "diagnostics.globals": [ + "vim", + "require", + "MiniStatusline" + ] +} \ No newline at end of file diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 7a1f106..f5f9f4c 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -111,44 +111,6 @@ return { -- LSP Configuration & Plugins }, } }) - -- local vue_path = vim.fn.stdpath("data") .. - -- "/mason/packages/vue-language-server/node_modules/@vue/language-server/node_modules/@vue/typescript-plugin" - -- vim.lsp.config('ts_ls', { - -- init_options = { - -- plugins = { - -- { - -- name = "@vue/typescript-plugin", - -- -- location = vim.fn.stdpath("data") .. "/erikcustom/language-tools/packages/typescript-plugin", - -- -- /mason/packages/vue-language-server/node_modules/@vue/language-server/node_modules/@vue/typescript-plugin - -- location = vue_path, - -- languages = { "javascript", "typescript", "vue" }, - -- }, - -- }, - -- settings = { - -- typescript = { - -- tsserver = { - -- useSyntaxServer = false, - -- }, - -- inlayHints = { - -- includeInlayParameterNameHints = 'all', - -- includeInlayParameterNameHintsWhenArgumentMatchesName = true, - -- includeInlayFunctionParameterTypeHints = true, - -- includeInlayVariableTypeHints = true, - -- includeInlayVariableTypeHintsWhenTypeMatchesName = true, - -- includeInlayPropertyDeclarationTypeHints = true, - -- includeInlayFunctionLikeReturnTypeHints = true, - -- includeInlayEnumMemberValueHints = true, - -- }, - -- }, - -- }, - -- - -- }, - -- filetypes = { - -- "javascript", - -- "typescript", - -- "vue", - -- }, - -- }) local vue_language_server_path = vim.fn.expand '$MASON/packages' .. '/vue-language-server' .. '/node_modules/@vue/language-server' @@ -211,8 +173,5 @@ return { -- LSP Configuration & Plugins } } }) - - -- local vue_path = vim.fn.stdpath("data") .. - -- "/mason/packages/vue-language-server/node_modules/@vue/language-server/node_modules/@vue/typescript-plugin" end, } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index b38f330..77f9b45 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -1,27 +1,14 @@ return { - "nvim-telescope/telescope.nvim", tag = "0.1.8", + "nvim-telescope/telescope.nvim", + tag = "0.1.8", dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" }, opts = function() local builtin = require('telescope.builtin') - vim.keymap.set('n', "ff", builtin.find_files, {desc = "[F]ind [F]iles"}) - vim.keymap.set('n', "fg", builtin.live_grep, {desc = "[F]ind [G]rep"}) - vim.keymap.set('n', "fb", builtin.buffers, {desc = "[F]ind [B]uffers"}) - vim.keymap.set('n', "fh", builtin.help_tags, {desc = "[F]ind [H]elp"}) - vim.keymap.set('n', "fd", builtin.diagnostics, {desc = "[F]ind [D]iagnostics"}) - vim.keymap.set('n', "fo", builtin.resume, {desc = "[F]ind [O]Resume"}) + vim.keymap.set('n', "ff", builtin.find_files, { desc = "[F]ind [F]iles" }) + vim.keymap.set('n', "fg", builtin.live_grep, { desc = "[F]ind [G]rep" }) + vim.keymap.set('n', "fb", builtin.buffers, { desc = "[F]ind [B]uffers" }) + vim.keymap.set('n', "fh", builtin.help_tags, { desc = "[F]ind [H]elp" }) + vim.keymap.set('n', "fd", builtin.diagnostics, { desc = "[F]ind [D]iagnostics" }) + vim.keymap.set('n', "fo", builtin.resume, { desc = "[F]ind [O]Resume" }) end, - - -- keys = { - -- { "ff", require("telescope.builtin").find_files, desc = "[F]ind [F]iles" }, - -- { "fg", require("telescope.builtin").live_grep, desc = "[F]ind [G]rep" }, - -- { "fb", require("telescope.builtin").buffers, desc = "[F]ind [B]uffers" }, - -- { "fh", require("telescope.builtin").help_tags, desc = "[F]ind [H]elp" }, - -- { "fd", require("telescope.builtin").diagnostics, desc = "[F]ind [D]iagnostics" }, - -- { "fo", require("telescope.builtin").resume, desc = "[F]ind [O]Resume" }, - -- { - -- "fp", - -- function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, - -- desc = "[F]ind [P]lugin file", - -- }, - -- }, } diff --git a/lua/settings.lua b/lua/settings.lua index d9e88c6..f7c443d 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -62,7 +62,7 @@ vim.diagnostic.config({ }) if vim.g.vscode then - + -- put vscode specific settings / keymaps here else -- Keymaps -- Copy diff --git a/lua/vue.lua b/lua/vue.lua deleted file mode 100644 index 7356405..0000000 --- a/lua/vue.lua +++ /dev/null @@ -1,18 +0,0 @@ -local langtoolpath = vim.fn.stdpath("data") .. "/erikcustom/language-tools" -if not vim.uv.fs_stat(langtoolpath) then - local langtoolrepo = "https://github.com/vuejs/language-tools" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=master", langtoolrepo, langtoolpath }) - - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone language-tools:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end - -end - -