diff --git a/init.lua b/init.lua index 39b2e9b0..d7b09e64 100644 --- a/init.lua +++ b/init.lua @@ -627,7 +627,7 @@ require('lazy').setup({ -- https://github.com/pmizio/typescript-tools.nvim -- -- But for many setups, the LSP (`ts_ls`) will work just fine - -- ts_ls = {}, + ts_ls = {}, -- lua_ls = { @@ -664,6 +664,7 @@ require('lazy').setup({ vim.list_extend(ensure_installed, { 'stylua', -- Used to format Lua code 'jdtls', + 'prettier', }) require('mason-tool-installer').setup { ensure_installed = ensure_installed } local cmp = require 'cmp' @@ -673,9 +674,7 @@ require('lazy').setup({ [''] = cmp.mapping.scroll_docs(4), }, } - Global = {} - Global.lspCapabilities = vim.lsp.protocol.make_client_capabilities() - Global.lspCapabilities.textDocument.completion.completionItem.resolveSupport.properties = { + capabilities.textDocument.completion.completionItem.resolveSupport.properties = { 'documentation', 'detail', 'additionalTextEdits', @@ -716,7 +715,7 @@ require('lazy').setup({ }, }, }, - capabilities = Global.lspCapabilities, + capabilities = capabilities, } end, }, @@ -762,7 +761,7 @@ require('lazy').setup({ -- python = { "isort", "black" }, -- -- You can use 'stop_after_first' to run the first available formatter from the list - -- javascript = { "prettierd", "prettier", stop_after_first = true }, + javascript = { 'prettierd', 'prettier', 'prettierrc', stop_after_first = true }, }, }, }, @@ -947,7 +946,24 @@ require('lazy').setup({ main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'java' }, + ensure_installed = { + 'bash', + 'c', + 'diff', + 'html', + 'lua', + 'luadoc', + 'markdown', + 'markdown_inline', + 'query', + 'vim', + 'vimdoc', + 'java', + 'javascript', + 'typescript', + 'yaml', + 'css', + }, -- Autoinstall languages that are not installed auto_install = true, highlight = { @@ -980,7 +996,7 @@ require('lazy').setup({ -- require 'kickstart.plugins.indent_line', -- require 'kickstart.plugins.lint', require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.neo-tree', -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` @@ -989,7 +1005,7 @@ require('lazy').setup({ -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. { import = 'custom.plugins' }, - vim.keymap.set('n', '|', ':Neotree reveal', { desc = 'Toggle Neotree window', silent = true }), + -- vim.keymap.set('n', '|', ':Neotree reveal', { desc = 'Toggle Neotree window', silent = true }), -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/lazy-lock.json b/lazy-lock.json index 8de8583f..4c62cd28 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -32,6 +32,7 @@ "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "tokyonight.nvim": { "branch": "main", "commit": "84ea0b5f4651afdf50ececaf6f110fe9d9dc9458" }, + "typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } } diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 63d94f8d..be0eb9d8 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,15 +2,4 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return { - { - 'nvim-neo-tree/neo-tree.nvim', - branch = 'v3.x', - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended - 'MunifTanjim/nui.nvim', - -- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information - }, - }, -} +return {} diff --git a/lua/custom/plugins/typescript-tools.lua b/lua/custom/plugins/typescript-tools.lua new file mode 100644 index 00000000..36800207 --- /dev/null +++ b/lua/custom/plugins/typescript-tools.lua @@ -0,0 +1,7 @@ +return { + { + 'pmizio/typescript-tools.nvim', + dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' }, + opts = {}, + }, +}