chore: general maintenance and cleanup (#306)

config/fish/conf.d/paths.fish

@@ -1,22 +0,0 @@
-function ___paths_plugin_set_colors
-    if not set -q ___paths_plugin_colors
-        set -Ux ___paths_plugin_colors 27e6ff 29e0ff 5cd8ff 77d0ff 8ac8ff 9cbfff afb5ff c5a7ff d99bfe ea8feb f684d5 fe7abd ff73a3 ff708a fa7070 ff708a ff73a3 fe7abd f684d5 ea8feb d99bfe c5a7ff afb5ff 9cbfff 8ac8ff 77d0ff 5cd8ff 29e0ff
-    end
-    return 0
-end
-
-function _paths_uninstall --on-event paths_uninstall
-    for i in ___paths_plugin_wrap_color ___paths_plugin_output ___paths_plugin_handle_found_item ___paths_plugin_handle_source ___paths_plugin_cycle_color
-        functions -e $i
-    end
-    set -e ___paths_plugin_colors
-    set -e ___paths_plugin_current_color
-end
-
-function _paths_install --on-event _paths_install
-    ___paths_plugin_set_colors
-end
-
-function _paths_update --on-event paths_update
-    ___paths_plugin_set_colors
-end

config/fish/config.fish

@@ -2,6 +2,8 @@
 # │                     fish/config.fish                     │
 # ╰──────────────────────────────────────────────────────────╯
 
+set -g fish_greeting
+
 fish_config theme choose "Catppuccin Mocha"
 
 test -e "$HOME/.config/fish/alias.fish" &&
@@ -33,7 +35,7 @@ if status is-interactive
     type -q zoxide; and zoxide init fish | source
 
     # Start tmux if not already running and not in SSH
-    #open-tmux # defined in functions/open-tmux.fish
+    #.t # defined in functions/.t.fish
 end
 
 # Added by LM Studio CLI (lms)
@@ -48,3 +50,8 @@ fish_add_path $HOME/.opencode/bin
 # Added by OrbStack: command-line tools and integration
 # This won't be added again if you remove it.
 source ~/.orbstack/shell/init2.fish 2>/dev/null || :
+
+# Warn if GITHUB_TOKEN is not set
+if status is-interactive; and not set -q GITHUB_TOKEN
+    echo "Warning: GITHUB_TOKEN is not set" >&2
+end

config/fish/exports.fish

@@ -21,7 +21,7 @@ fish_add_path "$XDG_BIN_HOME"
 fish_add_path "$XDG_DATA_HOME/mise/shims"
 
 # Add cargo bin to path
-fish_add_path "$XDG_SHARE_HOME/cargo/bin"
+fish_add_path "$XDG_DATA_HOME/cargo/bin"
 
 # NPM/NVM configuration
 set -q NVM_DIR; or set -x NVM_DIR "$XDG_DATA_HOME/nvm"
@@ -128,7 +128,7 @@ set -q CARGO_BIN_HOME; or set -x CARGO_BIN_HOME "$XDG_BIN_HOME"
 set -q RUSTUP_HOME; or set -x RUSTUP_HOME "$XDG_DATA_HOME/rustup"
 set -x RUST_WITHOUT "clippy,docs,rls"
 fish_add_path "$CARGO_HOME/bin"
-fish_add_path "$XDG_SHARE_HOME/bob/nvim-bin"
+fish_add_path "$XDG_DATA_HOME/bob/nvim-bin"
 
 # screen configuration
 set -q SCREENRC; or set -x SCREENRC "$XDG_CONFIG_HOME/misc/screenrc"

config/fish/fish_plugins

@@ -3,3 +3,4 @@ jethrokuan/z
 ivuorinen/phpenv.fish
 ilancosman/tide@v6
 catppuccin/fish
+edc/bass

config/fish/functions/.t.fish

@@ -1,7 +1,7 @@
 # Description: Open tmux session if not already open
 # Dependencies: tmux
-# Usage: open-tmux
-function open-tmux --wraps='tmux attach-session -t main || tmux new-session -s main' --description 'open tmux session'
+# Usage: .t
+function .t --wraps='tmux attach-session -t main || tmux new-session -s main' --description 'open tmux session'
     # Check if not in an SSH session and not already in a tmux session
     if test -z "$SSH_TTY"; and not set -q TMUX
         command tmux attach-session -t main || command tmux new-session -s main

config/fish/functions/paths.fish

@@ -1,175 +0,0 @@
-function ___paths_plugin_wrap_color
-    set_color normal
-    set_color "$argv[1]"
-    echo -n (set_color "$argv[1]")"$argv[2..]"
-    set_color normal
-end
-
-# duplicated in conf.d
-function ___paths_plugin_set_colors
-    if not set -q ___paths_plugin_colors
-        set -Ux ___paths_plugin_colors 27e6ff 29e0ff 5cd8ff 77d0ff 8ac8ff 9cbfff afb5ff c5a7ff d99bfe ea8feb f684d5 fe7abd ff73a3 ff708a fa7070 ff708a ff73a3 fe7abd f684d5 ea8feb d99bfe c5a7ff afb5ff 9cbfff 8ac8ff 77d0ff 5cd8ff 29e0ff
-    end
-    return 0
-end
-
-function ___paths_plugin_cycle_color
-    if not set -q ___paths_plugin_current_color
-        set -Ux ___paths_plugin_current_color 1
-    else if test $___paths_plugin_current_color -gt (count $___paths_plugin_colors)
-        set -Ux ___paths_plugin_current_color 1
-    end
-    echo $___paths_plugin_colors[$___paths_plugin_current_color]
-    set -Ux ___paths_plugin_current_color (math $___paths_plugin_current_color + 1)
-end
-
-function ___paths_plugin_handle_found_item -a testName outFlags
-    set -f flags (string split -n ' ' -- "$outFlags")
-    set -f options (fish_opt -s c -l clean)
-    set -a options (fish_opt -s s -l single)
-    set -a options (fish_opt -s k -l no-color)
-    set -a options (fish_opt -s n -l inline)
-    argparse $options -- $flags
-
-    set -f arrow "=>"
-    # check if file exists
-    if test -e "$testName"
-        set -f nameOut (string trim -- "$testName")
-        if not set -q _flag_c # is not clean
-            if test -L "$testName" # is symlink
-                set -f __linkname (readlink -f "$testName")
-                set __linkname (string trim -- "$__linkname")
-                set testName (string trim -- "$testName")
-                if not set -q _flag_k # is color
-                    set nameOut (___paths_plugin_wrap_color (___paths_plugin_cycle_color) $testName) (___paths_plugin_wrap_color "yellow" "$arrow") (___paths_plugin_wrap_color (___paths_plugin_cycle_color) $__linkname)
-                else # is color
-                    set nameOut (echo -n "$testName" "$arrow" "$__linkname")
-                end
-            else # is not symlink
-                if not set -q _flag_k # is color
-                    set testName (string trim -- "$testName")
-                    set nameOut (___paths_plugin_wrap_color (___paths_plugin_cycle_color) "$testName")
-                else
-                    set testName (string trim -- "$testName")
-                    set nameOut "$testName"
-                end
-            end
-
-            set nameOut (string trim -- "$nameOut")
-            # do the tick
-            if set -q _flag_k # is not color
-                set nameOut "- $nameOut"
-            else # is color
-                set nameOut (___paths_plugin_wrap_color "yellow" "-") "$nameOut"
-            end
-        end
-        set nameOut (string trim -- "$nameOut")
-        echo -n $nameOut
-    end
-end
-
-function paths --description "Reveal the executable matches in shell paths or fish autoload."
-    set -f options (fish_opt -s c -l clean)
-    set -a options (fish_opt -s s -l single)
-    set -a options (fish_opt -s k -l no-color)
-    set -a options (fish_opt -s q -l quiet)
-    set -a options (fish_opt -s n -l inline)
-    argparse $options -- $argv
-
-    if test (count $argv) -lt 1
-        echo "paths - executable matches in shell paths or fish autoload."
-        and echo "usage: paths [-c|-s|-k] <name>"
-        and echo -e "\t-c or --no-color: output without color"
-        and echo -e "\t-s or --single: output without color or headers, the first result"
-        and echo -e "\t-k or --clean: output without tick marks or headers"
-        # and echo -e "\t-n or --inline: output without endline"
-        and return 1
-    end
-
-    set -f foundStatus 1
-    set -f input (string trim -- $argv)
-    # deprecated
-    if set -q _flag_q
-        set _flag_c True
-    end
-
-    if set -q _flag_s
-        set _flag_k True
-        set _flag_c True
-    end
-
-    set -f outFlags ''
-    set -q _flag_n; and set -a outFlags -n
-    set -q _flag_c; and set -a outFlags -c
-    set -q _flag_k; and set -a outFlags -k
-    set -q _flag_s; and set -a outFlags -s
-    set outFlags (string split -n " " -- "$outFlags")
-    ___paths_plugin_set_colors
-    # loop over list of path lists
-    for pVar in VIRTUAL_ENV fisher_path fish_function_path fish_user_paths PATH
-        set -e acc
-        set -f acc ''
-        set -e hit
-        # see if variable is empty
-        if test -z "$pVar"
-            continue
-        end
-        set -f acc (begin
-            for t in $$pVar
-                for snit in "$t/$input.fish" "$t/$input"
-                    set -f found (___paths_plugin_handle_found_item "$snit" "$outFlags")
-                    set found (string trim -- "$found")
-                    if test -n "$found"
-                        set -f hit True
-                        echo "$found"
-                        if set -q _flag_s
-                            break
-                        end
-                    end
-                end
-                if set -q _flag_s
-                    if set -q hit
-                        break
-                    end
-                end
-            end
-        end)
-
-        # prepend source
-        if not set -q _flag_c
-            if set -q hit
-                set pVar (string trim -- "$pVar")
-                echo -e -n "$pVar\n"
-            end
-        end
-
-        if test -n "$acc"
-            set foundStatus 0
-            for fk in $acc
-                echo $fk
-                if set -q _flag_s
-                    # stop after one
-                    return $foundStatus
-                end
-            end
-        end
-    end
-
-    # check
-    set -l built (type --type $input 12&>/dev/null)
-    if test -n "$built"
-        and test "$built" = builtin
-        set $foundStatus 0
-        if not set -q _flag_c
-            echo -e -n "builtin\n"
-            if set -q _flag_k
-                echo - "$input"
-            else # is color
-                echo (___paths_plugin_wrap_color "yellow" "-") (___paths_plugin_wrap_color (___paths_plugin_cycle_color) "$input")
-            end
-        else
-            echo "$input"
-        end
-    end
-    return $foundStatus
-end

config/git/ignore

@@ -7,6 +7,7 @@
 *-secret
 __secret
 __ignored
+__ignored/*
 __test_*.php
 __test_*.txt
 __test.php

config/git/shared

@@ -19,8 +19,8 @@
 	logs = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) %C(cyan)<%an>%Creset' --abbrev-commit
 	nah = !git reset --hard && git clean -df
 	recent = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:=10} | column -ts'|';}; r"
-	reset-origin = !git fetch origin && git reset --hard origin/master && git clean -f -d
-	reset-upstream = !git fetch upstream && git reset --hard upstream/master && git clean -f -d
+	reset-origin = !git fetch origin && git reset --hard origin/HEAD && git clean -f -d
+	reset-upstream = !git fetch upstream && git reset --hard upstream/HEAD && git clean -f -d
 	rl = reflog --format='%C(auto)%h %<|(20)%gd %C(blue)%cr%C(reset) %gs (%s)'
 	tagdate = log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"
 	undo = reset --soft HEAD^

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