From e492804a69b4bc1b82f7902b574e1ecdb1689066 Mon Sep 17 00:00:00 2001
From: Dennis <me@dnsc.io>
Date: Sun, 9 Nov 2025 19:33:44 +0100
Subject: [PATCH] adds go config and removes unnecessary packages

---
 modules/nvim/config/colors/winterly.lua       |  2 +-
 modules/nvim/config/lazy-lock.json            |  6 +++---
 modules/nvim/config/lua/plugins/conform.lua   |  4 ++++
 modules/nvim/config/lua/plugins/gopher.lua    | 15 +++++++++++++++
 modules/nvim/config/lua/plugins/grug-far.lua  |  9 ---------
 modules/nvim/config/lua/plugins/mini.diff.lua |  9 ---------
 6 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 modules/nvim/config/lua/plugins/gopher.lua
 delete mode 100644 modules/nvim/config/lua/plugins/grug-far.lua
 delete mode 100644 modules/nvim/config/lua/plugins/mini.diff.lua

diff --git a/modules/nvim/config/colors/winterly.lua b/modules/nvim/config/colors/winterly.lua
index d39dbf8..8a89398 100644
--- a/modules/nvim/config/colors/winterly.lua
+++ b/modules/nvim/config/colors/winterly.lua
@@ -33,7 +33,7 @@ hi("TermCursor", { reverse = true, cterm = { reverse = true } })
 hi("WinBar", { bold = true, cterm = { bold = true } })
 hi("WildMenu", { fg = palette.bg, bg = palette.yellow_subtle_bg, ctermfg = "Black", ctermbg = "Yellow" })
 
-hi("VertSplit", { link = "Normal" })
+hi("VertSplit", { link = "Comment" })
 hi("WinSeparator", { link = "VertSplit" })
 hi("WinBarNC", { link = "WinBar" })
 hi("DiffTextAdd", { link = "DiffText" })
diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json
index 7b4d02e..b7feec7 100644
--- a/modules/nvim/config/lazy-lock.json
+++ b/modules/nvim/config/lazy-lock.json
@@ -1,11 +1,12 @@
 {
   "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
-  "codecompanion.nvim": { "branch": "main", "commit": "0e0cd1d6049aec86d2d5fef9198e6f0830e2ddba" },
+  "codecompanion.nvim": { "branch": "main", "commit": "991dd81ac37b56b6d13529a08e86a42d183d79dc" },
   "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
   "follow-md-links.nvim": { "branch": "main", "commit": "728d96d268eef9666f0ee77a083e7e2f0b44f607" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "gopher.nvim": { "branch": "main", "commit": "295e21e637f9194a4d2bc34622d324a88b028141" },
   "grug-far.nvim": { "branch": "main", "commit": "3e72397465f774b01aa38e4fe8e6eecf23d766d9" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
@@ -18,9 +19,8 @@
   "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "schemastore.nvim": { "branch": "main", "commit": "976b31e094615b2c27009561b3c67a37c87c93c2" },
-  "snacks.nvim": { "branch": "main", "commit": "b0a95a027cf68d3a07c68909b73fe96818cbf7c9" },
+  "snacks.nvim": { "branch": "main", "commit": "8ca098ca360b45a361c475be6ea7dd81e438cc35" },
   "substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" },
-  "todo-comments.nvim": { "branch": "main", "commit": "411503d3bedeff88484de572f2509c248e499b38" },
   "vim-cool": { "branch": "master", "commit": "9ea940c0d537e55de0de4c0298c04b976960fb12" },
   "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
   "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
diff --git a/modules/nvim/config/lua/plugins/conform.lua b/modules/nvim/config/lua/plugins/conform.lua
index 4ba4879..b4bd184 100644
--- a/modules/nvim/config/lua/plugins/conform.lua
+++ b/modules/nvim/config/lua/plugins/conform.lua
@@ -14,6 +14,10 @@ return {
       markdown = { "prettierd" },
       json = { "prettierd" },
       lua = { "stylua" },
+      go = { "goimports" },
+      gomod = { "goimports" },
+      gowork = { "goimports" },
+      gotmpl = { "goimports" },
     },
     format_on_save = {
       -- These options will be passed to conform.format()
diff --git a/modules/nvim/config/lua/plugins/gopher.lua b/modules/nvim/config/lua/plugins/gopher.lua
new file mode 100644
index 0000000..e5eda18
--- /dev/null
+++ b/modules/nvim/config/lua/plugins/gopher.lua
@@ -0,0 +1,15 @@
+return {
+  "olexsmir/gopher.nvim",
+  ft = "go",
+  build = function()
+    vim.cmd.GoInstallDeps()
+  end,
+  ---@module "gopher"
+  ---@type gopher.Config
+  opts = {},
+  keys = {
+    { "<leader>cga", "<cmd>GoTagAdd<cr>", desc = "Add tags to struct", mode = "n" },
+    { "<leader>cgi", "<cmd>GoIfErr<cr>", desc = "Adds if err boilerplate", mode = "n" },
+    { "<leader>cgt", "<cmd>GoTestAdd<cr>", desc = "Add test under cursor", mode = "n" },
+  },
+}
diff --git a/modules/nvim/config/lua/plugins/grug-far.lua b/modules/nvim/config/lua/plugins/grug-far.lua
deleted file mode 100644
index 694178d..0000000
--- a/modules/nvim/config/lua/plugins/grug-far.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-  "MagicDuck/grug-far.nvim",
-  config = function()
-    require("grug-far").setup({})
-  end,
-  keys = {
-    { "<leader>sr", "<cmd>GrugFar<cr>", desc = "Search and replace", mode = "n" },
-  },
-}
diff --git a/modules/nvim/config/lua/plugins/mini.diff.lua b/modules/nvim/config/lua/plugins/mini.diff.lua
deleted file mode 100644
index d8627ff..0000000
--- a/modules/nvim/config/lua/plugins/mini.diff.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-  "echasnovski/mini.diff",
-  config = function()
-    local diff = require("mini.diff")
-    diff.setup({
-      source = diff.gen_source.none(),
-    })
-  end,
-}