General settings

.mise.toml

@@ -5,4 +5,5 @@
 "aqua:bats-core/bats-core" = "v1.12.0"
 "aqua:koalaman/shellcheck" = "v0.11.0"
 "aqua:mikefarah/yq" = "v4.47.1"
-shfmt = "v3.12.0"
+shfmt = "v3.12.0"
+prettier = "3.6.2"

.prettierignore

@@ -0,0 +1,14 @@
+# Ignore chezmoi specific files that shouldn't be formatted
+.chezmoiroot
+.chezmoiignore
+.chezmoi*
+
+# Ignore generated/external files
+*.patch
+*.diff
+node_modules/
+.git/
+
+# Keep template syntax intact - only format the content, not the templates
+# Comment out if you want to format .tmpl files too:
+# *.tmpl

home/.chezmoidata/packages.yaml

@@ -86,9 +86,8 @@ packages:
       # Productivity
       - obsidian
       - amethyst
+      - keymapp
 
-      # Media
-      - vlc
 
       # Security
       - 1password
@@ -97,17 +96,13 @@ packages:
       # Audio
       - loopback
 
-      # Fonts
-      - font-fira-code-nerd-font
+      # System monitoring
+      - stats
 
       # Terminal
       - ghostty
     mas:
-      # Productivity
+      - 1365531024 # 1Blocker
       - 1532419400 # MeetingBar
       - 1592917505 # Noir
-
-      # Utilities
-      - 1365531024 # 1Blocker
-      - 641027709  # Color Picker
-
+      - 1622835804 # Kagi for Safari

home/.chezmoiexternal.toml.tmpl

@@ -37,3 +37,27 @@
     url = "https://github.com/gpakosz/.tmux.git"
     revision = "23f6e11e65657406be2b2557148d831c631778d7"
     refreshPeriod = "24h"
+
+{{ if lookPath "bat" }}
+# Catppuccin themes for bat
+# Pin to specific commit SHA for security and reproducibility
+[".config/bat/themes/Catppuccin Latte.tmTheme"]
+    type = "file"
+    url = "https://github.com/catppuccin/bat/raw/6810349b28055dce54076712fc05fc68da4b8ec0/themes/Catppuccin%20Latte.tmTheme"
+    refreshPeriod = "168h"
+
+[".config/bat/themes/Catppuccin Frappe.tmTheme"]
+    type = "file"
+    url = "https://github.com/catppuccin/bat/raw/6810349b28055dce54076712fc05fc68da4b8ec0/themes/Catppuccin%20Frappe.tmTheme"
+    refreshPeriod = "168h"
+
+[".config/bat/themes/Catppuccin Macchiato.tmTheme"]
+    type = "file"
+    url = "https://github.com/catppuccin/bat/raw/6810349b28055dce54076712fc05fc68da4b8ec0/themes/Catppuccin%20Macchiato.tmTheme"
+    refreshPeriod = "168h"
+
+[".config/bat/themes/Catppuccin Mocha.tmTheme"]
+    type = "file"
+    url = "https://github.com/catppuccin/bat/raw/6810349b28055dce54076712fc05fc68da4b8ec0/themes/Catppuccin%20Mocha.tmTheme"
+    refreshPeriod = "168h"
+{{ end }}

home/dot_config/bat/config

@@ -0,0 +1,11 @@
+# Catppuccin theme for bat
+--theme="Catppuccin Mocha"
+
+# Show line numbers
+--style="numbers,changes,header"
+
+# Use italic text on the terminal
+--italic-text=always
+
+# Show file headers
+--decorations=always

home/dot_config/dotfiles/package.json

@@ -2,6 +2,7 @@
   "name": "node-global-tools",
   "private": true,
   "devDependencies": {
-    "@anthropic-ai/claude-code": "1.0.98"
+    "@anthropic-ai/claude-code": "1.0.98",
+    "prettier": "3.6.2"
   }
 }

home/dot_config/git/config.tmpl

@@ -17,6 +17,7 @@
 [delta]
 	navigate = true
 	line-numbers = true
+	syntax-theme = "Catppuccin Mocha"
 
 [merge]
 	conflictstyle = zdiff3
@@ -46,26 +47,26 @@
 	br = branch
 	ci = commit
 	st = status
-	
+
 	# Better logging
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 	lga = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all
-	
+
 	# Show files in a commit
 	show-files = show --pretty="" --name-only
-	
+
 	# Undo last commit
 	undo = reset HEAD~1 --mixed
-	
+
 	# Clean up merged branches
 	cleanup = "!git branch --merged | grep -v '\\*\\|main\\|master\\|develop' | xargs -n 1 git branch -d"
-	
+
 	# Quick commit and push
 	cap = "!git add . && git commit -m"
-	
+
 	# Interactive rebase
 	ri = rebase -i
-	
+
 	# Show current branch
 	current = branch --show-current
 
@@ -88,8 +89,8 @@
 	new = green
 
 [color "status"]
-	added = yellow
-	changed = green
+	added = green
+	changed = yellow
 	untracked = cyan
 
 [help]

home/dot_config/mise/config.toml

@@ -1,5 +1,9 @@
 [tools]
 "aqua:dandavison/delta" = "0.18.2"
 "aqua:jqlang/jq" = "1.7.1"
+bun = "1.2.21"
 node = "22.12.0"
 python = "3.13.7"
+
+[settings]
+idiomatic_version_file_enable_tools = ["ruby"]

home/dot_local/bin/executable_patch-monolisa

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -o errexit -o nounset -o pipefail
+
+# Patch MonoLisa font with Nerd Fonts
+# Usage: patch-monolisa [input-dir] [output-dir]
+#
+# Defaults:
+#   input-dir: ./MonoLisa
+#   output-dir: ./patched
+
+INPUT_DIR="${1:-./MonoLisa}"
+OUTPUT_DIR="${2:-./patched}"
+
+if [[ ! -d "$INPUT_DIR" ]]; then
+    echo "Error: Input directory '$INPUT_DIR' does not exist" >&2
+    exit 1
+fi
+
+mkdir -p "$OUTPUT_DIR"
+
+echo "Patching MonoLisa fonts from '$INPUT_DIR' to '$OUTPUT_DIR'..."
+docker run --rm \
+    -v "$INPUT_DIR:/in" \
+    -v "$OUTPUT_DIR:/out" \
+    nerdfonts/patcher --complete
+
+echo "Patching complete! Patched fonts are in '$OUTPUT_DIR'"