diff --git a/lua/dot013/plugins/ide.lua b/lua/dot013/plugins/ide.lua index b28e879..06c761e 100644 --- a/lua/dot013/plugins/ide.lua +++ b/lua/dot013/plugins/ide.lua @@ -197,6 +197,16 @@ return { event = { "BufReadPre", "BufNewFile" }, }, + -- Tailwind integration + { + "tailwind-tools.nvim", + after = function() + -- TODO: Fork the project to remove root_dir clauses in LSP config, + -- since Tailwind v4 doesn't use tailwind.config.js + require("tailwind-tools").setup() + end + }, + -- File explorer { -- (Probably can be replaced by local functions in the config) diff --git a/lua/dot013/plugins/lsp.lua b/lua/dot013/plugins/lsp.lua index f78af48..8e4e163 100644 --- a/lua/dot013/plugins/lsp.lua +++ b/lua/dot013/plugins/lsp.lua @@ -44,7 +44,6 @@ local lsps = { single_file_support = true, root_dir = nil, }, - ["tailwindcss"] = {}, ["ts_ls"] = {}, ["rust_analyzer"] = {}, } diff --git a/lua/dot013/plugins/navigation.lua b/lua/dot013/plugins/navigation.lua index 5fd5440..f3808d5 100644 --- a/lua/dot013/plugins/navigation.lua +++ b/lua/dot013/plugins/navigation.lua @@ -5,7 +5,7 @@ return { cmd = { "Telescope", }, - dep_of = { "harpoon2" }, + dep_of = { "harpoon2", "tailwind-tools.nvim" }, keys = { { "", @@ -24,7 +24,7 @@ return { end, desc = "[Telescope] Find in current buffer", }, - { "fr", ":lua require('telescope.builtin').oldfiles()", desc = "[Telescope] Find recent files" }, + { "fr", ":lua require('telescope.builtin').oldfiles()", desc = "[Telescope] Find recent files" }, { "ff", function() @@ -43,9 +43,9 @@ return { end, desc = "[Telescope] Find files", }, - { "fw", ":lua require('telescope.builtin').grep_string()", desc = "[Telescope] Find word" }, - { "fw", "Telescope live_grep", desc = "[Telescope] Find word in all files" }, - { "fs", ":lua require('telescope.builtin').resume()", desc = "[Telescope] Resume search" }, + { "fw", ":lua require('telescope.builtin').grep_string()", desc = "[Telescope] Find word" }, + { "fw", "Telescope live_grep", desc = "[Telescope] Find word in all files" }, + { "fs", ":lua require('telescope.builtin').resume()", desc = "[Telescope] Resume search" }, }, after = function() require("telescope").setup() @@ -136,10 +136,10 @@ return { { "tmux.nvim", keys = { - { "", ":lua require('tmux').move_left()", desc = "[Tmux] Move to left pane" }, + { "", ":lua require('tmux').move_left()", desc = "[Tmux] Move to left pane" }, { "", ":lua require('tmux').move_bottom()", desc = "[Tmux] Move to bottom pane" }, - { "", ":lua require('tmux').move_top()", desc = "[Tmux] Move to top pane" }, - { "", ":lua require('tmux').move_right()", desc = "[Tmux] Move to right pane" }, + { "", ":lua require('tmux').move_top()", desc = "[Tmux] Move to top pane" }, + { "", ":lua require('tmux').move_right()", desc = "[Tmux] Move to right pane" }, }, after = function() require("tmux").setup() diff --git a/package.nix b/package.nix index 09d1f9c..46953aa 100644 --- a/package.nix +++ b/package.nix @@ -47,6 +47,7 @@ nvim-nio nvim-ts-autotag nvim-web-devicons + tailwind-tools-nvim telescope-nvim telescope-fzf-native-nvim trouble-nvim