nvim: Update spellfile

HACK Still need to figure out a better way to identify and set displays.

desktop/.config/river/init

@@ -274,8 +274,8 @@ if exist swww; then
     riverctl spawn "swww init"
     outputs=$(swww query | cut -d':' -f1)
     if [ "$(echo "$outputs" | grep -c -e '^DP')" -eq 2 ] && [ -e "$HOME/pictures/wall_r.jpg" ]; then
-        swww img -o "$(echo "$outputs" | head -n1)" "$HOME/pictures/wall_l.jpg"
+        swww img -o "$(echo "$outputs" | head -n1)" "$HOME/pictures/wall_r.jpg"
-        swww img -o "$(echo "$outputs" | tail -n1)" "$HOME/pictures/wall_r.jpg"
+        swww img -o "$(echo "$outputs" | tail -n1)" "$HOME/pictures/wall_l.jpg"
     elif [ -e "$HOME/pictures/wall.jpg" ]; then
         swww img "$HOME/pictures/wall.jpg"
     fi

nvim/.config/nvim/lua/core/commands.lua

@@ -5,7 +5,7 @@ vim.api.nvim_create_autocmd({ "TextYankPost" }, {
 	group = vim.api.nvim_create_augroup("highlightyanks", { clear = true }),
 })
 
--- Special setting for editing gopass files - make sure nothing leaks outside the directories it 
+-- Special setting for editing gopass files - make sure nothing leaks outside the directories it
 -- is supposed to
 vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, {
 	pattern = {
@@ -42,4 +42,3 @@ vim.api.nvim_create_user_command("SpellToggle", function(opt)
 		vim.notify("Spellcheck disabled")
 	end
 end, { nargs = "*", bang = true })
-

nvim/.config/nvim/lua/plugins/prose.lua

@@ -256,27 +256,6 @@ local prose_plugs = {
 		config = true,
 	},
 
-	-- cite as you write from papis databases
-	-- ADDITIONAL DEPENDENCIES: papis and yq in shell env
-	-- still same issues: slow, buggy, does not work for me
-	{
-		"jghauser/papis.nvim",
-		dependencies = {
-			"kkharji/sqlite.lua",
-			"MunifTanjim/nui.nvim",
-			"pysan3/pathlib.nvim",
-			"nvim-neotest/nvim-nio",
-			-- if not already installed, you may also want:
-			{ "nvim-telescope/telescope.nvim", optional = true },
-			-- "hrsh7th/nvim-cmp",
-		},
-		config = function()
-			require("papis").setup({
-				init_filetypes = prose_ft,
-			})
-		end,
-		lazy = false,
-	},
 	{
 		"barreiroleo/ltex_extra.nvim",
 		branch = "dev",

nvim/.config/nvim/spell/en.utf-8.add

@@ -226,3 +226,4 @@ decarbonisation
 Oportunidades
 OECD
 NREGA
+Oehme

nvim/.config/sh/alias.d/neovim.sh

@@ -5,8 +5,5 @@ if exist nvim; then
     alias v="nvim"
     alias vim="nvim"
 
-    # open notes with my vim zettelkasten plugin
-    # TODO better implementation conditional on zk & zettelkasten existing
-    alias vn='nvim +"lua require \"zk.commands\".get(\"ZkCd\")()" +"edit ~/documents/notes/index.md"'
     alias vs='nvim +"lua require \"personal.scratchpad\".create()"'
 fi

vcs/git/config/git/config

@@ -11,7 +11,7 @@
 [interactive]
   diffFilter    = git delta --color-only
 [merge]
-  conflictstyle = diff3
+  conflictStyle = zdiff3
 [delta]
   navigate      = true
   line-numbers  = true

writing/zk/config/sh/alias.d/zk.sh

@@ -8,3 +8,10 @@ n() {
         zk "${@}"
     fi
 }
+
+# open notes with my vim zettelkasten plugin
+# TODO better implementation conditional on zk.nvim & zettelkasten existing
+# nvim +'lua pcall(require "zk.commands"') --headless +qa 2>&1 or similar to check - but slow
+if command -v nvim >/dev/null 2>&1; then
+    alias ni='nvim +"lua require \"zk.commands\".get(\"ZkCd\")()" +"edit $WIKIROOT/index.md"'
+fi