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