diff --git a/pkgs/nvchad/nvim/lua/configs/lspconfig.lua b/pkgs/nvchad/nvim/lua/configs/lspconfig.lua
index 3bb09c1..674c336 100644
--- a/pkgs/nvchad/nvim/lua/configs/lspconfig.lua
+++ b/pkgs/nvchad/nvim/lua/configs/lspconfig.lua
@@ -4,33 +4,11 @@ local capabilities = configs.capabilities
 
 local lspconfig = require("lspconfig")
 
-local servers = { "tsserver", "tailwindcss", "eslint", "gopls" }
-
-local function organize_imports()
-	local params = {
-		command = "_typescript.organizeImports",
-		arguments = { vim.api.nvim_buf_get_name(0) },
-		title = "",
-	}
-	vim.lsp.buf.execute_command(params)
-end
+local servers = { "tailwindcss", "eslint", "gopls" }
 
 for _, lsp in ipairs(servers) do
-	if lsp == "tsserver" then
-		lspconfig[lsp].setup({
-			on_attach = on_attach,
-			capabilities = capabilities,
-			commands = {
-				OrganizeImports = {
-					organize_imports,
-					description = "Organize Imports",
-				},
-			},
-		})
-	else
-		lspconfig[lsp].setup({
-			on_attach = on_attach,
-			capabilities = capabilities,
-		})
-	end
+  lspconfig[lsp].setup({
+    on_attach = on_attach,
+    capabilities = capabilities,
+  })
 end
diff --git a/pkgs/nvchad/nvim/lua/configs/overrides.lua b/pkgs/nvchad/nvim/lua/configs/overrides.lua
index 635ebe0..044c551 100644
--- a/pkgs/nvchad/nvim/lua/configs/overrides.lua
+++ b/pkgs/nvchad/nvim/lua/configs/overrides.lua
@@ -1,65 +1,64 @@
 local M = {}
 
 M.treesitter = {
-	ensure_installed = {
-		-- defaults
-		"vim",
-		"lua",
+  ensure_installed = {
+    -- defaults
+    "vim",
+    "lua",
 
-		-- web dev
-		"html",
-		"css",
-		"javascript",
-		"typescript",
-		"tsx",
+    -- web dev
+    "html",
+    "css",
+    "javascript",
+    "typescript",
+    "tsx",
 
-		-- nix
-		"nix",
+    -- nix
+    "nix",
 
-		-- go
-		"go",
-		"gomod",
-		"gowork",
-		"gosum",
-	},
+    -- go
+    "go",
+    "gomod",
+    "gowork",
+    "gosum",
+  },
 }
 
 M.mason = {
-	ensure_installed = {
-		-- defaults
-		"lua-language-server",
-		"stylua",
-		"luacheck",
+  ensure_installed = {
+    -- defaults
+    "lua-language-server",
+    "stylua",
+    "luacheck",
 
-		-- web dev
-		"css-lsp",
-		"html-lsp",
-		"prettierd",
-		"eslint-lsp",
-		"eslint_d",
-		"typescript-language-server",
-		"tailwindcss-language-server",
+    -- web dev
+    "css-lsp",
+    "html-lsp",
+    "prettierd",
+    "eslint-lsp",
+    "eslint_d",
+    "tailwindcss-language-server",
 
-		-- nix
-		"nil",
+    -- nix
+    "nil",
 
-		-- go
-		"gopls",
-		"goimports",
-		"gofumpt",
-		"gomodifytags",
-		"impl",
-		"iferr",
-		"staticcheck",
-		"delve",
-	},
+    -- go
+    "gopls",
+    "goimports",
+    "gofumpt",
+    "gomodifytags",
+    "impl",
+    "iferr",
+    "staticcheck",
+    "delve",
+  },
 }
 
 M.telescope = {
-	defaults = {
-		winblend = 40,
-		pumblend = 40,
-	},
+  defaults = {
+    winblend = 40,
+    pumblend = 40,
+  },
 }
 
 return M
diff --git a/pkgs/nvchad/nvim/lua/configs/ts.lua b/pkgs/nvchad/nvim/lua/configs/ts.lua
new file mode 100644
index 0000000..2af2738
--- /dev/null
+++ b/pkgs/nvchad/nvim/lua/configs/ts.lua
@@ -0,0 +1,5 @@
+local on_attach = require("nvchad.configs.lspconfig").on_attach
+
+require("typescript-tools").setup({
+  on_attach = on_attach,
+})
diff --git a/pkgs/nvchad/nvim/lua/plugins/init.lua b/pkgs/nvchad/nvim/lua/plugins/init.lua
index c46bae9..0d5817c 100644
--- a/pkgs/nvchad/nvim/lua/plugins/init.lua
+++ b/pkgs/nvchad/nvim/lua/plugins/init.lua
@@ -95,5 +95,20 @@ local plugins = {
     "folke/neodev.nvim",
     event = "VeryLazy",
   },
+
+  -- Language specific plugins
+  {
+    "pmizio/typescript-tools.nvim",
+    dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
+    config = function()
+      require("configs.ts")
+    end,
+    ft = {
+      "javascript",
+      "typescript",
+      "javascriptreact",
+      "typescriptreact",
+    },
+  },
 }
 return plugins