From 083ef0a6ada1edc8039bc4e41f7ef5ec9ac68f1f Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 7 Feb 2025 13:10:58 +0100 Subject: [PATCH 1/5] zk: Move nvim wiki index opening to zk module While technically invoking nvim, it belongs more into the zk module since it is only to be added if zk exists. --- nvim/.config/sh/alias.d/neovim.sh | 3 --- writing/zk/config/sh/alias.d/zk.sh | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nvim/.config/sh/alias.d/neovim.sh b/nvim/.config/sh/alias.d/neovim.sh index bd4999f..2d8040d 100644 --- a/nvim/.config/sh/alias.d/neovim.sh +++ b/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 diff --git a/writing/zk/config/sh/alias.d/zk.sh b/writing/zk/config/sh/alias.d/zk.sh index eae9298..b7efa2f 100644 --- a/writing/zk/config/sh/alias.d/zk.sh +++ b/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 From 31dc3fa9b74d22b8752361d1dbad0858aee27c9a Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 7 Feb 2025 13:12:47 +0100 Subject: [PATCH 2/5] git: Change merge conflict to zdiff3 style --- vcs/git/config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcs/git/config/git/config b/vcs/git/config/git/config index 013cf64..1bfc097 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 = diff3 + conflictStyle = zdiff3 [delta] navigate = true line-numbers = true From 3201039557fd739b216c2d0e30807aecba23ccd0 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 7 Feb 2025 13:13:08 +0100 Subject: [PATCH 3/5] nvim: Remove leftover papis plugin comments --- nvim/.config/nvim/lua/plugins/prose.lua | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/nvim/.config/nvim/lua/plugins/prose.lua b/nvim/.config/nvim/lua/plugins/prose.lua index 76b531b..b713dc1 100644 --- a/nvim/.config/nvim/lua/plugins/prose.lua +++ b/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", From 1c49e52268f0911aef22e8335f428e6b53c38fb1 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 7 Feb 2025 13:13:47 +0100 Subject: [PATCH 4/5] river: Update for current screen setup HACK Still need to figure out a better way to identify and set displays. --- desktop/.config/river/init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/.config/river/init b/desktop/.config/river/init index 8a2bbf5..d7b86d1 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_l.jpg" - swww img -o "$(echo "$outputs" | tail -n1)" "$HOME/pictures/wall_r.jpg" + swww img -o "$(echo "$outputs" | head -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 From bff8f07e606391838ef76cfe4ca1df40edda4ccb Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 7 Feb 2025 13:13:57 +0100 Subject: [PATCH 5/5] nvim: Update spellfile --- nvim/.config/nvim/lua/core/commands.lua | 3 +-- nvim/.config/nvim/spell/en.utf-8.add | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nvim/.config/nvim/lua/core/commands.lua b/nvim/.config/nvim/lua/core/commands.lua index d000d38..ef17d87 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,4 +42,3 @@ vim.api.nvim_create_user_command("SpellToggle", function(opt) vim.notify("Spellcheck disabled") end end, { nargs = "*", bang = true }) - diff --git a/nvim/.config/nvim/spell/en.utf-8.add b/nvim/.config/nvim/spell/en.utf-8.add index 481a27d..9509233 100644 --- a/nvim/.config/nvim/spell/en.utf-8.add +++ b/nvim/.config/nvim/spell/en.utf-8.add @@ -226,3 +226,4 @@ decarbonisation Oportunidades OECD NREGA +Oehme