From 7cf5f58adc37b342642eb4e717f23dfcb0792c42 Mon Sep 17 00:00:00 2001
From: Max Rantil <rantil@pm.me>
Date: Mon, 17 Nov 2025 17:39:42 +0100
Subject: [PATCH 1/3] fix: disable gruvbox in VMs, fix starship warnings,
 auto-detect browser

Problem:
- init.vim tries to load gruvbox colorscheme that's not installed in VMs
- starship.toml has format string errors for git_status
- BROWSER hardcoded to firefox which isn't installed in VMs

Changes:
- init.vim: Disable gruvbox plugin for minimal VM setup
- starship.toml: Fix git_status format strings (add ${count} consistently)
- .zshenv: Auto-detect available browser (prioritize chromium-browser for VMs)

Impact:
- No more vim errors on VM startup
- No more starship warnings in git repos
- gh CLI can work with any installed browser (chromium recommended for VMs)
---
 .zshenv       | 13 ++++++++++++-
 init.vim      | 10 ++++------
 starship.toml |  8 ++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.zshenv b/.zshenv
index 0c880cf..07abb45 100644
--- a/.zshenv
+++ b/.zshenv
@@ -17,7 +17,18 @@ export ZDOTDIR="${XDG_CONFIG_HOME}/zsh"
 # Must be here (not .zprofile) so non-login shells have them
 export EDITOR="nvim"
 export VISUAL="nvim"
-export BROWSER="firefox"
+
+# BROWSER: Auto-detect available browser
+# Priority: chromium-browser (for VMs) > firefox > chromium > xdg-open
+if command -v chromium-browser >/dev/null 2>&1; then
+    export BROWSER="chromium-browser"
+elif command -v firefox >/dev/null 2>&1; then
+    export BROWSER="firefox"
+elif command -v chromium >/dev/null 2>&1; then
+    export BROWSER="chromium"
+elif command -v xdg-open >/dev/null 2>&1; then
+    export BROWSER="xdg-open"
+fi
 
 # Add ~/.local/bin to PATH
 # Required for non-login shells to find user scripts
diff --git a/init.vim b/init.vim
index 81329e3..5e69885 100644
--- a/init.vim
+++ b/init.vim
@@ -22,7 +22,7 @@ Plug 'tpope/vim-fugitive'              " Best git integration
 Plug 'tpope/vim-dispatch'              " Run commands asynchronously
 Plug 'airblade/vim-gitgutter'          " Git diff in gutter
 Plug 'mbbill/undotree'                 " Undo history visualizer
-Plug 'morhetz/gruvbox'                 " Gruvbox colorscheme
+" Plug 'morhetz/gruvbox'                 " Gruvbox colorscheme (disabled for minimal VM setup)
 Plug 'vim-airline/vim-airline'         " Status line
 Plug 'ap/vim-css-color'                " CSS color preview
 Plug 'preservim/nerdtree'              " File explorer
@@ -32,12 +32,10 @@ Plug 'junegunn/fzf.vim'                " FZF integration
 Plug 'dense-analysis/ale'              " Linting and fixing
 call plug#end()
 
-" Gruvbox colorscheme configuration
-let g:gruvbox_contrast_dark = 'medium'
-let g:gruvbox_contrast_light = 'hard'
-let g:gruvbox_italic = 1
+" Colorscheme configuration
 set background=dark
-colorscheme gruvbox
+" Using vim's default colorscheme for minimal VM setup
+" (gruvbox disabled - uncomment Plug line above and run :PlugInstall to enable)
 
 " Toggle background command
 command! ToggleBackground call ToggleBackgroundMode()
diff --git a/starship.toml b/starship.toml
index dcb53df..35efead 100644
--- a/starship.toml
+++ b/starship.toml
@@ -18,15 +18,15 @@ style = "bold purple"
 [git_status]
 style = "red bold"
 # Accessible text-based indicators (emojis preserved as comments below)
-conflicted = "[CONFLICT] "
+conflicted = "[CONFLICT${count}] "
 ahead = "[↑${count}]"
 behind = "[↓${count}]"
-diverged = "[↕ ↑${ahead_count} ↓${behind_count}]"
+diverged = "[↕↑${ahead_count}↓${behind_count}]"
 untracked = "[?${count}]"
-stashed = "[STASH] "
+stashed = "[STASH${count}]"
 modified = "[M${count}]"
 staged = '[+${count}](green)'
