nvim/.config/nvim/lazy-lock.json

@@ -2,7 +2,6 @@
   "Arduino.nvim": { "branch": "main", "commit": "774b841ef0306f88318a97d5a3527baa62241f15" },
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
   "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
-  "VectorCode": { "branch": "main", "commit": "171361ea0410e739f9bf2a04c75113cd80d3c0d0" },
   "bats.vim": { "branch": "master", "commit": "6a5d2ef22b0ede503d867770afd02ebb1f97b709" },
   "blink-copilot": { "branch": "main", "commit": "41e91a659bd9b8cba9ba2ea68a69b52ba5a9ebd8" },
   "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },

nvim/.config/nvim/lua/core/languages.lua

@@ -72,7 +72,7 @@ local languages = {
 		dap = { "delve" },
 	},
 	graphql = { format = { graphql = { "prettier" } } },
-	html = { lsp = { superhtml = {} }, format = { shtml = { "superhtml" }, html = { "superhtml", "rustywind" } } },
+	html = { lsp = { htmx = {} }, format = { html = { "prettier", "rustywind" } } },
 	julia = { lsp = { julials = {} }, ts = { "julia" } },
 	json = {
 		lsp = { jsonls = {} },

nvim/.config/nvim/lua/modules/llm.lua

@@ -89,16 +89,6 @@ return {
 			{ "ibhagwan/fzf-lua", optional = true },
 			"ravitemer/codecompanion-history.nvim",
 			"jinzhongjia/codecompanion-gitcommit.nvim",
-			{
-				"Davidyz/VectorCode",
-				cond = vim.fn.executable("uv") == 1,
-				version = "*",
-				build = 'uv tool install -U "vectorcode[mcp,lsp]"',
-				dependencies = { "nvim-lua/plenary.nvim" },
-				opts = {
-					async_backend = "lsp", -- requires cli install as `uv tool install vectorcode[lsp]`
-				},
-			},
 
 			{ -- enable mcp server agent extensions
 				"ravitemer/mcphub.nvim",
@@ -185,13 +175,11 @@ return {
 			extensions = {
 				history = {
 					enabled = true,
-					opts = {
+					auto_save = false,
-						auto_save = true,
+					expiration_days = 7,
-						expiration_days = 14,
 					picker = "fzf-lua",
 					delete_on_clearing_chat = true,
 				},
-				},
 				gitcommit = {
 					enabled = true,
 					callback = "codecompanion._extensions.gitcommit",
@@ -215,7 +203,6 @@ return {
 						show_result_in_chat = true, -- Show tool results directly in chat buffer
 					},
 				},
-				vectorcode = {},
 			},
 			prompt_library = {
 				["DevOps strategy"] = {

nvim/.config/nvim/lua/modules/prose.lua

@@ -75,11 +75,9 @@ local prose_plugs = {
 		"andrewferrier/wrapping.nvim",
 		opts = {
 			create_keymaps = false,
-			create_commands = false,
 			notify_on_switch = false,
 			auto_set_mode_filetype_allowlist = prose_ft,
 			softener = { quarto = 2.0, markdown = 2.0, djot = 2.0 },
-			log_path = "/dev/null", -- disable logging for normal operations
 		},
 		ft = prose_ft,
 		keys = {

nvim/.config/nvim/lua/modules/terminal.lua

@@ -72,8 +72,7 @@ return { -- simple programmable terminal toggling for nvim
 		end,
 		cmd = { "ToggleTerm", "TermExec", "Lazygit", "Pythonterm", "Euporieterm" },
 		keys = {
-			{ "<leader>tt", ":ToggleTerm<cr>", desc = "terminal buffer" },
+			{ "<leader>tt", ":ToggleTerm<cr>", desc = "terminal" },
-			{ "<leader>tT", ":ToggleTerm direction='float'<cr>", desc = "terminal floating" },
 			{ "<leader>tg", ":Lazygit<cr>", desc = "git floating" },
 			{ "<leader>tG", ":Lazygit!<cr>", desc = "git buffer" },
 			{ "<leader>tp", ":Pythonterm<cr>", desc = "python floating" },

qutebrowser/config/config.py

@@ -98,5 +98,4 @@ colorscheme = f"{state_dir}/qutebrowser/colorscheme.py"
 if os.path.isfile(colorscheme):
     config.source(colorscheme)
 
-c.url.start_pages = ["https://html.duckduckgo.com/lite"]
+c.url.start_pages = "https://html.duckduckgo.com/lite"
-c.url.default_page = "https://html.duckduckgo.com/lite"

qutebrowser/config/searchengines.py

@@ -30,3 +30,5 @@ c.url.searchengines = {
     "w": "https://en.wikipedia.org/w/index.php?search={}",
     "yt": "https://yewtu.be/search?q={}",
 }
+c.url.default_page = "https://start.duckduckgo.com"
+c.url.start_pages = ["https://start.duckduckgo.com"]

terminal/.config/zsh/zshrc

@@ -29,7 +29,6 @@ if command -v zr >/dev/null 2>&1; then
             zdharma-continuum/fast-syntax-highlighting \
             zsh-users/zsh-autosuggestions \
             zsh-users/zsh-completions \
-            olets/zsh-transient-prompt \
     )
 
 else # or manually
@@ -44,13 +43,9 @@ else # or manually
     [ -e $PLUG_FOLDER/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ] && source $PLUG_FOLDER/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
     [ -e $PLUG_FOLDER/alias-tips/alias-tips.plugin.zsh ] && source $PLUG_FOLDER/alias-tips/alias-tips.plugin.zsh
     [ -e $PLUG_FOLDER/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh ] && source $PLUG_FOLDER/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
-    [ -e $PLUG_FOLDER/zsh-transient-prompt/transient-prompt.plugin.zsh ] && source $PLUG_FOLDER/zsh-transient-prompt/transient-prompt.plugin.zsh
 fi
 unset PLUG_FOLDER
 
-ZSH_AUTOSUGGEST_STRATEGY=(history completion)
-ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-
 # simple fzf-tab settings
 zstyle ":fzf-tab:*" fzf-flags "--ansi" "--expect='$continuous_trigger,$print_query'" "--color=hl:$(($#headers == 0 ? 108 : 255))" "--nth=2,3" "--layout=reverse" "--height=${FZF_TMUX_HEIGHT:-75%}" "--tiebreak=begin" "-m" "--bind=tab:down,btab:up,change:top,ctrl-space:toggle" "--cycle" "--query=$query" "--header-lines=$#headers" "--print-query"
 
@@ -96,11 +91,8 @@ zstyle ':fzf-tab:complete:cd:*' fzf-preview 'eza -1 --color=always $realpath'
 # show systemd unit status
 zstyle ':fzf-tab:complete:systemctl-*:*' fzf-preview 'SYSTEMD_COLORS=1 systemctl status $word'
 # env var contents
-zstyle ':fzf-tab:complete:(-parameter-|-brace-parameter-|export|unset|expand):*' \
+zstyle ':fzf-tab:complete:(-command-|-parameter-|-brace-parameter-|export|unset|expand):*' \
 	fzf-preview 'echo ${(P)word}'
-# give MAN pages for cmds or show their expanded path
-zstyle ':fzf-tab:complete:-command-:*' fzf-preview \
-    '(out=$(tldr --color always "$word") 2>/dev/null && echo $out) || (out=$(MANWIDTH=$FZF_PREVIEW_COLUMNS man "$word") 2>/dev/null && echo $out) || (out=$(which "$word") && echo $out) || echo "${(P)word}"'
 
 # show hostname if we are in a distrobox environment
 if [ -n "$DISTROBOX_ENTER_PATH" ] && [ -f /run/.containerenv ]; then
@@ -135,9 +127,6 @@ ENABLE_CORRECTION="true"
 setopt autocd
 
 eval "$(starship init zsh)"
-TRANSIENT_PROMPT_PROMPT='$(starship prompt --terminal-width="$COLUMNS" --keymap="${KEYMAP:-}" --status="$STARSHIP_CMD_STATUS" --pipestatus="${STARSHIP_PIPE_STATUS[*]}" --cmd-duration="${STARSHIP_DURATION:-}" --jobs="$STARSHIP_JOBS_COUNT")'
-TRANSIENT_PROMPT_RPROMPT='$(starship prompt --right --terminal-width="$COLUMNS" --keymap="${KEYMAP:-}" --status="$STARSHIP_CMD_STATUS" --pipestatus="${STARSHIP_PIPE_STATUS[*]}" --cmd-duration="${STARSHIP_DURATION:-}" --jobs="$STARSHIP_JOBS_COUNT")'
-TRANSIENT_PROMPT_TRANSIENT_PROMPT='$(starship module character)'
 eval "$(zoxide init zsh)"
 eval "$(atuin init zsh)"
 export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
@@ -169,7 +158,7 @@ setopt pushd_ignore_dups
 export HISTSIZE=1000000
 export SAVEHIST=1000000
 export HISTFILE="$XDG_DATA_HOME/zsh_history"
-export HISTORY_IGNORE="(jrnl *|pass *|l *|ls *|z *|cd *|cd -|pwd|pwd *|exit|date)"
+export HISTORY_IGNORE="(jrnl *|l *|ls *|z *|cd *|cd -|pwd|pwd *|exit|date)"
 
 ## Set ZSH History aliases
 # Show the top 5 commands used in recent history
@@ -182,17 +171,16 @@ alias history="fc -l -d -D"
 ### Glob Alias expansion
 # Expand aliases inline - see http://blog.patshead.com/2012/11/automatically-expaning-zsh-global-aliases---simplified.html
 globalias() {
+    if [[ $LBUFFER =~ [A-Z0-9]+$ ]]; then
         zle _expand_alias
         zle expand-word
-    zle magic-space
+    fi
+    zle self-insert
 }
 zle -N globalias
-bindkey -M emacs "^ " globalias # expand anything when hitting <c-space>
+bindkey " " globalias
-bindkey -M viins "^ " globalias # only expand when in insert mode for vi
+bindkey "^ " magic-space           # control-space to bypass completion
-bindkey -M emacs " " self-insert
+bindkey -M isearch " " magic-space # normal space during searches
-bindkey -M viins " " self-insert
-bindkey -M vicmd " " self-insert         # space puts a space, even in cmd mode
-bindkey -M isearch " " self-insert # normal space during searches
 
 # allow inserting previous arguments in the current zle input
 # see https://stackoverflow.com/a/34861762
@@ -246,6 +234,8 @@ bindkey -M vicmd 'C' _run-cdi
 # insert-mode keybind is above, using regular fzf sourcing
 bindkey -M vicmd 'T' fzf-file-widget
 
+# space puts a space, even in cmd mode
+bindkey -a ' ' magic-space
 # always allow backspace/delete to remove letters
 bindkey '^?' backward-delete-char
 bindkey -a '^?' backward-delete-char

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

@@ -1,7 +1,5 @@
 #!/usr/bin/env sh
-
+#
-# We have a local wiki
-if [ -n "${WIKIROOT}" ]; then
 
 _zk_wiki() {
     zk --working-dir="$WIKIROOT" "$@"
@@ -15,6 +13,8 @@ if [ -n "${WIKIROOT}" ]; then
     fi
 }
 
+# We have a local wiki
+if [ -n "${WIKIROOT}" ]; then
     # 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