From e724f92c68c6df34c5ad3dc56fc0d4bb6e0fb06c Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 8 Sep 2025 21:56:40 +0200 Subject: [PATCH 1/5] services: Change user directory fr new turnstile version --- .dotter/global.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dotter/global.toml b/.dotter/global.toml index d2e309e..06895f8 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -65,7 +65,7 @@ office = "~" [services.files] "services/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" } "services/usv.sh" = { target = "~/.config/sh/alias.d/usv.sh", type = "symbolic" } -"services/sv" = { target = "~/.config/sv", type = "symbolic"} +"services/sv" = { target = "~/.config/service", type = "symbolic"} # FIXME: Disabling existing systemd services for the moment "services/systemd" = { target = "~/NOWHERE", type = "symbolic", if = "false" } services = "~" From 7ef65f23505526b22d9f62b9d71faf78ecf5990d Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 8 Sep 2025 21:56:40 +0200 Subject: [PATCH 2/5] nvim: Revert to upstream wrapping plugin The plugin fixed my heuristics issue upstream allowing me to make use of it again for all my writing needs. --- nvim/.config/nvim/lazy-lock.json | 2 +- nvim/.config/nvim/lua/plugins/prose.lua | 30 +------------------------ 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 7c6af64..8268a23 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -101,7 +101,7 @@ "vim-spellsync": { "branch": "master", "commit": "ea9f431483ceb40ede8bd5b126a03eccd49b1bc0" }, "wezterm.nvim": { "branch": "main", "commit": "f73bba23ab4becd146fa2d0a3a16a84b987eeaca" }, "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }, - "wrapping.nvim": { "branch": "feat/nontextual-detection-option", "commit": "cf6e758c04899cbfaa4f4eadccbb91d2439a6c97" }, + "wrapping.nvim": { "branch": "master", "commit": "bbf1b6e4d6a94f1c362125dc927284086e9fad7d" }, "zen-mode.nvim": { "branch": "main", "commit": "04b52674b8c800f8b7d4609e8bd8d0212e3ffa79" }, "zk-nvim": { "branch": "main", "commit": "fd1ab2239ed85ca51051c094a49a280f4ed76bb2" } } diff --git a/nvim/.config/nvim/lua/plugins/prose.lua b/nvim/.config/nvim/lua/plugins/prose.lua index b6b2b5e..a4dcf9e 100644 --- a/nvim/.config/nvim/lua/plugins/prose.lua +++ b/nvim/.config/nvim/lua/plugins/prose.lua @@ -85,40 +85,12 @@ local prose_plugs = { }, }, { - "marty-oehme/wrapping.nvim", - branch = "feat/nontextual-detection-option", + "andrewferrier/wrapping.nvim", opts = { create_keymaps = false, notify_on_switch = false, auto_set_mode_filetype_allowlist = prose_ft, softener = { quarto = 2.0, markdown = 2.0, djot = 2.0 }, - nontextual_heuristic = function() - local nb = vim.tbl_get(vim.env, "ZK_NOTEBOOK_DIR") or vim.tbl_get(vim.env, "WIKIROOT") - if nb then - if vim.fn.expand("%:p:h"):find(nb) then - return false - end - return true - end - local get_clients - - if vim.fn.has("nvim-0.10") == 1 then - get_clients = vim.lsp.get_clients - else - get_clients = vim.lsp.get_active_clients - end - - for _, client in pairs(get_clients({ bufnr = 0 })) do - if - client.server_capabilities.definitionProvider - or client.server_capabilities.signatureHelpProvider - then - return true - end - end - - return false - end, }, ft = prose_ft, keys = { From 3c80a0cb5f70ff5af1a25cf7ea8fc72f670959a3 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 8 Sep 2025 21:56:40 +0200 Subject: [PATCH 3/5] nvim: Show LLM model choices on selection This used to be default (and according to the docs still is?) but I had to set it manually to still show all models to select from. Perhaps because we explicitly set 'show_defaults' we also have to be explicit about this. --- nvim/.config/nvim/lazy-lock.json | 4 ++-- nvim/.config/nvim/lua/plugins/llm.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 8268a23..4dda1ad 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -9,8 +9,8 @@ "cmp-pandoc.nvim": { "branch": "main", "commit": "30faa4456a7643c4cb02d8fa18438fd484ed7602" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "codecompanion-gitcommit.nvim": { "branch": "main", "commit": "e237b9901d64074fa84f74c1b20892303e3e1830" }, - "codecompanion-history.nvim": { "branch": "main", "commit": "b9f1afb77f1a8805e686f89ac38338a9ca588579" }, - "codecompanion.nvim": { "branch": "main", "commit": "76f1c1aaedbb159256dbc64705cd34f447046d64" }, + "codecompanion-history.nvim": { "branch": "main", "commit": "eb99d256352144cf3b6a1c45608ec25544a0813d" }, + "codecompanion.nvim": { "branch": "main", "commit": "4bc03c40b8f7f5e5d3c324479a893c6589471446" }, "conform.nvim": { "branch": "master", "commit": "a6f5bdb78caa305496357d17e962bbc4c0b392e2" }, "copilot-lualine": { "branch": "main", "commit": "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333" }, "copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" }, diff --git a/nvim/.config/nvim/lua/plugins/llm.lua b/nvim/.config/nvim/lua/plugins/llm.lua index c9e1894..78e71b8 100644 --- a/nvim/.config/nvim/lua/plugins/llm.lua +++ b/nvim/.config/nvim/lua/plugins/llm.lua @@ -65,6 +65,7 @@ return { http = { opts = { show_defaults = true, -- TODO: set to false to only enable working, but does not show copilot then + show_model_choices = true, }, groq = function() return require("codecompanion.adapters").extend("openai", { @@ -143,7 +144,6 @@ return { }, }, prompt_library = { - ["Smart Paste"] = { strategy = "inline", description = "Paste code smartly", From e6a64dca29f76f427c613ce15c6466b8c6798a0f Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 8 Sep 2025 21:56:40 +0200 Subject: [PATCH 4/5] nvim: Update jj-diffconflicts Update to version which includes hiding instructions message on startup. --- nvim/.config/nvim/lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 4dda1ad..77a53ba 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -29,7 +29,7 @@ "hunk.nvim": { "branch": "master", "commit": "1e0a4d719c780bb8b0690a54915601508ced321e" }, "image.nvim": { "branch": "master", "commit": "a4638ec549c6aa56264cb0371255192ff37a8a90" }, "img-clip.nvim": { "branch": "main", "commit": "0bb8b5ced45c2672c70184c87d014194b0705815" }, - "jj-diffconflicts": { "branch": "main", "commit": "82b4a871b43c447213243e53b6d8b3c6d5729f6e" }, + "jj-diffconflicts": { "branch": "main", "commit": "1e98328054902209a5338ec80f26b8e8a13cfb26" }, "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" }, "lazy-events.nvim": { "branch": "main", "commit": "63802b7ddc852bdfa29e33b158d52429276fa742" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, From 27230c7470c41fa925e434412f22337ec053a74b Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Mon, 8 Sep 2025 21:56:40 +0200 Subject: [PATCH 5/5] nvim: Update groq models Remove deprecated models and update to new moonshot version. --- nvim/.config/nvim/lua/plugins/llm.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nvim/.config/nvim/lua/plugins/llm.lua b/nvim/.config/nvim/lua/plugins/llm.lua index 78e71b8..38a90ba 100644 --- a/nvim/.config/nvim/lua/plugins/llm.lua +++ b/nvim/.config/nvim/lua/plugins/llm.lua @@ -81,14 +81,13 @@ return { -- production models "llama-3.3-70b-versatile", "llama-3.1-8b-instant", - "moonshotai/kimi-k2-instruct", + "moonshotai/kimi-k2-instruct-0905", "meta-llama/llama-guard-4-12b", "openai/gpt-oss-120b", "openai/gpt-oss-20b", -- preview models "meta-llama/llama-4-maverick-17b-128e-instruct", "meta-llama/llama-4-scout-17b-16e-instruct", - "deepseek-r1-distill-llama-70b", "qwen/qwen3-32b", }, },