From 2d7cb605d3b5b9fc061f7049a98c7208868fe3a6 Mon Sep 17 00:00:00 2001
From: Matthew Ryan Dillon <matthew@akdillon.net>
Date: Tue, 16 Dec 2025 17:59:26 -0500
Subject: [PATCH] zsh/khal: clean up zshrc/zshenv and drop brew khal for uv

---
 home/dot_zshenv.tmpl                     | 13 +++++++++++--
 home/dot_zshrc.tmpl                      | 11 -----------
 home/run_once_01install-packages.sh.tmpl |  3 ---
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/home/dot_zshenv.tmpl b/home/dot_zshenv.tmpl
index f89dca8..6ca5844 100644
--- a/home/dot_zshenv.tmpl
+++ b/home/dot_zshenv.tmpl
@@ -83,8 +83,17 @@ done
 
 export -U PATH
 
+export NVM_DIR="$HOME/.nvm"
 export XDG_CONFIG_HOME=$HOME/.config
-
 export JJ_CONFIG=$XDG_CONFIG_HOME/jj/config.toml
-export OLLAMA_API_BASE=http://127.0.0.1:11434
 export RIPGREP_CONFIG_PATH=$HOME/.ripgreprc
+export FZF_DEFAULT_COMMAND="rg --files --hidden"
+export FZF_DEFAULT_OPTS=" \
+--color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \
+--color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \
+--color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 \
+--color=selected-bg:#45475a \
+--color=border:#313244,label:#cdd6f4"
+
+alias devlog="cd ~/projects/personal/devlog && hx logs/$(date '+%Y-%m-%d').gmi && cd -"
+alias khal='uvx khal "$@"'
diff --git a/home/dot_zshrc.tmpl b/home/dot_zshrc.tmpl
index 7cf3c5a..3a2fc0e 100644
--- a/home/dot_zshrc.tmpl
+++ b/home/dot_zshrc.tmpl
@@ -42,21 +42,10 @@ for fp in $srcs; do
   fi
 done
 
-alias devlog="cd ~/projects/personal/devlog && hx logs/$(date '+%Y-%m-%d').gmi && cd -"
-
 eval "$(/opt/homebrew/bin/brew shellenv)"
 eval "$(direnv hook zsh)"
 eval "$(jj util completion zsh)"
-export NVM_DIR="$HOME/.nvm"
 [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"
 [ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"
 
 [ "$TERM" = "xterm-kitty" ] && alias ssh="TERM=xterm ssh"
-
-export FZF_DEFAULT_COMMAND="rg --files --hidden"
-export FZF_DEFAULT_OPTS=" \
---color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \
---color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \
---color=marker:#b4befe,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8 \
---color=selected-bg:#45475a \
---color=border:#313244,label:#cdd6f4"
diff --git a/home/run_once_01install-packages.sh.tmpl b/home/run_once_01install-packages.sh.tmpl
index 6597ec7..f96f422 100644
--- a/home/run_once_01install-packages.sh.tmpl
+++ b/home/run_once_01install-packages.sh.tmpl
@@ -22,7 +22,6 @@ brew install \
   inlyne \
   jj \
   just \
-  khal \
   lua-language-server \
   luarocks \
   marksman \
@@ -38,8 +37,6 @@ brew install \
   xz \
   zlib
 
-brew services start vdirsyncer
-
 export NVM_DIR="$HOME/.nvm"
 [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"
 nvm install 22