fix: dynamic flake path resolution and replace env-update/sys-update aliases with scripts

This commit is contained in:
Bernardo Magri
2026-04-13 13:25:54 +01:00
parent 866e556656
commit 9746e75bc5
18 changed files with 56 additions and 33 deletions

View File

@@ -20,7 +20,7 @@ if fc-list | grep -iq "$font_name"; then
TMP_JSON=$(mktemp)
jq --arg font "$font_name" '.font = $font' "$STATE_FILE" > "$TMP_JSON" && mv "$TMP_JSON" "$STATE_FILE"
echo "Font set to $font_name declaratively. Applying changes..."
env-update
nomarchy-env-update
# Instant feedback for certain apps via IPC
if pgrep -x kitty; then

View File

@@ -46,8 +46,8 @@ if [ -d "$BG_DIR" ]; then
fi
fi
echo "Theme set to $THEME_NAME. Applying changes with env-update..."
env-update
echo "Theme set to $THEME_NAME. Applying changes with nomarchy-env-update..."
nomarchy-env-update
nomarchy-theme-set-templates

View File

@@ -15,6 +15,6 @@ mkdir -p "$STATE_DIR"
# triggering an env-update if needed to apply the declarative changes.
if [[ $NOMARCHY_TOGGLE_SKIP_VSCODE_THEME != "true" ]]; then
# We trigger env-update to apply the new VSCode theme declaratively.
env-update
# We trigger nomarchy-env-update to apply the new VSCode theme declaratively.
nomarchy-env-update
fi

View File

@@ -26,7 +26,7 @@ let
if [ -n "$SELECTED_FONT" ]; then
TMP_JSON=$(mktemp)
jq --arg font "$SELECTED_FONT" '.font = $font' "$STATE_FILE" > "$TMP_JSON" && mv "$TMP_JSON" "$STATE_FILE"
env-update
nomarchy-env-update
fi
'';
@@ -55,7 +55,7 @@ let
TMP_JSON=$(mktemp)
jq --arg wp "$SELECTED_WP" '.wallpaper = $wp' "$STATE_FILE" > "$TMP_JSON" && mv "$TMP_JSON" "$STATE_FILE"
swww img "$SELECTED_WP" --transition-type outer --transition-pos 0.85,0.97 --transition-step 90 &
env-update
nomarchy-env-update
fi
'';
in