From 9fc65dd2defa61de76408aff41251a343f2f3832 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 8 Jan 2026 10:22:10 +0100
Subject: [PATCH] Simplify the VSCode/derivatives theme setting

---
 bin/omarchy-theme-set          |  2 --
 bin/omarchy-theme-set-cursor   |  4 ---
 bin/omarchy-theme-set-vscode   | 52 +++++++++++++++-------------------
 bin/omarchy-theme-set-vscodium |  4 ---
 4 files changed, 23 insertions(+), 39 deletions(-)
 delete mode 100755 bin/omarchy-theme-set-cursor
 delete mode 100755 bin/omarchy-theme-set-vscodium

diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set
index 4132d3b8..ba34a501 100755
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@@ -56,8 +56,6 @@ omarchy-restart-mako
 omarchy-theme-set-gnome
 omarchy-theme-set-browser
 omarchy-theme-set-vscode
-omarchy-theme-set-vscodium
-omarchy-theme-set-cursor
 omarchy-theme-set-obsidian
 
 # Call hook on theme set
diff --git a/bin/omarchy-theme-set-cursor b/bin/omarchy-theme-set-cursor
deleted file mode 100755
index 18b962bc..00000000
--- a/bin/omarchy-theme-set-cursor
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Call the VSCode theme setter with Cursor-specific parameters
-omarchy-theme-set-vscode cursor "$HOME/.config/Cursor/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-cursor-theme-changes"
diff --git a/bin/omarchy-theme-set-vscode b/bin/omarchy-theme-set-vscode
index 31f95bf1..bf53013b 100755
--- a/bin/omarchy-theme-set-vscode
+++ b/bin/omarchy-theme-set-vscode
@@ -1,45 +1,39 @@
 #!/bin/bash
 
-# Note: We cannot use `jq` to update settings.json because it’s JSONC (allows comments),
-# which jq doesn’t support.
+# Sync Omarchy theme to VS Code, VSCodium, and Cursor
 
-# Parameters: EDITOR_CMD SETTINGS_PATH SKIP_FLAG EDITOR_NAME
-EDITOR_CMD="${1:-code}"
-SETTINGS_PATH="${2:-$HOME/.config/Code/User/settings.json}"
-SKIP_FLAG="${3:-$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes}"
 VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
 
-if omarchy-cmd-present "$EDITOR_CMD" && [[ ! -f "$SKIP_FLAG" ]]; then
+set_theme() {
+  local editor_cmd="$1"
+  local settings_path="$2"
+  local skip_flag="$3"
+
+  omarchy-cmd-present "$editor_cmd" && [[ ! -f "$skip_flag" ]] || return 0
+
   if [[ -f "$VS_CODE_THEME" ]]; then
     theme_name=$(jq -r '.name' "$VS_CODE_THEME")
     extension=$(jq -r '.extension' "$VS_CODE_THEME")
 
-    # Install theme extension
-    if [[ -n "$extension" ]] && ! "$EDITOR_CMD" --list-extensions | grep -Fxq "$extension"; then
-      "$EDITOR_CMD" --install-extension "$extension" >/dev/null
+    if [[ -n "$extension" ]] && ! "$editor_cmd" --list-extensions | grep -Fxq "$extension"; then
+      "$editor_cmd" --install-extension "$extension" >/dev/null
     fi
 
-    # Create config file if there isn't already one
-    mkdir -p "$(dirname "$SETTINGS_PATH")"
-    if [[ ! -f "$SETTINGS_PATH" ]]; then
-      printf '{\n}\n' >"$SETTINGS_PATH"
+    mkdir -p "$(dirname "$settings_path")"
+    [[ -f "$settings_path" ]] || printf '{\n}\n' >"$settings_path"
+
+    if ! grep -q '"workbench.colorTheme"' "$settings_path"; then
+      sed -i --follow-symlinks -E '0,/\{/{s/\{/{\ "workbench.colorTheme": "",/}' "$settings_path"
     fi
 
-    # Create a `workbench.colorTheme` entry in settings.
-    if ! grep -q '"workbench.colorTheme"' "$SETTINGS_PATH"; then
-      # Insert `"workbench.colorTheme": "",` immediately after the first `{`
-      # Use sed's first-match range (0,/{/) to only replace the first `{`
-      sed -i --follow-symlinks -E '0,/\{/{s/\{/{\ "workbench.colorTheme": "",/}' "$SETTINGS_PATH"
-    fi
-
-    # Update theme
     sed -i --follow-symlinks -E \
       "s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \
-      "$SETTINGS_PATH"
-  else
-    # Remove theme from settings.json when the theme doesn't have editor support
-    if [[ -f "$SETTINGS_PATH" ]]; then
-      sed -i --follow-symlinks -E 's/\"workbench\.colorTheme\"[[:space:]]*:[^,}]*,?//' "$SETTINGS_PATH"
-    fi
+      "$settings_path"
+  elif [[ -f "$settings_path" ]]; then
+    sed -i --follow-symlinks -E 's/\"workbench\.colorTheme\"[[:space:]]*:[^,}]*,?//' "$settings_path"
   fi
-fi
+}
+
+set_theme "code" "$HOME/.config/Code/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes"
+set_theme "codium" "$HOME/.config/VSCodium/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-codium-theme-changes"
+set_theme "cursor" "$HOME/.config/Cursor/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-cursor-theme-changes"
diff --git a/bin/omarchy-theme-set-vscodium b/bin/omarchy-theme-set-vscodium
deleted file mode 100755
index 3d955c02..00000000
--- a/bin/omarchy-theme-set-vscodium
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Call the VSCode theme setter with VSCodium-specific parameters
-omarchy-theme-set-vscode codium "$HOME/.config/VSCodium/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-codium-theme-changes"