diff --git a/lua/autocmd.lua b/lua/autocmd.lua
new file mode 100644
index 0000000..0f01026
--- /dev/null
+++ b/lua/autocmd.lua
@@ -0,0 +1,10 @@
+local autocmd = vim.api.nvim_create_autocmd
+
+autocmd("BufWritePre", {
+  callback = function()
+    local ok = pcall(function()
+      vim.cmd "undojoin"
+    end)
+    vim.cmd "Neoformat"
+  end,
+})
diff --git a/lua/config/lspconfig.lua b/lua/config/lspconfig.lua
index 105adef..3bb5c09 100644
--- a/lua/config/lspconfig.lua
+++ b/lua/config/lspconfig.lua
@@ -42,7 +42,14 @@ require("mason-lspconfig").setup({
     ensure_installed = {
         "lua_ls",
         "rust_analyzer",
-        "gopls",
+        "jdtls",
+        "prettier",
+        "yamlls",
+        "ts_ls",
+        "tailwindcss",
+        "html",
+        "cssls",
+        "shfmt",
     },
     handlers = {
         function(server_name) -- default handler (optional)
diff --git a/lua/config/neoformat.vim b/lua/config/neoformat.vim
new file mode 100644
index 0000000..171480a
--- /dev/null
+++ b/lua/config/neoformat.vim
@@ -0,0 +1 @@
+let g:neoformat_verbose = 1
diff --git a/lua/config/treesitter.lua b/lua/config/treesitter.lua
index 91d0d16..48d4b27 100644
--- a/lua/config/treesitter.lua
+++ b/lua/config/treesitter.lua
@@ -11,13 +11,10 @@ require'nvim-treesitter.configs'.setup {
         disable = {},
     },
     ensure_installed = {
-        "tsx",
+        "jsx",
         "toml",
-        "fish",
-        "php",
         "json",
         "yaml",
-        "swift",
         "css",
         "html",
         "lua"
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 9250eb1..202368a 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -5,6 +5,16 @@ return {
             require("actions-preview")
         end,
     },
+    {
+        "sbdchd/neoformat",
+        init = function()
+            vim.cmd(
+                "source"
+                    .. vim.fn.stdpath "config"
+                    .. "/lua/config/neoformat.vim"
+            )
+        end,
+    },
     {
         "rachartier/tiny-inline-diagnostic.nvim",
         event = "VeryLazy",