From 5576aa4f57304b42c8eed6443d8b1a819b086817 Mon Sep 17 00:00:00 2001
From: afranco <afonso@francof.net>
Date: Wed, 4 Jun 2025 12:13:55 +0100
Subject: [PATCH] chore(nvim): cleanup of some old stuff

---
 .config/nvim/lua/plugins/lsp.lua | 38 ++++++++++++++++++++------------
 .config/nvim/lua/plugins/ui.lua  | 36 +++++-------------------------
 2 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index 80f1dbb..91d031c 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -8,18 +8,6 @@ return {
             }
         }
     },
-    {
-        'nvim-java/nvim-java',
-        ft = "java",
-        config = function()
-            require('java').setup()
-            local lspconfig = require("lspconfig")
-            local capabilities = require('blink.cmp').get_lsp_capabilities(nil, true)
-            lspconfig["jdtls"].setup({
-                capabilities = capabilities,
-            })
-        end
-    },
     {
         "smjonas/inc-rename.nvim",
         opts = {
@@ -31,6 +19,28 @@ return {
         event = "VeryLazy",
         opts = {}
     },
+    {
+        "ray-x/go.nvim",
+        dependencies = {
+            "ray-x/guihua.lua",
+            "neovim/nvim-lspconfig",
+            "nvim-treesitter/nvim-treesitter",
+        },
+        config = function(lp, opts)
+            require("go").setup(opts)
+            local format_sync_grp = vim.api.nvim_create_augroup("GoFormat", {})
+            vim.api.nvim_create_autocmd("BufWritePre", {
+                pattern = "*.go",
+                callback = function()
+                    require('go.format').goimports()
+                end,
+                group = format_sync_grp,
+            })
+        end,
+        event = { "CmdlineEnter" },
+        ft = { "go", 'gomod' },
+        build = ':lua require("go.install").update_all_sync()'
+    },
     {
         "neovim/nvim-lspconfig",
         dependencies = {
@@ -50,7 +60,7 @@ return {
                     local conform = require("conform")
 
                     local function jumpWithVirtLineDiags(jumpCount)
-                        pcall(vim.api.nvim_del_augroup_by_name, "jumpWithVirtLineDiags") -- prevent autocmd for repeated jumps
+                        pcall(vim.api.nvim_del_augroup_by_name, "jumpWithVirtLineDiags")
 
                         vim.diagnostic.jump { count = jumpCount }
 
@@ -60,7 +70,7 @@ return {
                             virtual_lines = { current_line = true },
                         }
 
-                        vim.defer_fn(function() -- deferred to not trigger by jump itself
+                        vim.defer_fn(function()
                             vim.api.nvim_create_autocmd("CursorMoved", {
                                 desc = "User(once): Reset diagnostics virtual lines",
                                 once = true,
diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua
index e8c82e5..90e92b0 100644
--- a/.config/nvim/lua/plugins/ui.lua
+++ b/.config/nvim/lua/plugins/ui.lua
@@ -42,38 +42,9 @@ return {
             vim.o.foldcolumn = '0'
             vim.o.foldlevel = 99
             vim.o.foldlevelstart = 99
-            vim.o.foldenable = true
             vim.keymap.set('n', 'zR', require('ufo').openAllFolds)
             vim.keymap.set('n', 'zM', require('ufo').closeAllFolds)
-            require('ufo').setup({
-                fold_virt_text_handler = function(virtText, lnum, endLnum, width, truncate)
-                    local newVirtText = {}
-                    local suffix = (' %d '):format(endLnum - lnum)
-                    local sufWidth = vim.fn.strdisplaywidth(suffix)
-                    local targetWidth = width - sufWidth
-                    local curWidth = 0
-                    for _, chunk in ipairs(virtText) do
-                        local chunkText = chunk[1]
-                        local chunkWidth = vim.fn.strdisplaywidth(chunkText)
-                        if targetWidth > curWidth + chunkWidth then
-                            table.insert(newVirtText, chunk)
-                        else
-                            chunkText = truncate(chunkText, targetWidth - curWidth)
-                            local hlGroup = chunk[2]
-                            table.insert(newVirtText, { chunkText, hlGroup })
-                            chunkWidth = vim.fn.strdisplaywidth(chunkText)
-                            -- str width returned from truncate() may less than 2nd argument, need padding
-                            if curWidth + chunkWidth < targetWidth then
-                                suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
-                            end
-                            break
-                        end
-                        curWidth = curWidth + chunkWidth
-                    end
-                    table.insert(newVirtText, { suffix, 'MoreMsg' })
-                    return newVirtText
-                end
-            })
+            require('ufo').setup()
         end
     },
     {
@@ -90,4 +61,9 @@ return {
             require 'colorizer'.setup()
         end
     },
+    {
+        "echasnovski/mini.diff",
+        opts = {}
+    }
+
 }