fix lsp

Author: AvidDabbler

init.lua

@@ -1,108 +1,92 @@
+-- ~/.config/nvim/init.lua
 require 'core.options'  -- Load general options
 require 'core.keymaps'  -- Load general keymaps
 require 'core.snippets' -- Custom code snippets
 
--- Install package manager
-local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
+-- Install package manager (lazy.nvim)
+local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
 if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system {
-    'git',
-    'clone',
-    '--filter=blob:none',
+  vim.fn.system({
+    'git', 'clone', '--filter=blob:none',
     'https://github.com/folke/lazy.nvim.git',
-    '--branch=stable', -- latest stable release
-    lazypath,
-  }
+    '--branch=stable', lazypath,
+  })
 end
 vim.opt.rtp:prepend(lazypath)
+
+-- Filetypes
 vim.filetype.add({
-  extension = {
-    templ = "templ",
-  }
+  extension = { templ = 'templ' },
 })
 
--- Import color theme based on environment variable NVIM_THEME
+-- Theme selection (robust against unknown NVIM_THEME)
 local default_color_scheme = 'quantum'
-local env_var_nvim_theme = os.getenv 'NVIM_THEME' or default_color_scheme
-
--- Define a table of theme modules
+local env_var_nvim_theme = os.getenv('NVIM_THEME') or default_color_scheme
 local themes = {
   quantum = 'plugins.themes.quantum',
-  nord = 'plugins.themes.nord',
+  nord    = 'plugins.themes.nord',
   onedark = 'plugins.themes.onedark',
 }
+local theme_module = themes[env_var_nvim_theme] or themes[default_color_scheme]
 
--- Setup plugins
+-- Plugins
 require('lazy').setup({
-  require(themes[env_var_nvim_theme]),
+  require(theme_module),
   require 'core.ui',
 
-  require 'plugins.aaa', -- Mason setup
-  require 'plugins.aerial',
-  require 'plugins.flash',
-  require 'plugins.autocompletion',
-  require 'plugins.bufferline',
-  require 'plugins.comment',
-  require 'plugins.conform',
-  require 'plugins.database',
-  require 'plugins.debug',
-  require 'plugins.gitsigns',
-  require 'plugins.harpoon',
-  require 'plugins.lazygit',
-  require 'plugins.lsp',
+  -- Load mason early so tools are ready for LSP configs
+  require 'plugins.mason',
+
+  -- Core dev UX
+  require 'plugins.treesitter',
+  require 'plugins.telescope',
   require 'plugins.lualine',
-  require 'plugins.none-ls',
+  require 'plugins.bufferline',
   require 'plugins.indent-blankline',
   require 'plugins.neo-tree',
-  require 'plugins.misc',
-  require 'plugins.snack',
-  require 'plugins.telescope',
   require 'plugins.toggleterm',
-  require 'plugins.treesitter',
   require 'plugins.vim-tmux-navigator',
   require 'plugins.zellij',
+  require 'plugins.flash',
+  require 'plugins.comment',
+  require 'plugins.harpoon',
+  require 'plugins.gitsigns',
+  require 'plugins.lazygit',
+  require 'plugins.aerial',
+  require 'plugins.misc',
 
+  -- LSP & companions
+  require 'plugins.autocompletion',
+  require 'plugins.lsp',
+  require 'plugins.none-ls',     -- none-ls/null-ls sources & setup
+  require 'plugins.autoformat',  -- your autoformat-on-save/idle logic
+
+  -- Optional: pick one formatter stack. If you keep Conform,
+  -- ensure it doesn't also format Go on save to avoid double-format.
+  require 'plugins.conform',
+
+  -- Debugging / DB (as you had)
+  require 'plugins.debug',
+  require 'plugins.database',
 }, {
   ui = {
-    -- If you have a Nerd Font, set icons to an empty table which will use the
-    -- default lazy.nvim defined Nerd Font icons otherwise define a unicode icons table
     icons = vim.g.have_nerd_font and {} or {
-      cmd = '⌘',
-      config = '🛠',
-      event = '📅',
-      ft = '📂',
-      init = '⚙',
-      keys = '🗝',
-      plugin = '🔌',
-      runtime = '💻',
-      require = '🌙',
-      source = '📄',
-      start = '🚀',
-      task = '📌',
-      lazy = '💤 ',
+      cmd = '⌘', config = '🛠', event = '📅', ft = '📂', init = '⚙',
+      keys = '🗝', plugin = '🔌', runtime = '💻', require = '🌙',
+      source = '📄', start = '🚀', task = '📌', lazy = '💤 ',
     },
   },
 })
 
