feat(nvim): append() and remove() for opt.set, and formatoptions fix

Author: Benricheson101

.config/nvim/lua/opt.lua

@@ -1,7 +1,11 @@
 local opt = require('util.opt')
+local t = require('util.table')
 
 if vim.fn.has('termguicolors') then
-  opt.set {termguicolors = true}
+  opt.set {
+    termguicolors = true,
+    winblend = 5
+  }
 end
 
 vim.cmd.colors('habamax')
@@ -34,7 +38,9 @@ opt.set {
   ignorecase = true,
   smartcase = true,
 
-  backspace = 'indent,eol,start',
+  showmatch = true,
+
+  backspace = {'indent', 'eol', 'start'},
 
   dir = '/private/tmp',
   backup = true,
@@ -46,7 +52,20 @@ opt.set {
 
   wildoptions = {'pum', 'tagfile', 'fuzzy'},
   virtualedit = {'block'},
+
+  matchpairs = t.append {'<:>'},
+  shortmess = t.append {'l'},
+  formatoptions = t.remove {'r', 'o'},
 }
 
-vim.opt.formatoptions:remove('r')
-vim.opt.formatoptions:remove('o')
+local fo_group = vim.api.nvim_create_augroup('formatoptions', {clear = true})
+vim.api.nvim_create_autocmd('FileType', {
+  group = fo_group,
+  pattern = '*',
+  desc = 'sets formatoptions because someone, in their infinite wisdom, decided to overwrite them in nearly every default ftplugin',
+  callback = function ()
+    opt.setlocal {
+      formatoptions = t.remove {'r', 'o'},
+    }
+  end
+})

.config/nvim/lua/remaps.lua

@@ -9,8 +9,8 @@ vim.keymap.set('n', 'k', 'gk')
 vim.keymap.set('v', 'k', 'gk')
 
 vim.keymap.set('n', '<leader><Space>', vim.cmd.noh)
-vim.keymap.set('n', ';;', 'A;<esc>')
-vim.keymap.set('n', ',,', 'A,<esc>')
+vim.keymap.set('n', '<leader>;', 'A;<esc>')
+vim.keymap.set('n', '<leader>,', 'A,<esc>')
 vim.keymap.set('t', '<S-Space>', '<Space>')
 
 vim.keymap.set('n', 'gh', '<NOP>')

.config/nvim/lua/util/opt.lua

@@ -9,6 +9,7 @@ local function table_set(into)
 end
 
 M.set = table_set(vim.opt)
+M.setlocal = table_set(vim.opt_local)
 M.let_g = table_set(vim.g)
 M.g = table_set(vim.g)
 

.config/nvim/lua/util/table.lua

@@ -6,10 +6,60 @@ local M = {}
 --- @return table merged the merged tables
 function M.merge_table(into, from)
   for k, v in pairs(from) do
-    into[k] = v
+    if type(v) == 'function' then
+      v(into, from, k)
+    else
+      into[k] = v
+    end
   end
 
   return into
 end
 
+--- Merges two lua-lists and returns the result (non-mutating)
+--- @param a table
+--- @param b table
+--- @return table merged the merged values
+function M.cat(a, b)
+  return vim.iter({a, b}):flatten(1):totable()
+end
+
+--- For use with M.merge_table, this function is a convenient way of calling tbl:append() on objects in vim.opt
+function M.append(v)
+  return function (into, _, k)
+    local ty = type(v)
+
+    if ty == 'table' then
+      for _, val in ipairs(v) do
+        into[k]:append(val)
+      end
+    elseif ty ~= 'nil' then
+      into[k]:append(v)
+    end
+  end
+end
+
+--- For use with M.merge_table, this function is a convenient way of calling tbl:remove() on objects in vim.opt
+function M.remove(v)
+  return function (into, _, k)
+    local ty = type(v)
+
+    if ty == 'table' then
+      for _, val in ipairs(v) do
+        into[k]:remove(val)
+      end
+    elseif ty ~= 'nil' then
+      into[k]:remove(v)
+    end
+  end
+end
+
+--- Similar to M.append and M.remove, this combines the two into (append, remove) so items can be added and removed in one call
+function M.append_remove(a, r)
+  return function (...)
+    M.append(a)(...)
+    M.remove(r)(...)
+  end
+end
+
 return M

.zshenv

@@ -5,7 +5,6 @@ typeset -U PATH path
 
 path=(
   $HOME/scripts
-  $HOME/.yarn/bin
   $HOME/.local/bin
   $HOME/Library/pnpm
   $HOME/go