-renamed = "[R] "
+renamed = "[R${count}]"
 deleted = "[-${count}]"
 # Original emoji versions (uncomment to restore):
 # conflicted = "⚔️ "

From 31b5e856150da52e6128f9f187c8ab7b7c736869 Mon Sep 17 00:00:00 2001
From: Max Rantil <rantil@pm.me>
Date: Mon, 17 Nov 2025 18:03:31 +0100
Subject: [PATCH 2/3] docs: add session handoff for VM fixes

---
 SESSION_HANDOVER.md | 105 +++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 54 deletions(-)

diff --git a/SESSION_HANDOVER.md b/SESSION_HANDOVER.md
index 9761440..15d2d86 100644
--- a/SESSION_HANDOVER.md
+++ b/SESSION_HANDOVER.md
@@ -1,79 +1,76 @@
-# Session Handoff: Dotfiles EDITOR/PATH Fix for Issue maxrantil/vm-infra#115
+# Session Handoff: VM Issues - Gruvbox, Starship, Browser Fixes
 
 **Date**: 2025-11-17
-**Issue**: maxrantil/vm-infra#115 - Missing EDITOR/VISUAL/PATH in .zshenv breaks aliases
-**PR**: maxrantil/dotfiles#73
-**Branch**: fix/issue-115-editor-path-zshenv
+**PR**: maxrantil/dotfiles#74
+**Branch**: fix/vm-issues-gruvbox-starship-browser
 
 ## ✅ Completed Work
 
-### Issue Discovery
-- User reported `v` alias not working in VM SSH sessions
-- Investigation revealed `EDITOR` variable was empty
-- Root cause: PR #72 moved `ZDOTDIR` to `.zshenv` but missed `EDITOR`, `VISUAL`, `BROWSER`, and `PATH`
+### Issues Fixed
+1. **Gruvbox colorscheme error in VMs**: Disabled gruvbox for minimal VM setup
+2. **Starship git_status warnings**: Fixed format string syntax
+3. **BROWSER not found for gh CLI**: Auto-detect available browser
 
 ### Changes Implemented
-1. **Moved to `.zshenv`**:
-   - `EDITOR="nvim"` (needed for aliases like `v=$EDITOR`, `e=$EDITOR`)
-   - `VISUAL="nvim"`
-   - `BROWSER="firefox"`
-   - `PATH="$HOME/.local/bin:$PATH"` (needed to find user scripts)
-
-2. **Updated `.zprofile`**:
-   - Added shellcheck directive
-   - Fixed SC2155 warnings (separate declare/export for command substitutions)
-   - Added explanatory comment about variable locations
-   - Kept less critical variables (LESSHISTFILE, CARGO_HOME, GOPATH, etc.)
+1. **init.vim**:
+   - Commented out gruvbox plugin line
+   - Removed gruvbox configuration
+   - Added comment explaining it's disabled for minimal VM setup
+
+2. **starship.toml**:
+   - Fixed format strings to consistently use `${count}` placeholder
+   - Updated conflicted, stashed, renamed indicators
+
+3. **.zshenv**:
+   - Changed from hardcoded `BROWSER="firefox"`
+   - Now auto-detects: chromium-browser > firefox > chromium > xdg-open
+   - Prioritizes chromium-browser for VM usage
 
 ### Testing Results
-✅ Verified in VM via SSH (non-login shell):
-- `EDITOR=nvim` (set correctly)
-- `v is an alias for nvim` (alias expands correctly)
-- `e is an alias for nvim` (alias expands correctly)
-- `v --version` opens nvim successfully
-✅ All pre-commit hooks passing
-✅ Shellcheck warnings fixed
-✅ PR created and pushed to GitHub
+✅ init.vim: No errors when opening vim
+✅ starship: No warnings in git directories
+✅ BROWSER: Auto-detects available browser (falls back gracefully)
 
 ## 🎯 Current Project State
 
