diff --git a/desktop/.config/river/init b/desktop/.config/river/init
index d7b86d1..8a2bbf5 100755
--- a/desktop/.config/river/init
+++ b/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_r.jpg"
-        swww img -o "$(echo "$outputs" | tail -n1)" "$HOME/pictures/wall_l.jpg"
+        swww img -o "$(echo "$outputs" | head -n1)" "$HOME/pictures/wall_l.jpg"
+        swww img -o "$(echo "$outputs" | tail -n1)" "$HOME/pictures/wall_r.jpg"
     elif [ -e "$HOME/pictures/wall.jpg" ]; then
         swww img "$HOME/pictures/wall.jpg"
     fi
diff --git a/nvim/.config/nvim/lua/core/commands.lua b/nvim/.config/nvim/lua/core/commands.lua
index ef17d87..d000d38 100644
--- a/nvim/.config/nvim/lua/core/commands.lua
+++ b/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,3 +42,4 @@ vim.api.nvim_create_user_command("SpellToggle", function(opt)
 		vim.notify("Spellcheck disabled")
 	end
 end, { nargs = "*", bang = true })
+
diff --git a/nvim/.config/nvim/lua/plugins/prose.lua b/nvim/.config/nvim/lua/plugins/prose.lua
index b713dc1..76b531b 100644
--- a/nvim/.config/nvim/lua/plugins/prose.lua
+++ b/nvim/.config/nvim/lua/plugins/prose.lua
@@ -256,6 +256,27 @@ 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",
diff --git a/nvim/.config/nvim/spell/en.utf-8.add b/nvim/.config/nvim/spell/en.utf-8.add
index 9509233..481a27d 100644
--- a/nvim/.config/nvim/spell/en.utf-8.add
+++ b/nvim/.config/nvim/spell/en.utf-8.add
@@ -226,4 +226,3 @@ decarbonisation
 Oportunidades
 OECD
 NREGA
-Oehme
diff --git a/nvim/.config/sh/alias.d/neovim.sh b/nvim/.config/sh/alias.d/neovim.sh
index 2d8040d..bd4999f 100644
--- a/nvim/.config/sh/alias.d/neovim.sh
+++ b/nvim/.config/sh/alias.d/neovim.sh
@@ -5,5 +5,8 @@ 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
diff --git a/vcs/git/config/git/config b/vcs/git/config/git/config
index 1bfc097..013cf64 100644
--- a/vcs/git/config/git/config
+++ b/vcs/git/config/git/config
@@ -11,7 +11,7 @@
 [interactive]
   diffFilter    = git delta --color-only
 [merge]
-  conflictStyle = zdiff3
+  conflictstyle = diff3
 [delta]
   navigate      = true
   line-numbers  = true
diff --git a/writing/zk/config/sh/alias.d/zk.sh b/writing/zk/config/sh/alias.d/zk.sh
index b7efa2f..eae9298 100644
--- a/writing/zk/config/sh/alias.d/zk.sh
+++ b/writing/zk/config/sh/alias.d/zk.sh
@@ -8,10 +8,3 @@ 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