diff --git a/nvim/m-housh/lua/autocmd.lua b/nvim/m-housh/lua/autocmd.lua
index 88dd294..5f90782 100644
--- a/nvim/m-housh/lua/autocmd.lua
+++ b/nvim/m-housh/lua/autocmd.lua
@@ -14,3 +14,10 @@ vim.api.nvim_exec([[
   augroup END
   ]], false)
 
+vim.api.nvim_create_autocmd(
+  "BufWritePost",
+  {
+    pattern = { "*.swift" },
+    command=":silent exec '!swift-format --in-place %'"
+  }
+)
diff --git a/nvim/m-housh/lua/plugin-config/lspconfig.lua b/nvim/m-housh/lua/plugin-config/lspconfig.lua
index fe4d632..c9302d7 100644
--- a/nvim/m-housh/lua/plugin-config/lspconfig.lua
+++ b/nvim/m-housh/lua/plugin-config/lspconfig.lua
@@ -53,8 +53,18 @@ return {
     capabilities = require("cmp_nvim_lsp").default_capabilities()
 
     local servers = {
-        "gopls", "bashls", "jedi_language_server", "dockerls", "terraformls",
-        "tsserver", "texlab", "yamlls", "jsonls", "clangd", "sourcekit"
+        "bashls",
+        "clangd",
+        "dockerls",
+        "gopls",
+        "jsonls",
+        "jedi_language_server",
+        "lua_ls",
+        "sourcekit",
+        "terraformls",
+        "tsserver",
+        "texlab",
+        "yamlls",
     }
     for _, lsp in ipairs(servers) do
         nvim_lsp[lsp].setup {
@@ -62,6 +72,12 @@ return {
             capabilities = capabilities,
             settings = {
                 gopls = {analyses = {unusedparams = false}, staticcheck = true},
+                lua_ls = {
+                  Lua = {
+                    workspace = { checkThirdParty = false },
+                    telemetry = { enable = false },
+                  }
+                },
                 json = {
                     format = {enabled = false},
                     schemas = {
diff --git a/nvim/m-housh/lua/plugin-config/treesitter.lua b/nvim/m-housh/lua/plugin-config/treesitter.lua
index e6c8c98..e78824b 100644
--- a/nvim/m-housh/lua/plugin-config/treesitter.lua
+++ b/nvim/m-housh/lua/plugin-config/treesitter.lua
@@ -4,6 +4,7 @@ return {
     'nvim-telescope/telescope-fzf-native.nvim',
     'nvim-treesitter/nvim-treesitter-textobjects',
   },
+  build = ':TSUpdate',
   config = function()
     require('nvim-treesitter.configs').setup {
       ensure_installed = {