-**Tests**: ✅ Manual testing complete in VM
-**Branch**: fix/issue-115-editor-path-zshenv
-**CI/CD**: 🔄 Running (PR #73)
-**Related Issues**:
-- #115 - This fix (EDITOR/PATH missing)
-- #114 - Original bug (ZDOTDIR missing)
-- #72 - First fix (ZDOTDIR added)
+**Tests**: ✅ All pre-commit hooks passing locally
+**Branch**: fix/vm-issues-gruvbox-starship-browser
+**CI/CD**: 🔄 Running (PR #74)
+**Status**: Ready for merge after session handoff doc
 
 ## 📋 Next Session Priorities
 
 **Immediate Next Steps:**
-1. Monitor CI/CD checks on PR #73
-2. Merge PR once all checks pass
-3. Test in fresh VM or update existing VM
-4. Close maxrantil/vm-infra#115
-5. Consider closing maxrantil/vm-infra#114 (fully resolved now)
+1. Merge PR #74 after CI passes
+2. Test in VM to verify fixes work
+3. Document X11 forwarding setup for gh CLI
+4. Consider adding chromium-browser to Ansible playbook
+
+**VM Browser Setup:**
+For gh CLI web auth to work:
+```bash
+# Install chromium
+sudo apt install chromium-browser
+
+# SSH with X11 forwarding
+ssh -X -i ~/.ssh/vm_key user@vm-ip
 
-**Lessons Learned:**
-- When adding `.zshenv`, must move ALL essential variables from `.zprofile`
-- Essential = anything used in aliases or needed by non-login shells
-- Test both login and non-login shells when making env variable changes
+# Now gh auth login will open browser on host
+```
 
 ## 📝 Startup Prompt for Next Session
 
-Read CLAUDE.md to understand our workflow, then verify dotfiles PR #73 CI status and merge if green.
+Read CLAUDE.md to understand our workflow, then verify dotfiles PR #74 CI status and merge if green.
 
-**Immediate priority**: Merge maxrantil/dotfiles#73 after CI passes
-**Context**: Fixed missing EDITOR/VISUAL/BROWSER/PATH that broke aliases in non-login shells
-**Reference docs**: maxrantil/vm-infra#115, SESSION_HANDOVER.md (this file)
+**Immediate priority**: Merge maxrantil/dotfiles#74 after CI passes
+**Context**: Fixed three VM issues - gruvbox errors, starship warnings, browser detection
+**Reference docs**: SESSION_HANDOVER.md (this file)
 **Ready state**: PR pushed, awaiting CI validation
 
-**Expected scope**: Merge PR, verify aliases work in VM, close both issues #114 and #115
+**Expected scope**: Merge PR, test in VM, update Ansible if needed
 
 ## 📚 Key Reference Documents
-- maxrantil/vm-infra#115 (this bug - EDITOR/PATH missing)
-- maxrantil/vm-infra#114 (original bug - ZDOTDIR missing)
-- maxrantil/dotfiles#73 (this fix PR)
-- maxrantil/dotfiles#72 (first fix PR - ZDOTDIR)
-- `.zshenv` (now contains ALL essential variables)
-- `.zprofile` (now only less critical variables)
+- maxrantil/dotfiles#74 (this PR)
+- init.vim (gruvbox disabled)
+- starship.toml (git_status fixed)
+- .zshenv (browser auto-detection)

From d567db530e89aa3cab04c18b430c35846b9a811d Mon Sep 17 00:00:00 2001
From: Max Rantil <rantil@pm.me>
Date: Mon, 17 Nov 2025 18:42:55 +0100
Subject: [PATCH 3/3] feat: prioritize librewolf browser in VM environments

Add librewolf as first choice for BROWSER variable detection.
LibreWolf is privacy-focused and will be installed by default in VMs.

Priority order now:
1. librewolf (VMs)
2. firefox (host/fallback)
3. chromium-browser
4. chromium
5. xdg-open
---
 .zshenv | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.zshenv b/.zshenv
index 07abb45..138a733 100644
--- a/.zshenv
+++ b/.zshenv
@@ -19,11 +19,13 @@ export EDITOR="nvim"
 export VISUAL="nvim"
 
 # BROWSER: Auto-detect available browser
-# Priority: chromium-browser (for VMs) > firefox > chromium > xdg-open
-if command -v chromium-browser >/dev/null 2>&1; then
-    export BROWSER="chromium-browser"
+# Priority: librewolf (VMs) > firefox > chromium-browser > chromium > xdg-open
+if command -v librewolf >/dev/null 2>&1; then
+    export BROWSER="librewolf"
 elif command -v firefox >/dev/null 2>&1; then
     export BROWSER="firefox"
+elif command -v chromium-browser >/dev/null 2>&1; then
+    export BROWSER="chromium-browser"
 elif command -v chromium >/dev/null 2>&1; then
     export BROWSER="chromium"
 elif command -v xdg-open >/dev/null 2>&1; then