diff --git a/nvim/ftplugin/java.lua b/nvim/ftplugin/java.lua
index 8f05e69..8e0fee1 100644
--- a/nvim/ftplugin/java.lua
+++ b/nvim/ftplugin/java.lua
@@ -43,9 +43,9 @@ require('jdtls').start_or_attach({
                 organizeImports = true
             },
             signatureHelp = {
-                enabled = false,
+                enabled = true,
                 description = {
-                    enabled = false
+                    enabled = true
                 },
             },
             format = {
@@ -55,7 +55,6 @@ require('jdtls').start_or_attach({
                 },
             },
             codeGeneration = {
-                --generateComments = true,
                 insertionLocation = 'lastMember',
                 hashCodeEquals = {
                     useInstanceof = true,
diff --git a/nvim/init.vim b/nvim/init.vim
index 4e10895..db70da4 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -45,4 +45,11 @@ autocmd CompleteDone * pclose
 " LSP config
 lua <<EOF
     require("config.lazy")
+
+    vim.o.scrolloff = 4;
+
+    vim.diagnostic.config({
+        virtual_text = true,
+        severity_sort = true,
+    })
 EOF
diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua
index 886e80f..5469c45 100644
--- a/nvim/lua/plugins/cmp.lua
+++ b/nvim/lua/plugins/cmp.lua
@@ -1,7 +1,6 @@
 return {
     "hrsh7th/nvim-cmp",
     lazy = true,
-    ft = { "java", "go", "python", "html" },
     event = "InsertEnter",
     dependencies = {
         "hrsh7th/cmp-buffer",
@@ -16,10 +15,8 @@ return {
                 ["<C-f>"] = cmp.mapping.scroll_docs(4),
                 ["<C-Space>"] = cmp.mapping.complete(),
                 ["<C-e>"] = cmp.mapping.close(),
-                ["<CR>"] = cmp.mapping.confirm({
-                    behavior = cmp.ConfirmBehavior.Replace,
-                    select = true,
-                }),
+                -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+                ['<CR>'] = cmp.mapping.confirm({ select = false }),
             }),
             sources = cmp.config.sources({
                 { name = "nvim_lsp" },
diff --git a/nvim/lua/plugins/dap-python.lua b/nvim/lua/plugins/dap-python.lua
deleted file mode 100644
index 92bbe8c..0000000
--- a/nvim/lua/plugins/dap-python.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-    "https://codeberg.org/mfussenegger/nvim-dap-python",
-    dependencies = {
-        "https://codeberg.org/mfussenegger/nvim-dap",
-    },
-    lazy = true,
-    ft = { "python" },
-    config = function()
-        require('dap-python').setup()
-    end,
-}
diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index 53cdab8..9803cc5 100644
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -53,9 +53,6 @@ return {
             }
         })
 
-        -- Gradle
-        --vim.lsp.enable('gradle_ls')
-
         -- HTML
         vim.lsp.enable('html')
 
@@ -122,6 +119,7 @@ return {
             vim.lsp.buf.format({async = false})
           end
         })
+        vim.lsp.enable('gopls')
 
         -- PHP
         vim.lsp.enable('phpactor')
diff --git a/nvim/lua/plugins/sonarlint.lua b/nvim/lua/plugins/sonarlint.lua
index 386d372..8f7c2cf 100644
--- a/nvim/lua/plugins/sonarlint.lua
+++ b/nvim/lua/plugins/sonarlint.lua
@@ -22,10 +22,6 @@ return {
                             disableTelemetry = true,
                             focusOnNewCode = true,
                             showAnalyzerLogs = true,
-                            rules = {
-                                ['java:S1192'] = { level = 'off' },
-                                ['go:S1192'] = { level = 'off' },
-                            },
                         },
                     },
                 },