diff --git a/home/.config/nvim/ftplugin/java.lua b/home/.config/nvim/ftplugin/java.lua
index 0ec274e..57bbb39 100644
--- a/home/.config/nvim/ftplugin/java.lua
+++ b/home/.config/nvim/ftplugin/java.lua
@@ -1,7 +1,7 @@
 local nvim_local_dir = vim.fn.expand('~/.local/share/nvim')
-
 local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t')
 local workspace_dir = nvim_local_dir .. '/jdtls-workspaces/' .. project_name
+
 require('jdtls').start_or_attach({
     cmd = {
         'java', '-Declipse.application=org.eclipse.jdt.ls.core.id1',
@@ -10,10 +10,11 @@ require('jdtls').start_or_attach({
         '-Dlog.protocol=true', '-Dlog.level=ALL', '-Xms1g',
         '--add-modules=ALL-SYSTEM', '--add-opens',
         'java.base/java.util=ALL-UNNAMED', '--add-opens',
-        'java.base/java.lang=ALL-UNNAMED', -- 💀
-        '-jar', nvim_local_dir ..
+        'java.base/java.lang=ALL-UNNAMED', '-jar', nvim_local_dir ..
             '/lsp_servers/jdtls/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar',
         '-configuration', nvim_local_dir .. '/lsp_servers/jdtls/config_linux',
         '-data', workspace_dir
     }
 })
+
+require('pluginconf.lsp').Lsp_map_keys('jdtls', nil)
diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua
index 6c2b431..82192fd 100644
--- a/home/.config/nvim/lua/pluginconf/lsp.lua
+++ b/home/.config/nvim/lua/pluginconf/lsp.lua
@@ -1,47 +1,45 @@
 local lsp_installer = require("nvim-lsp-installer")
 
-local buf_map_keys = function(server_name, bufnr)
-    local function buf_set_keymap(...)
-        vim.api.nvim_buf_set_keymap(bufnr, ...)
+Lsp_map_keys = function(server, bufnr)
+    print("Lsp_map_keys()")
+    local function map_key(...)
+        -- Map to buffer if buffer number is supplied,
+        -- globally otherwise
+        if bufnr == nil then
+            vim.api.nvim_set_keymap(...)
+        else
+            vim.api.nvim_buf_set_keymap(bufnr, ...)
+        end
     end
 
     local keymapOpts = {noremap = true, silent = true}
-    buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', keymapOpts)
-    buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', '<space>wa',
-                   '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', keymapOpts)
-    buf_set_keymap('n', '<space>wr',
-                   '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', '<space>wl',
-                   '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', '<space>D',
-                   '<cmd>lua vim.lsp.buf.type_definition()<CR>', keymapOpts)
-    buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', '<space>e',
-                   '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.set_loclist()<CR>',
-                   keymapOpts)
-    buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>',
-                   keymapOpts)
+    map_key('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', keymapOpts)
+    map_key('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', keymapOpts)
+    map_key('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', keymapOpts)
+    map_key('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', keymapOpts)
+    map_key('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>',
+            keymapOpts)
+    map_key('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>',
+            keymapOpts)
+    map_key('n', '<space>wr',
+            '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', keymapOpts)
+    map_key('n', '<space>wl',
+            '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>',
+            keymapOpts)
+    map_key('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>',
+            keymapOpts)
+    map_key('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', keymapOpts)
+    map_key('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>',
+            keymapOpts)
+    map_key('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', keymapOpts)
+    map_key('n', '<space>e',
+            '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>',
+            keymapOpts)
+    map_key('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', keymapOpts)
+    map_key('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', keymapOpts)
+    map_key('n', '<space>q', '<cmd>lua vim.diagnostic.set_loclist()<CR>',
+            keymapOpts)
+    map_key('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', keymapOpts)
 end
 
 -- Add additional capabilities supported by nvim-cmp
@@ -80,7 +78,7 @@ lsp_installer.on_server_ready(function(server)
         }
     end
 
-    opts.on_attach = buf_map_keys
+    opts.on_attach = Lsp_map_keys
     opts.capabilities = capabilities
     server:setup(opts)
 end)
diff --git a/home/.config/nvim/src/main/java/com/example/Greeter.java b/home/.config/nvim/src/main/java/com/example/Greeter.java
new file mode 100644
index 0000000..e69de29