bernardo/Nomarchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
features/desktop/scripts/nomarchy-toggle-screensaver
View File

@@ -23,4 +23,4 @@ jq --argjson val "$NEW_VALUE" '.screensaver = $val' "$STATE_FILE" > "$TMP_JSON"
echo "Screensaver state set to $NEW_VALUE. Updating environment..."
env-update
nomarchy-env-update

14
features/scripts/utils/nomarchy-env-update
View File

@@ -6,13 +6,23 @@
set -e
# Detect the repository location
if [ -f "/etc/nixos/flake.nix" ]; then
REPO_DIR="/etc/nixos"
elif [ -f "/etc/nomarchy/flake.nix" ]; then
REPO_DIR="/etc/nomarchy"
else
echo "Error: Nomarchy flake repository not found in /etc/nixos or /etc/nomarchy."
exit 1
fi
# Use the pre-flight migration script to ensure the state is synced before evaluation
if command -v nomarchy-preflight-migration >/dev/null 2>&1; then
nomarchy-preflight-migration
fi
# Apply Home Manager changes from the local flake
echo "Applying user-level changes..."
home-manager switch --flake /etc/nixos#default --impure
echo "Applying user-level changes from $REPO_DIR..."
home-manager switch --flake "$REPO_DIR#default" --impure
echo "Environment update complete."

14
features/scripts/utils/nomarchy-sys-update
View File

@@ -5,8 +5,18 @@
set -e
# Detect the repository location
if [ -f "/etc/nixos/flake.nix" ]; then
REPO_DIR="/etc/nixos"
elif [ -f "/etc/nomarchy/flake.nix" ]; then
REPO_DIR="/etc/nomarchy"
else
echo "Error: Nomarchy flake repository not found in /etc/nixos or /etc/nomarchy."
exit 1
fi
# Apply NixOS changes from the local flake
echo "Applying system-level changes..."
sudo nixos-rebuild switch --flake /etc/nixos#default --impure
echo "Applying system-level changes from $REPO_DIR..."
sudo nixos-rebuild switch --flake "$REPO_DIR#default" --impure
echo "System update complete."

2
features/scripts/utils/nomarchy-welcome
View File

@@ -29,7 +29,7 @@ nomarchy-theme-set "$(nomarchy-theme-list | gum filter --placeholder 'Select a t
echo "Step 2: Choose your preferred font"
nomarchy-font-set "$(nomarchy-font-list | gum filter --placeholder 'Select a font...')"
# 3. Setup Local Repo (Crucial for env-update to work)
# 3. Setup Local Repo (Crucial for nomarchy-env-update to work)
echo ""
echo "Nomarchy relies on a local git repository for declarative updates."
if [ ! -d "/etc/nixos/.git" ]; then