7bf4c3c637
- Update lib/state-schema.nix to default both home and system themes to 'summer-night'.
- Fix 'nomarchy-theme-list' and 'nomarchy-theme-set-templates' to resolve themes and templates from '~/.local/share/nomarchy' instead of the obsolete '$NOMARCHY_PATH' (fixing failures on Live ISO).
- Update 'nomarchy-welcome' to properly convert Title Case theme display names back to kebab-case identifiers and add input validation to prevent crashes.
- Fix installer impermanence symlink by using a relative path ('../persist/etc/nixos'), ensuring it resolves during 'nixos-install' both inside and outside the chroot.
- Deploy '~/.XCompose' symlink via Home Manager and add 'nomarchy-restart-xcompose' to the menu.
- Relocate 'Nomarchy.ttf' to 'core/branding/' and move user-level scripts ('pkg-add', 'pkg-remove', 'env-update', 'preflight-migration') to 'features/scripts/utils/' to align with the distro architecture.
- Remove obsolete '$NOMARCHY_PATH' exports and redundant 'bashrc' template.
- Export theme templates via 'xdg.dataFile' for script accessibility.
36 lines
1.2 KiB
Bash
Executable File
36 lines
1.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# Nomarchy Environment Update Script
|
|
# Standalone Home Manager iteration path. Use this for fast dotfile and
|
|
# theme changes that don't need a full system rebuild. For first-boot
|
|
# dotfiles and any system-level change, the NixOS module activation
|
|
# from `sudo nixos-rebuild switch` is the source of truth.
|
|
|
|
set -e
|
|
|
|
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
|
|
|
|
if command -v nomarchy-preflight-migration >/dev/null 2>&1; then
|
|
nomarchy-preflight-migration
|
|
fi
|
|
|
|
echo "Applying user-level changes from $REPO_DIR#$USER..."
|
|
if command -v home-manager >/dev/null 2>&1; then
|
|
home-manager switch --flake "$REPO_DIR#$USER" --impure
|
|
else
|
|
# Bootstrap path: HM hasn't put `home-manager` on PATH yet (e.g. running
|
|
# straight after a partial install). Pull it from the flake registry.
|
|
nix --extra-experimental-features 'nix-command flakes' \
|
|
run 'home-manager/release-25.11' \
|
|
-- switch --flake "$REPO_DIR#$USER" --impure
|
|
fi
|
|
|
|
echo "Environment update complete."
|