diff --git a/.config/nvim/after/ftplugin/javascript.lua b/.config/nvim/after/ftplugin/javascript.lua
new file mode 100644
index 0000000..b7411e2
--- /dev/null
+++ b/.config/nvim/after/ftplugin/javascript.lua
@@ -0,0 +1,2 @@
+local set = vim.opt_local
+set.shiftwidth = 2
diff --git a/.config/nvim/after/ftplugin/javascriptreact.lua b/.config/nvim/after/ftplugin/javascriptreact.lua
new file mode 100644
index 0000000..b7411e2
--- /dev/null
+++ b/.config/nvim/after/ftplugin/javascriptreact.lua
@@ -0,0 +1,2 @@
+local set = vim.opt_local
+set.shiftwidth = 2
diff --git a/.config/nvim/after/ftplugin/typescript.lua b/.config/nvim/after/ftplugin/typescript.lua
new file mode 100644
index 0000000..b7411e2
--- /dev/null
+++ b/.config/nvim/after/ftplugin/typescript.lua
@@ -0,0 +1,2 @@
+local set = vim.opt_local
+set.shiftwidth = 2
diff --git a/.config/nvim/after/ftplugin/typescriptreact.lua b/.config/nvim/after/ftplugin/typescriptreact.lua
new file mode 100644
index 0000000..b7411e2
--- /dev/null
+++ b/.config/nvim/after/ftplugin/typescriptreact.lua
@@ -0,0 +1,2 @@
+local set = vim.opt_local
+set.shiftwidth = 2
diff --git a/.config/nvim/lua/tsousa/plugins/formatter.lua b/.config/nvim/lua/tsousa/plugins/formatter.lua
index 30a90bb..0e642d9 100644
--- a/.config/nvim/lua/tsousa/plugins/formatter.lua
+++ b/.config/nvim/lua/tsousa/plugins/formatter.lua
@@ -7,6 +7,7 @@ return {
 				python = { "black" },
 				javascript = { "prettierd" },
 				typescript = { "prettierd" },
+				typescriptreact = { "prettierd" },
 				html = { "prettierd" },
 				json = { "prettierd" },
 				yaml = { "prettierd" },
diff --git a/.config/nvim/lua/tsousa/plugins/lint.lua b/.config/nvim/lua/tsousa/plugins/lint.lua
new file mode 100644
index 0000000..3214186
--- /dev/null
+++ b/.config/nvim/lua/tsousa/plugins/lint.lua
@@ -0,0 +1,8 @@
+return {
+-- 	"mfussenegger/nvim-lint",
+-- 	config = function()
+-- 		require("lint").linters_by_ft = {
+-- 			javascript = { "eslint" },
+-- 		}
+-- 	end,
+}
diff --git a/.config/nvim/lua/tsousa/plugins/lsp.lua b/.config/nvim/lua/tsousa/plugins/lsp.lua
index 0ea6c37..cef34a6 100644
--- a/.config/nvim/lua/tsousa/plugins/lsp.lua
+++ b/.config/nvim/lua/tsousa/plugins/lsp.lua
@@ -137,21 +137,21 @@ return {
 		end,
 	},
 
-	-- {
-	-- 	"zbirenbaum/copilot.lua",
-	-- 	event = "InsertEnter",
-	-- 	config = function()
-	-- 		require("copilot").setup({
-	-- 			suggestion = {
-	-- 				enabled = true,
-	-- 				auto_trigger = true,
-	-- 				keymap = {
-	-- 					accept = "<C-q>",
-	-- 				},
-	-- 			},
-	-- 		})
-	-- 	end,
-	-- },
+	{
+		"zbirenbaum/copilot.lua",
+		event = "InsertEnter",
+		config = function()
+			require("copilot").setup({
+				suggestion = {
+					enabled = true,
+					auto_trigger = true,
+					keymap = {
+						accept = "<C-q>",
+					},
+				},
+			})
+		end,
+	},
 	{
 		"neovim/nvim-lspconfig",
 		dependencies = {