diff --git a/symlinks/config/nvim/after/ftplugin/java.vim b/symlinks/config/nvim/after/ftplugin/java.vim
new file mode 100644
index 0000000..fde9e0f
--- /dev/null
+++ b/symlinks/config/nvim/after/ftplugin/java.vim
@@ -0,0 +1,4 @@
+augroup lsp
+	au!
+	au FileType java lua require('jdtls').start_or_attach({cmd = {'jdtls-startup.sh'}; on_attach = require'lsp.servers'.jdtls_on_attach})
+augroup end
diff --git a/symlinks/config/nvim/lua/lsp/jdtls.lua b/symlinks/config/nvim/lua/lsp/jdtls.lua
new file mode 100644
index 0000000..e69de29
diff --git a/symlinks/config/nvim/lua/lsp/servers.lua b/symlinks/config/nvim/lua/lsp/servers.lua
index 1ca0fd5..ad2b319 100644
--- a/symlinks/config/nvim/lua/lsp/servers.lua
+++ b/symlinks/config/nvim/lua/lsp/servers.lua
@@ -25,7 +25,7 @@ local on_attach = function(client, bufnr)
 end
 
 -- Lsp default language servers
-local servers = { "bashls", "clangd", "jsonls", "pyright", "rust_analyzer", "kotlin_language_server", "vimls", "clojure_lsp", "gopls", "gdscript" }
+local servers = { "bashls", "clangd", "jsonls", "pyright", "rust_analyzer", "kotlin_language_server", "vimls", "clojure_lsp", "gopls", "gdscript", "tsserver" }
 for _, lsp in ipairs(servers) do
   lspconfig[lsp].setup { on_attach = on_attach }
 end
@@ -54,7 +54,8 @@ lspconfig.omnisharp.setup {
 }
 
 -- JDTLS (Java)
-local jdstls_on_attach = function(client, bufnr)
+-- Can't be local currently, because autocommand has to be used
+jdtls_on_attach = function(client, bufnr)
 	local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
   local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
 
@@ -67,8 +68,3 @@ local jdstls_on_attach = function(client, bufnr)
 	buf_set_keymap('n', '<A-CR>', "<cmd>lua require('jdtls').code_action()<CR>", default_opts)
 	buf_set_keymap('n', '<Leader>ac', "<cmd>lua require('jdtls').code_action()<CR>", default_opts)
 end
-
-require('jdtls').start_or_attach {
-  cmd = {'jdtls-startup.sh'};
-  on_attach = jdstls_on_attach;
-}
diff --git a/symlinks/config/nvim/lua/plugin/dap.lua b/symlinks/config/nvim/lua/plugin/dap.lua
index 918109a..1e369ec 100644
--- a/symlinks/config/nvim/lua/plugin/dap.lua
+++ b/symlinks/config/nvim/lua/plugin/dap.lua
@@ -22,6 +22,24 @@ dap.configurations.python = {
   },
 }
 
+local netcoredbg_bin = vim.fn.glob('$HOME') .. "/dap/netcoredbg/netcoredbg"
+dap.adapters.netcoredbg = {
+  type = 'executable',
+  command = netcoredbg_bin,
+  args = {'--interpreter=vscode'}
+}
+
+dap.configurations.cs = {
+  {
+    type = "netcoredbg",
+    name = "launch - netcoredbg",
+    request = "launch",
+    program = function()
+        return vim.fn.input('Path to dll', vim.fn.getcwd() .. '/bin/Debug/', 'file')
+    end,
+  },
+}
+
 -- Nvim DAP Treesitter integration
 vim.g.dap_virtual_text = true