diff --git a/after/plugin/lsp-config.lua b/after/plugin/lsp-config.lua index ba0414df..cbe031e2 100644 --- a/after/plugin/lsp-config.lua +++ b/after/plugin/lsp-config.lua @@ -17,8 +17,8 @@ vim.lsp.enable 'dartls' -- vim.lsp.enable 'jsonls' -- vim.lsp.enable 'html' -vim.lsp.enable 'tsserver' -vim.lsp.enable 'eslint' +vim.lsp.enable 'ts_ls' +-- vim.lsp.enable 'eslint' -- vim.lsp.enable 'tsserver' vim.lsp.enable 'tailwindcss' diff --git a/nvim-java-config.lua b/after/plugin/nvim-java-config.lua similarity index 100% rename from nvim-java-config.lua rename to after/plugin/nvim-java-config.lua diff --git a/after/plugin/tailwind-tool-config.lua b/after/plugin/tailwind-tool-config.lua new file mode 100644 index 00000000..a8552505 --- /dev/null +++ b/after/plugin/tailwind-tool-config.lua @@ -0,0 +1,3 @@ +require("tailwind-tools").setup({ + +}) diff --git a/lazy-lock.json b/lazy-lock.json index a71f3255..f547ce7e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -46,10 +46,9 @@ "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" }, - "tailwind-tools.nvim": { "branch": "master", "commit": "fbe982901d4508b0dcd80e07addf0fcb6dab6c49" }, + "tailwind-tools": { "branch": "master", "commit": "fbe982901d4508b0dcd80e07addf0fcb6dab6c49" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "typescript-tools.nvim": { "branch": "master", "commit": "3c501d7c7f79457932a8750a2a1476a004c5c1a9" }, "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" }, "vi-mongo.nvim": { "branch": "master", "commit": "ac21b4de10b9409c872e81a34b41cee52bf7174c" }, "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" }, diff --git a/lua/plugins/nvim-cmp.lua b/lua/plugins/nvim-cmp.lua index b4785a86..443e97bc 100644 --- a/lua/plugins/nvim-cmp.lua +++ b/lua/plugins/nvim-cmp.lua @@ -3,7 +3,7 @@ return { { 'hrsh7th/nvim-cmp', dependencies = { - -- 'luckasRanarison/tailwind-tools.nvim', + 'tailwind-tools', 'onsails/lspkind-nvim', -- Snippet Engine & its associated nvim-cmp source 'L3MON4D3/LuaSnip', @@ -15,12 +15,11 @@ return { }, opts = function() return { - -- ... - -- formatting = { - -- format = require('lspkind').cmp_format { - -- before = require('tailwind-tools.cmp').lspkind_format, - -- }, - -- }, + formatting = { + format = require('lspkind').cmp_format { + before = require('tailwind-tools.cmp').lspkind_format, + }, + }, } end, }, diff --git a/lua/plugins/tailwind-tools.lua b/lua/plugins/tailwind-tools.lua new file mode 100644 index 00000000..e435d615 --- /dev/null +++ b/lua/plugins/tailwind-tools.lua @@ -0,0 +1,11 @@ +return { + "luckasRanarison/tailwind-tools.nvim", + name = "tailwind-tools", + build = ":UpdateRemotePlugins", + dependencies = { + "nvim-treesitter/nvim-treesitter", + "nvim-telescope/telescope.nvim", -- optional + "neovim/nvim-lspconfig", -- optional + }, + opts = {} -- your configuration +}