chore: general maintenance and cleanup (#306)

config/nvim/init.lua

@@ -2,7 +2,7 @@
 -- │            ivuorinen's Neovim configuration             │
 -- ╰─────────────────────────────────────────────────────────╯
 
--- ── Install lazylazy ────────────────────────────────────────────────
+-- ── Install lazy ────────────────────────────────────────────────────
 -- https://github.com/folke/lazy.nvim
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
@@ -53,7 +53,7 @@ require('lazy').setup(
       path = '~/Code/nvim', -- Load wip plugins from this path
     },
     install = {
-      colorscheme = { vim.g.colors_theme },
+      colorscheme = { 'catppuccin' },
     },
     profiling = {
       loader = true,
@@ -61,8 +61,6 @@ require('lazy').setup(
   }
 )
 
--- require('nvm-default').setup()
-
 require 'keymaps'
 
 -- vim: set ts=2 sts=2 sw=2 wrap et :

config/nvim/lua/keymaps.lua

@@ -28,7 +28,6 @@ K.d('<C-k>', { 'n', 'v' }, ":m '<-2<CR>gv=gv", 'Move Block Up')
 K.d('<C-j>', { 'n', 'v' }, ":m '>+1<CR>gv=gv", 'Move Block Down')
 
 -- ── Other operations ────────────────────────────────────────────────
-K.nl('o', function() require('snacks').gitbrowse() end, 'Open repo in browser')
 K.n('<C-s>', ':w!<cr>', { desc = 'Save', noremap = true })
 K.n('<esc><esc>', ':nohlsearch<cr>', { desc = 'Clear Search Highlighting' })
 
@@ -59,7 +58,6 @@ K.ld('cci', 'n', function() b().lsp_incoming_calls() end, 'Incoming calls')
 K.ld('cco', 'n', function() b().lsp_outgoing_calls() end, 'Outgoing calls')
 K.ld('cd', 'n', function() b().lsp_definitions() end, 'Definitions')
 K.ld('cf', { 'n', 'x' }, ':lua vim.lsp.buf.format()<CR>', 'Format')
-K.ld('cg', 'n', ':lua require("neogen").generate()<CR>', 'Generate annotations')
 K.ld('ci', 'n', function() b().lsp_implementations() end, 'Implementations')
 K.ld('cp', 'n', function() b().lsp_type_definitions() end, 'Type Definition')
 K.ld('cr', 'n', vim.lsp.buf.rename, 'Rename')

config/nvim/lua/nvm-default/init.lua

@@ -1,120 +0,0 @@
--- Get nvm default version and use it in node_host_prog
--- and g.copilot_node_command.
---
--- This module automatically configures Neovim to use the default Node.js version
--- from NVM. It requires a working NVM installation and 'default' alias to be set,
--- and also neovim npm package to be installed.
---
--- You can install the neovim package by running:
--- npm i --global neovim
---
--- Usage:
---   require('nvm-default').setup({
---     add_to_path = true,        -- optional: add NVM bin directory to PATH
---     nvm_path = "~/.nvm",      -- optional: custom NVM installation path
---     notify_level = "info"     -- optional: notification level
---   })
-
-local M = {}
-
-M.name = 'nvm-default.nvim'
-M.version = '0.1.0' -- x-release-please-version
-
--- Helper function to run a shell command
----@param cmd string Run a shell command
----@return string? Return the result of the command
-local function run_command(cmd)
-  local result = vim.fn.system(cmd)
-  return vim.v.shell_error == 0 and result:gsub('%s+$', '') or nil
-end
-
--- Helper function to show a notification
----@param msg string Show a message
----@param level "info"|"warn"|"error"|"trace" Notification level
-local function n(msg, level)
-  if msg == nil then msg = M.name .. ': No message provided' end
-  if level == nil then level = 'trace' end
-
-  local log_level = vim.log.levels.INFO
-
-  if level == 'info' then
-    log_level = vim.log.levels.INFO
-  elseif level == 'warn' then
-    log_level = vim.log.levels.WARN
-  elseif level == 'error' then
-    log_level = vim.log.levels.ERROR
-  elseif level == 'trace' then
-    log_level = vim.log.levels.TRACE
-  end
-
-  vim.notify(M.name .. ': ' .. msg, log_level)
-end
-
----@class NvmDefaultOptions
----@field add_to_path boolean Add found NVM bin directory to PATH
----@field nvm_path string Where nvm installation is located
----@field notify_level number|"info"|"warn"|"error"|"trace" Notification level filter
-
--- Default options
----@type NvmDefaultOptions
-M.defaults = {
-  add_to_path = vim.g.nvm_default_add_to_path or true,
-  nvm_path = vim.fn.expand(os.getenv 'NVM_DIR' or '~/.nvm'),
-  notify_level = vim.g.nvm_default_notify_level or 'info',
-}
-
--- Fetch the NVM default version or fallback to node version
----@param opts? NvmDefaultOptions Plugin options
-function M.setup(opts)
-  local options = vim.tbl_deep_extend('force', M.defaults, opts or {})
-
-  local nvm_path = options.nvm_path
-  local node_version = run_command(
-    string.format('. %s/nvm.sh && nvm version default', nvm_path)
-  ) or run_command(string.format('. %s/nvm.sh && nvm version node', nvm_path)) or nil
-
-  if node_version and node_version:match '^v' then
-    -- Set vim.g.node_host_prog and vim.g.copilot_node_command
-    local current_nvm_version_path =
-      string.format('%s/versions/node/%s', nvm_path, node_version)
-    local current_nvm_node_bin_path = string.format('%s/bin', current_nvm_version_path)
-    local current_nvm_node_bin = string.format('%s/node', current_nvm_node_bin_path)
-    local neovim_node_host_bin_path =
-      string.format('%s/neovim-node-host', current_nvm_node_bin_path)
-
-    -- Collect missing files and directories errors for error output
-    local missing = {}
-
-    -- If node_dir isn't there, stop and show error
-    if not vim.fn.isdirectory(current_nvm_version_path) then
-      table.insert(missing, 'Node.js directory: ' .. current_nvm_version_path)
-    end
-
-    -- If node_bin isn't there, stop and show error
-    if not vim.fn.filereadable(current_nvm_node_bin) then
-      table.insert(missing, 'Node.js binary: ' .. current_nvm_node_bin)
-    end
-
-    if not vim.fn.filereadable(neovim_node_host_bin_path) then
-      table.insert(missing, 'Neovim host binary: ' .. neovim_node_host_bin_path)
-    end
-
-    if #missing > 0 then
-      n('Missing required files:\n- ' .. table.concat(missing, '\n- '), 'error')
-      return
-    end
-
-    -- Add to PATH if requested. Can be turned off by setting if it messes with
-    -- other tools.
-    if options.add_to_path then
-      vim.env.PATH = current_nvm_node_bin_path .. ':' .. vim.env.PATH
-    end
-
-    vim.g.node_host_prog = neovim_node_host_bin_path
-    vim.g.copilot_node_command = current_nvm_node_bin
-  else
-    n('Unable to determine the Node.js version from nvm.', 'error')
-  end
-end
-
-return M

config/nvim/lua/options.lua

@@ -13,10 +13,6 @@ local a = vim.api -- A table to store API functions
 g.mapleader = ' ' -- Space as the leader key
 g.maplocalleader = ' ' -- Space as the local leader key
 
--- g.colors_theme = 'onedark' -- Set the colorscheme
--- g.colors_variant_light = 'tokyonight-day' -- Set the light variant
--- g.colors_variant_dark = 'tokyonight-storm' -- Set the dark variant
-
 g.editorconfig = true -- Make sure editorconfig support is enabled
 g.loaded_perl_provider = 0 -- Disable perl provider
 g.loaded_ruby_provider = 0 -- Disable ruby provider

config/nvim/lua/plugins/blink.lua

@@ -1,6 +1,6 @@
 return {
   -- Performant, batteries-included completion plugin for Neovim
-  -- https:/github.com/saghen/blink.cmp
+  -- https://github.com/saghen/blink.cmp
   {
     'saghen/blink.cmp',
     version = '*',

config/nvim/lua/plugins/code.lua

@@ -24,7 +24,14 @@ return {
   -- https://github.com/fatih/vim-go
   {
     'fatih/vim-go',
-    config = function() end,
+    ft = 'go',
+    config = function()
+      vim.g.go_def_mode = 'gopls'
+      vim.g.go_info_mode = 'gopls'
+      vim.g.go_fmt_autosave = 0
+      vim.g.go_imports_autosave = 0
+      vim.g.go_mod_fmt_autosave = 0
+    end,
   },
 
   -- Clarify and beautify your comments using boxes and lines.

config/nvim/lua/plugins/lsp.lua

@@ -223,7 +223,7 @@ return {
               vim.env.VIMRUNTIME,
             }
             client.config.settings.Lua.runtime = { version = 'LuaJIT' }
-            client.notify(
+            client:notify(
               'workspace/didChangeConfiguration',
               { settings = client.config.settings }
             )

config/nvim/lua/plugins/ui.lua

@@ -89,15 +89,12 @@ return {
     'f-person/auto-dark-mode.nvim',
     opts = {
       update_interval = 1000,
+      -- stylua: ignore
       set_dark_mode = function()
         vim.api.nvim_set_option_value('background', 'dark', {})
-        -- vim.cmd.colorscheme(vim.g.colors_variant_dark)
-        -- vim.cmd 'colorscheme rose-pine'
       end,
       set_light_mode = function()
         vim.api.nvim_set_option_value('background', 'light', {})
-        -- vim.cmd.colorscheme(vim.g.colors_variant_light)
-        -- vim.cmd 'colorscheme rose-pine-dawn'
       end,
     },
   },

config/nvim/lua/utils.lua

@@ -100,5 +100,6 @@ function GetIntelephenseLicense()
   local f = assert(io.open(p, 'rb'))
   local content = f:read '*a'
   f:close()
-  return string.gsub(content, '%s+', '')[1] or nil
-end
+  local stripped = string.gsub(content, '%s+', '')
+  return stripped == '' and nil or stripped
+end