merge: develop <--- fix/various-plugin-configs

* HEAD
| \
| * 9f1587f <github@luxolus.com> nvim/spellfile: add more common words
| * b62a59e <github@luxolus.com> nvim/plug/cmp-spell: fix path expansion
| * 9e6a96c <github@luxolus.com> nvim/diagnostic: clobber repeated diagnostic floats
| /
| develop

Signed-off-by: Bazaah <github@luxolus.com>

nvim/lua/psoxizsh/diagnostic.lua

@@ -11,6 +11,19 @@ local sign = function(o)
   })
 end
 
+local DiagnosticFloat = function()
+  -- current, last diagnostic cursor position
+  local current = vim.api.nvim_win_get_cursor(0)
+  local last = vim.w.diagnostics_last_cursor or { nil, nil }
+
+  -- Show the popup diagnostics window,
+  -- but only once for the current cursor location (unless moved afterwards).
+  if not (current[1] == last[1] and current[2] == last[2]) then
+    vim.w.diagnostics_last_cursor = current
+    D.open_float({ focusable = false, scope = 'cursor' })
+  end
+end
+
 function M.config()
   -- Setup signs
   sign({ name = 'DiagnosticSignError', text = '' })
@@ -44,7 +57,7 @@ end
 
 function M.autocmds()
   au.PsoxDiagnosticHover {
-    { 'CursorHold', '*', function() D.open_float({ focusable = false, scope = 'cursor' }) end }
+    { 'CursorHold', '*', DiagnosticFloat }
   }
 end
 

nvim/lua/psoxizsh/plugins/config/cmp-spell.lua

@@ -35,12 +35,7 @@ return function()
     -- 3. $PSOXIZSH/nvim/spellfile
     if repo_root then table.insert(checked, repo_root .. '/.vim') end
     vim.list_extend(checked, { '~/.config/nvim', vim.env.PSOXIZSH .. '/nvim/spellfile' })
-
-    for i, path in ipairs(checked) do
-      if path and fn.exists(fn.expand(path)) then
-        checked[i] = path .. '/' .. cfg.spell_fname
-      end
-    end
+    checked = vim.tbl_map(function(p) return fn.expand(p) .. '/' .. cfg.spell_fname end, checked)
 
     l.spell         = true
     l.spelllang     = merged.languages

nvim/spellfile/words.utf-8.add

@@ -95,3 +95,33 @@ filetype
 postgres
 Webdev
 ident
+popup
+
+
+
+
+keymaps
+goto
+neotree
+neo
+configs
+unstaged
+nowait
+filesystem
+dotfiles
+gitignored
+dirs
+unstage
+
+
+
+
+ﰊ
+
+
+
+
+
+
+vsplit
+libuv