diff --git a/symlinks/config/nvim/after/ftplugin/java.lua b/symlinks/config/nvim/after/ftplugin/java.lua
new file mode 100644
index 0000000..877483a
--- /dev/null
+++ b/symlinks/config/nvim/after/ftplugin/java.lua
@@ -0,0 +1,4 @@
+require('jdtls').start_or_attach {
+  cmd = {'jdtls-startup.sh'};
+  on_attach = require'lsp.servers'.jdtls_on_attach;
+}
diff --git a/symlinks/config/nvim/after/ftplugin/java.vim b/symlinks/config/nvim/after/ftplugin/java.vim
deleted file mode 100644
index fde9e0f..0000000
--- a/symlinks/config/nvim/after/ftplugin/java.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index e69de29..0000000
diff --git a/symlinks/config/nvim/lua/lsp/servers.lua b/symlinks/config/nvim/lua/lsp/servers.lua
index ad2b319..fe152ec 100644
--- a/symlinks/config/nvim/lua/lsp/servers.lua
+++ b/symlinks/config/nvim/lua/lsp/servers.lua
@@ -16,6 +16,7 @@ local on_attach = function(client, bufnr)
 	buf_set_keymap('n', '<C-]>', '<cmd>lua vim.lsp.buf.definition()<CR>', default_opts)
 	buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', default_opts)
 	buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', default_opts)
+	buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', default_opts)
 	buf_set_keymap('n', '<Leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', default_opts)
 	buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', default_opts)
 	buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', default_opts)
@@ -68,3 +69,7 @@ jdtls_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
+
+return {
+	jdtls_on_attach = jdtls_on_attach
+}