Compare commits

..
Author SHA1 Message Date
David Heinemeier Hansson e8bcad0c23 Fix template generation for rgb colors 2026-01-03 18:18:19 -08:00
David Heinemeier Hansson a6b9bee8b9 Just rely on the system theme for opencode and get ready for USRSIG2 being available to live reload 2026-01-03 18:04:12 -08:00
David Heinemeier Hansson edc964e458 Fix quoting 2026-01-03 17:55:37 -08:00
David Heinemeier Hansson 7194176fe5 Install user backgrounds in the correct path 2026-01-03 17:53:21 -08:00
David Heinemeier Hansson 2829279884 Migrate existing user backgrounds to the new proper location 2026-01-03 17:48:20 -08:00
David Heinemeier Hansson 63a4710a88 Look for backgrounds matching the new theme.name
We no longer have symlinks
2026-01-03 17:47:48 -08:00
David Heinemeier Hansson b86fb24403 Need yq to parse colors.toml 2026-01-03 16:51:41 -08:00
David Heinemeier Hansson 615e13bbba Merge branch 'dev' into colors-gemini 2026-01-03 16:50:53 -08:00
David Heinemeier Hansson 2c8f71c179 Need yq for toml 2026-01-03 14:14:38 -08:00
David Heinemeier Hansson f4f356659f Merge branch 'dev' into colors-gemini 2026-01-03 14:08:09 -08:00
David Heinemeier Hansson fee7746362 Look for user background images in dedicated directory 2026-01-02 21:12:12 -07:00
David Heinemeier Hansson 5d712d3ff1 Get current theme name from the new theme.name file 2026-01-01 16:43:02 -07:00
David Heinemeier Hansson 32dbe60a02 No longer need omarchy-theme-next since themes are now fully rendered, not symlinks 2026-01-01 16:26:47 -07:00
David Heinemeier Hansson 9ecf5a089b Cleanup 2026-01-01 16:23:48 -07:00
David Heinemeier Hansson 4ead763559 Explicitly store the name of the current theme 2026-01-01 16:22:17 -07:00
David Heinemeier Hansson a308000390 Migrate to the new setup where default themes live inside omarchy 2026-01-01 16:13:44 -07:00
David Heinemeier Hansson 1b8da49425 Look for both user themes and default themes
Plus speed things up
2026-01-01 16:06:10 -07:00
David Heinemeier Hansson 934285b7c4 Fix paths 2026-01-01 16:03:15 -07:00
David Heinemeier Hansson fdd3b6d787 Split user themes and default themes 2026-01-01 15:56:40 -07:00
David Heinemeier Hansson 0b04881a6f Move the templates together with the others in default 2026-01-01 15:35:02 -07:00
David Heinemeier Hansson 222386639b Fix colors for readability 2026-01-01 14:15:32 -07:00
David Heinemeier Hansson a7d925de51 Set opencode colors too 2026-01-01 14:12:58 -07:00
David Heinemeier Hansson 8460be15c2 Correct the blue 2026-01-01 13:45:01 -07:00
David Heinemeier Hansson a57e2b48e7 No longe have $THEMES_DIR 2026-01-01 13:05:10 -07:00
David Heinemeier Hansson b07c54fff1 Consistent const naming 2026-01-01 12:58:19 -07:00
David Heinemeier Hansson 277495b875 Remove redundant const 2026-01-01 12:56:58 -07:00
David Heinemeier Hansson d448664726 Explain why 2026-01-01 12:55:23 -07:00
David Heinemeier Hansson 14e140285f No longer used by walker to cancel 2026-01-01 12:55:16 -07:00
David Heinemeier Hansson b95a4a44df Make an atomic swap of the theme directories 2026-01-01 12:52:04 -07:00
David Heinemeier Hansson 79b31144d0 Bring back explicit btop themes
They're too involved to derive from a basic color set
2026-01-01 12:41:23 -07:00
David Heinemeier Hansson cf5f4423e1 Fix colors for regular hex format 2026-01-01 12:35:23 -07:00
David Heinemeier Hansson 01135724d4 Provide stripped values too 2026-01-01 12:33:45 -07:00
David Heinemeier Hansson ff9474e0eb Fix missing colors 2026-01-01 12:33:36 -07:00
David Heinemeier Hansson b14297ea21 Better presentation 2026-01-01 12:15:51 -07:00
David Heinemeier Hansson 3db3705370 Merge branch 'dev' into colors-gemini 2026-01-01 12:12:45 -07:00
David Heinemeier Hansson bd6992c58c Variables are lowercase 2026-01-01 12:09:17 -07:00
David Heinemeier Hansson 3dc59e5404 Fix vars 2026-01-01 12:08:40 -07:00
David Heinemeier Hansson 3ecdcb262b Pull out the dynamic template rendering again, but simpler 2026-01-01 12:06:31 -07:00
David Heinemeier Hansson 8ea021744d Combine render into -set 2026-01-01 11:55:03 -07:00
David Heinemeier Hansson 6952e80710 Slim down 2026-01-01 11:49:08 -07:00
David Heinemeier Hansson 8abeac68dc Cleanup 2025-12-31 18:04:39 -07:00
David Heinemeier Hansson 1cd2f5b979 Attempt to templaterize the theme specific files 2025-12-31 17:00:30 -07:00
3 changed files with 25 additions and 54 deletions
+1 -6
View File
@@ -3,9 +3,4 @@
cd ~/.local/share/omarchy
migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
touch $migration_file
if [[ "$1" != "--no-edit" ]]; then
nvim $migration_file
fi
echo $migration_file
nvim $migration_file
+24 -31
View File
@@ -254,25 +254,6 @@ remove_windows() {
echo "Windows VM removal completed!"
}
wait_for_rdp_ready() {
local WIN_USER="$1"
local WIN_PASS="$2"
local TIMEOUT=240
local SECONDS=0
echo "Waiting for Windows VM to be ready..."
while ! timeout 5s xfreerdp3 /auth-only /cert:ignore /u:"$WIN_USER" /p:"$WIN_PASS" /v:127.0.0.1:3389 &>/dev/null; do
sleep 2
if [ $SECONDS -gt $TIMEOUT ]; then
echo "❌ Timeout waiting for RDP!"
echo " The VM might still be installing Windows."
echo " Check progress at: http://127.0.0.1:8006"
return 1
fi
done
}
launch_windows() {
KEEP_ALIVE=false
if [ "$1" = "--keep-alive" ] || [ "$1" = "-k" ]; then
@@ -285,14 +266,6 @@ launch_windows() {
exit 1
fi
# Extract credentials from compose file
WIN_USER=$(grep "USERNAME:" "$COMPOSE_FILE" | sed 's/.*USERNAME: "\(.*\)"/\1/')
WIN_PASS=$(grep "PASSWORD:" "$COMPOSE_FILE" | sed 's/.*PASSWORD: "\(.*\)"/\1/')
# Use defaults if not found
[ -z "$WIN_USER" ] && WIN_USER="docker"
[ -z "$WIN_PASS" ] && WIN_PASS="admin"
# Check if container is already running
CONTAINER_STATUS=$(docker inspect --format='{{.State.Status}}' omarchy-windows 2>/dev/null)
@@ -309,12 +282,32 @@ launch_windows() {
notify-send -u critical "Windows VM" "Failed to start Windows VM"
exit 1
fi
# Wait for RDP to be ready
echo "Waiting for Windows VM to be ready..."
WAIT_COUNT=0
while ! nc -z 127.0.0.1 3389 2>/dev/null; do
sleep 2
WAIT_COUNT=$((WAIT_COUNT + 1))
if [ $WAIT_COUNT -gt 60 ]; then # 2 minutes timeout
echo "❌ Timeout waiting for RDP!"
echo " The VM might still be installing Windows."
echo " Check progress at: http://127.0.0.1:8006"
exit 1
fi
done
# Give it a moment more to fully initialize
sleep 5
fi
if ! wait_for_rdp_ready "$WIN_USER" "$WIN_PASS"; then
notify-send -u critical "Windows VM" "Did not come alive in time."
exit 1
fi
# Extract credentials from compose file
WIN_USER=$(grep "USERNAME:" "$COMPOSE_FILE" | sed 's/.*USERNAME: "\(.*\)"/\1/')
WIN_PASS=$(grep "PASSWORD:" "$COMPOSE_FILE" | sed 's/.*PASSWORD: "\(.*\)"/\1/')
# Use defaults if not found
[ -z "$WIN_USER" ] && WIN_USER="docker"
[ -z "$WIN_PASS" ] && WIN_PASS="admin"
# Build the connection info
if [ "$KEEP_ALIVE" = true ]; then
-17
View File
@@ -1,17 +0,0 @@
# Overwrite parts of the omarchy-menu with user-specific submenus.
# See $OMARCHY_PATH/bin/omarchy-menu for functions that can be overwritten.
#
# WARNING: Overwritten functions will obviously not be updated when Omarchy changes.
#
# Example adding suspend to the system menu:
#
# show_system_menu() {
# case $(menu "System" " Lock\n󱄄 Screensaver\n󰒲 Suspend\n󰜉 Restart\n󰐥 Shutdown") in
# *Lock*) omarchy-lock-screen ;;
# *Screensaver*) omarchy-launch-screensaver force ;;
# *Suspend*) systemctl suspend ;;
# *Restart*) omarchy-cmd-reboot ;;
# *Shutdown*) omarchy-cmd-shutdown ;;
# *) back_to show_main_menu ;;
# esac
# }