Make defaults live where defaults always live

This commit is contained in:
David Heinemeier Hansson
2026-05-23 11:28:36 +02:00
parent 4cd6593ba3
commit 5fc4921cfc
10 changed files with 18 additions and 19 deletions
+1 -1
View File
@@ -177,7 +177,7 @@ plugin_enabled() {
config_source() {
require_omarchy_path
local defaults_file="$OMARCHY_PATH/shell/shell-defaults.json"
local defaults_file="$OMARCHY_PATH/config/omarchy/shell.json"
if [[ -s $CONFIG_FILE ]] && jq -e 'type == "object" and .version == 1' "$CONFIG_FILE" >/dev/null 2>&1; then
printf '%s' "$CONFIG_FILE"
+2 -2
View File
@@ -7,7 +7,7 @@
set -e
CONFIG_FILE="$HOME/.config/omarchy/shell.json"
DEFAULTS_FILE="$OMARCHY_PATH/shell/shell-defaults.json"
DEFAULTS_FILE="$OMARCHY_PATH/config/omarchy/shell.json"
position=$1
if [[ ! $position =~ ^(top|bottom|left|right)$ ]]; then
@@ -18,7 +18,7 @@ fi
mkdir -p "$(dirname "$CONFIG_FILE")"
tmp=$(mktemp)
# Seed from shell-defaults.json when the user has no shell.json yet (or it's
# Seed from the default shell.json when the user has no shell.json yet (or it's
# malformed). Writing just `{ bar: { position } }` would leave the bar with
# no layout, since the shell treats any valid user config as authoritative
# and does not deep-merge defaults.