--- Function to check if a file exists
+-- (Optional) tiny helper if you ever want to source a session file
 local function file_exists(file)
   local f = io.open(file, 'r')
-  if f then
-    f:close()
-    return true
-  else
-    return false
-  end
+  if f then f:close(); return true end
+  return false
 end
 
--- Path to the session file
-local session_file = '.session.vim'
+-- local session_file = '.session.vim'
+-- if file_exists(session_file) then vim.cmd('source ' .. session_file) end
 
--- Check if the session file exists in the current directory
--- if file_exists(session_file) then
---   -- Source the session file
---   vim.cmd('source ' .. session_file)
--- end
-
--- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
+

lua/plugins/aaa.lua

@@ -0,0 +1,72 @@
+-- lua/plugins/autoformat.lua
+-- Automatically format Go code on save and when idle after changes
+
+return {
+  "neovim/nvim-lspconfig",
+  event = { "BufReadPre", "BufNewFile" },
+  config = function()
+    ---------------------------------------------------------------------------
+    -- 🧹 Format on save
+    ---------------------------------------------------------------------------
+    vim.api.nvim_create_autocmd("BufWritePre", {
+      pattern = "*.go",
+      callback = function()
+        -- Runs both gopls and none-ls formatters in order
+        vim.lsp.buf.format({ async = false })
+      end,
+    })
+
+    ---------------------------------------------------------------------------
+    -- ⚡ Auto-format when idle (after you stop typing)
+    ---------------------------------------------------------------------------
+    local format_timer = vim.loop.new_timer()
+
+    vim.api.nvim_create_autocmd({ "TextChanged", "TextChangedI" }, {
+      pattern = "*.go",
+      callback = function()
+        -- Cancel previous pending format
+        format_timer:stop()
+
+        -- Wait 1.5 seconds after the last change before formatting
+        format_timer:start(1500, 0, vim.schedule_wrap(function()
+          -- Only format if the buffer still exists and is listed
+          local bufnr = vim.api.nvim_get_current_buf()
+          if vim.api.nvim_buf_is_valid(bufnr) and vim.bo[bufnr].modifiable then
+            vim.lsp.buf.format({ async = true })
+          end
+        end))
+      end,
+    })
+
+    ---------------------------------------------------------------------------
+    -- 🧪 Optional: run `goimports` and quick test on save
+    ---------------------------------------------------------------------------
+    vim.api.nvim_create_autocmd("BufWritePost", {
+      pattern = "*.go",
+      callback = function()
+        -- Automatically fix imports using goimports if available
+        vim.fn.jobstart({ "goimports", "-w", vim.fn.expand("%:p") }, {
+          on_exit = function()
+            -- Optionally, trigger a quick test run for feedback
+            vim.fn.jobstart({ "go", "test", "./..." }, {
+              cwd = vim.fn.getcwd(),
+              stdout_buffered = true,
+              stderr_buffered = true,
+              on_stdout = function(_, data)
+                if data then
+                  vim.notify(table.concat(data, "\n"), vim.log.levels.INFO, { title = "go test" })
+                end
+              end,
+              on_stderr = function(_, data)
+                if data then
+                  vim.notify(table.concat(data, "\n"), vim.log.levels.ERROR, { title = "go test" })
+                end
+              end,
+            })
+          end,
+        })
+      end,
+    })
+  end,
+}
+