feat(bin): add ollama-for-gitbutler wrapper script

Run a dedicated ollama instance for GitButler on a separate port
(11435) with permissive origins and long keep-alive, avoiding
conflicts with any primary ollama server.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

bin/ollama-for-gitbutler

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# Defaults
+DEFAULT_BIND="127.0.0.1"
+DEFAULT_PORT="11435"
+DEFAULT_ORIGINS="*"
+DEFAULT_KEEP_ALIVE="6h"
+
+print-help() {
+  cat <<EOF
+Usage: ollama-for-gitbutler [options]
+
+Options:
+  -b, --bind <addr>            The address to bind to (default: "${DEFAULT_BIND}")
+  -p, --port <port>            The port to listen on (default: "${DEFAULT_PORT}")
+  -m, --models <dir>           Override ollama's default models directory
+  -k, --keep-alive <duration>  The duration that models stay loaded in memory (default: "${DEFAULT_KEEP_ALIVE}")
+  -h, --help                   Print this help message
+EOF
+}
+
+BIND="${DEFAULT_BIND}"
+PORT="${DEFAULT_PORT}"
+KEEP_ALIVE="${DEFAULT_KEEP_ALIVE}"
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+  -b | --bind)
+    BIND="$2"
+    shift 2
+    ;;
+  -p | --port)
+    PORT="$2"
+    shift 2
+    ;;
+  -m | --models)
+    export OLLAMA_MODELS="$2"
+    shift 2
+    ;;
+  -k | --keep-alive)
+    KEEP_ALIVE="$2"
+    shift 2
+    ;;
+  -h | --help)
+    print-help
+    exit 0
+    ;;
+  *)
+    echo "Unknown option: $1" >&2
+    print-help >&2
+    exit 1
+    ;;
+  esac
+done
+
+export OLLAMA_HOST="${BIND}:${PORT}"
+export OLLAMA_KEEP_ALIVE="${KEEP_ALIVE}"
+export OLLAMA_ORIGINS="${DEFAULT_ORIGINS}"
+
+exec ollama serve "$@"

config/mise/config.toml

@@ -24,9 +24,6 @@ bun = true
 uvx = true
 
 [settings.ruby]
-# ruby-install supports new releases immediately, as opposed to ruby-build which
-# requires an update before new releases are available.
-ruby_install = true
 # Precompiled binaries causes issues with Ruby LSP.
 compile = true
 
@@ -48,6 +45,7 @@ compile = true
 "cargo:paper-terminal" = "latest"
 "cargo:parallel-disk-usage" = { version = "latest", bin = "pdu" }
 "cargo:pastel" = "latest"
+"cargo:riffdiff" = "latest"
 "github:stacklok/toolhive" = "latest"
 "go:github.com/rakyll/hey" = "latest"
 "go:google.golang.org/grpc/cmd/protoc-gen-go-grpc" = "latest"
@@ -57,6 +55,7 @@ compile = true
 "npm:@openai/codex" = "latest"
 "npm:@prettier/plugin-php" = "latest"
 "npm:claude-plugins" = "latest"
+"npm:convex" = "latest"
 "npm:dockerfile-language-server-nodejs" = "latest"
 "npm:eslint" = "latest"
 "npm:eslint-config-prettier" = "latest"
@@ -68,9 +67,12 @@ compile = true
 "npm:jsonlint" = "latest"
 "npm:localtunnel" = "latest"
 "npm:markdown-it" = "latest"
+"npm:oxfmt" = "latest"
+"npm:oxlint" = "latest"
 "npm:prettier" = "latest"
 "npm:prettier-plugin-toml" = "latest"
 "npm:prettier-pnp" = "latest"
+"npm:skills" = "latest"
 "npm:stylelint" = "latest"
 "npm:svgo" = "latest"
 "npm:typescript" = "latest"
@@ -86,7 +88,7 @@ compile = true
 "pipx:pipx" = "latest"
 "pipx:toml-sort" = "latest"
 "pipx:yamllint" = "latest"
-1password-cli = "latest"
+1password = "latest"
 actionlint = "latest"
 argo-rollouts = "latest"
 argocd = "latest"
