diff --git a/_config/nvim/plugin/lsp.lua b/_config/nvim/plugin/lsp.lua
index 04514f6..9824bf3 100644
--- a/_config/nvim/plugin/lsp.lua
+++ b/_config/nvim/plugin/lsp.lua
@@ -1,3 +1,5 @@
+vim.diagnostic.config({ virtual_text = true })
+
 local lsp = require('lsp-zero').preset({})
 
 lsp.on_attach(function(client, bufnr)
@@ -27,6 +29,13 @@ cmp.setup({
   }
 })
 
+<<<<<<< HEAD
+=======
+lsp.ensure_installed({
+    'ts_ls',
+})
+
+>>>>>>> ca495fe (nvim: Better typescript support)
 local null_ls = require('null-ls')
 local null_opts = lsp.build_options('null-ls', {})
 
diff --git a/_config/nvim/plugin/typescript.lua b/_config/nvim/plugin/typescript.lua
new file mode 100644
index 0000000..1de5302
--- /dev/null
+++ b/_config/nvim/plugin/typescript.lua
@@ -0,0 +1,8 @@
+local lspconfig = require('lspconfig')
+
+lspconfig.ts_ls.setup({
+  on_attach = function(client, bufnr)
+    -- Disable tsserver formatting if using prettier/eslint
+    client.server_capabilities.documentFormattingProvider = true
+  end,
+})