@@ -135,8 +137,10 @@ kubelogin = "latest"
 kubens = "latest"
 kustomize = "latest"
 lua = "latest"
+lua-language-server = "latest"
 markdownlint-cli2 = "latest"
 node = "lts"
+opencode = "latest"
 opentofu = "latest"
 pnpm = "latest"
 python = "latest"

gitignore

@@ -1,25 +1,34 @@
+**/._zinit/*
+**/.agents/drafts/
+**/.agents/plans/
+**/.agents/reviews/
+**/.claude/drafts/
+**/.claude/plans/
+**/.claude/reviews/
+**/.claude/settings.local.json
+**/.claude/worktrees/
+**/.vscode/settings.json
+**/.vscode/settings.local.json
+**/chart/preprod-values.yaml
+**/chart/production-values.yaml
+**/chart/staging-values.yaml
+**/log/*.bz2
+**/log/*.gz
+**/test/dummy/log/*.bz2
+**/test/dummy/log/*.gz
+**/vendor/bundle
 .AppleDouble
 .DS_Store
-._zinit/*
 .bin
-.claude/settings.local.json
-.claude/plans/
 .bundle
 .byebug_history
 .dir-locals.el
 .envrc
 .mise.*local.toml
-.mise.local.toml
 .projectile
 .stfolder
 .stignore
 .vagrant
-.vscode/settings.json
 .zinitrc.zsh
-log/*.bz2
-log/*.gz
 mise.*local.toml
 routes.txt
-test/dummy/log/*.bz2
-test/dummy/log/*.gz
-vendor/bundle

hammerspoon/hosts/hati.lua

@@ -11,12 +11,13 @@ local function init_hotkeys()
   hs.hotkey.bind({ 'cmd', 'alt', 'ctrl' }, 'S', apptoggle.showAppInfo)
 
   apptoggle:bind({ 'cmd', 'alt', 'ctrl' }, 'A', { 'Activity Monitor' })
+  apptoggle:bind({ 'cmd', 'ctrl' }, '1', { 'Codex' })
   apptoggle:bind({ 'cmd', 'ctrl' }, '2', { 'Claude' })
-  apptoggle:bind({ 'cmd', 'ctrl' }, '4', { 'Open WebUI' })
+  apptoggle:bind({ 'cmd', 'ctrl' }, '3', { 'Conductor' })
+  apptoggle:bind({ 'cmd', 'ctrl' }, '4', { 'ChatGPT Atlas' }, { 'ChatGPT' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'A', { 'Argo CD' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'B', { 'TablePlus' }, { 'Lens' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'D', { 'Mail+ for Gmail' }, { 'Notion Mail' })
-  apptoggle:bind({ 'cmd', 'ctrl' }, 'E', { 'Cursor' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'F', { 'GitButler' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'G', { 'Emacs', '/Applications/Emacs.app' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'T', { 'TeamSpeak 3', '/Applications/TeamSpeak 3 Client.app' })
@@ -29,6 +30,7 @@ local function init_hotkeys()
     { 'Google Calendar' }
   )
 
+  apptoggle:bind({ 'cmd', 'ctrl' }, 'E', { 'Cursor' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'W',
     { 'Code - Insiders', '/Applications/Visual Studio Code - Insiders.app' },
     { 'Code', '/Applications/Visual Studio Code.app' }

hammerspoon/hosts/noct.lua

@@ -11,7 +11,10 @@ local function init_hotkeys()
   hs.hotkey.bind({ 'cmd', 'alt', 'ctrl' }, 'S', apptoggle.showAppInfo)
 
   apptoggle:bind({ 'cmd', 'alt', 'ctrl' }, 'A', { 'Activity Monitor' })
+  apptoggle:bind({ 'cmd', 'ctrl' }, '1', { 'Codex' })
   apptoggle:bind({ 'cmd', 'ctrl' }, '2', { 'Claude' })
+  apptoggle:bind({ 'cmd', 'ctrl' }, '3', { 'Conductor' })
+  apptoggle:bind({ 'cmd', 'ctrl' }, '4', { 'ChatGPT' }, { 'ChatGPT Atlas' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'A', { 'Messages' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'B', { 'TablePlus' }, { 'Sequel Pro' }, { 'Lens' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'D', { 'Mail+ for Gmail' }, { 'Mimestream' })
@@ -22,14 +25,9 @@ local function init_hotkeys()
   apptoggle:bind({ 'cmd', 'ctrl' }, 'X', { 'Notion' }, { 'Obsidian' })
   apptoggle:bind({ 'cmd', 'ctrl' }, 'Z', { 'WhatsApp' })
 
-  apptoggle:bind({ 'cmd', 'ctrl' }, '4',
-    { 'ChatGPT' },
-    { 'ChatGPT Atlas' }
-  )
-
   apptoggle:bind({ 'cmd', 'ctrl' }, 'W',
-    { 'Code - Insiders', '/Applications/Visual Studio Code - Insiders.app' },
+    { 'Code', '/Applications/Visual Studio Code.app' },
-    { 'Code', '/Applications/Visual Studio Code.app' }
+    { 'Code - Insiders', '/Applications/Visual Studio Code - Insiders.app' }
   )
 
   apptoggle:bind({ 'cmd', 'ctrl' }, 'C',

hammerspoon/window_management.lua

@@ -12,7 +12,7 @@ local wm = {
   animationDuration = 0.0,
   gridSizes = { default = '30x20', interactive = '8x4' },
   gridTextSize = 50,
-  margins = { w = 4, h = 4 }
+  margins = { w = 0, h = 0 }
 }
 
 -- Initialize and register keybindings

install.sh

@@ -87,6 +87,11 @@ install_private() {
     "$ROOT_PATH/$PRIVATE_PATH"
 }
 
+install_agentic() {
+  git_clone "git@github.com:jimeh/agentic.git" \
+    "$HOME/.config/agentic"
+}
+
 install_launch_agents() {
   mkdir -p "$HOME/Library/LaunchAgents"
   for file in $ROOT_PATH/launch_agents/*.plist; do
@@ -256,6 +261,7 @@ display_help() {
   echo '          info: Display target and source directory information.'
   echo '  emacs_config: Install Emacs configuration.'
   echo '       private: Install private dotfiles.'
+  echo '       agentic: Clone agentic repo to ~/.config/agentic.'
   echo '      homebrew: Install Homebrew (Mac OS X only).'
   echo '         rbenv: Install rbenv, a Ruby version manager.'
   echo ' launch_agents: Install launchd plists to ~/Library/LaunchAgents/'
@@ -278,6 +284,9 @@ case "$1" in
   private)
     install_private
     ;;
+  agentic)
+    install_agentic
+    ;;
   homebrew | brew)
     install_homebrew
     ;;

zsh/iterm2.zsh

@@ -0,0 +1,7 @@
+#
+# iTerm2 environment setup.
+#
+
+if [ -f "${HOME}/.iterm2_shell_integration.zsh" ]; then
+  source "${HOME}/.iterm2_shell_integration.zsh"
+fi

zsh/rust.zsh

@@ -21,6 +21,10 @@ if command-exists batman; then
   alias man="batman"
 fi
 
+if command-exists batdiff; then
+  alias biff="batdiff"
+fi
+
 # ==============================================================================
 # completions
 # ==============================================================================

zshenv

@@ -396,6 +396,9 @@ path_prepend "$HOME/.codeium/windsurf/bin"
 # LM Studio setup
 path_prepend "$HOME/.cache/lm-studio/bin"
 
+# ToolHive setup
+path_prepend "$HOME/.toolhive/bin"
+
 # ==============================================================================
 # Local Overrides
 # ==============================================================================

zshrc

@@ -334,6 +334,7 @@ source "$DOTZSH/nix.zsh"
 source "$DOTZSH/restish.zsh"
 source "$DOTZSH/tldr.zsh"
 source "$DOTZSH/tmux.zsh"
+source "$DOTZSH/iterm2.zsh"
 source "$DOTZSH/vscode.zsh"
 source "$DOTZSH/zoxide.zsh"