feat(scripts): add nomarchy-sync and improve theme scripts
- Create nomarchy-sync for backing up declarative config and dynamic state - Update theme scripts with improved IPC feedback (swww img transition)
This commit is contained in:
92
bin/nomarchy-sync
Executable file
92
bin/nomarchy-sync
Executable file
@@ -0,0 +1,92 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# nomarchy-sync: Automate backing up and restoring Nomarchy declarative configurations and dynamic state.
|
||||
|
||||
set -e
|
||||
|
||||
if [[ -z $1 ]]; then
|
||||
echo "Usage: nomarchy-sync <push|pull> [repo-url]"
|
||||
echo " push: Backup current state to the configured repository."
|
||||
echo " pull: Restore state from the configured repository and apply updates."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
COMMAND=$1
|
||||
REPO_URL=$2
|
||||
|
||||
STATE_DIR="$HOME/.config/home-manager"
|
||||
CONFIG_DIR="/etc/nixos"
|
||||
|
||||
# Identify the target repo directory (we use a local dot-folder to stage things)
|
||||
SYNC_DIR="$HOME/.local/share/nomarchy-sync"
|
||||
|
||||
mkdir -p "$SYNC_DIR"
|
||||
cd "$SYNC_DIR"
|
||||
|
||||
if [ ! -d ".git" ]; then
|
||||
if [[ -z $REPO_URL ]]; then
|
||||
echo "Error: No Git repository configured. Please provide a repo-url for the first run:"
|
||||
echo "Example: nomarchy-sync push git@github.com:username/nomarchy-backup.git"
|
||||
exit 1
|
||||
fi
|
||||
git init
|
||||
git remote add origin "$REPO_URL"
|
||||
# Basic configuration for automated commits
|
||||
git config user.name "Nomarchy Sync"
|
||||
git config user.email "sync@nomarchy.local"
|
||||
fi
|
||||
|
||||
if [[ "$COMMAND" == "push" ]]; then
|
||||
echo "Synchronizing local configuration and state to backup repository..."
|
||||
|
||||
# 1. Copy user flakes and nix files
|
||||
mkdir -p "$SYNC_DIR/nixos"
|
||||
cp -r "$CONFIG_DIR/flake.nix" "$CONFIG_DIR/system.nix" "$CONFIG_DIR/home.nix" "$SYNC_DIR/nixos/" 2>/dev/null || true
|
||||
|
||||
# 2. Copy state files
|
||||
mkdir -p "$SYNC_DIR/state"
|
||||
cp -r "$STATE_DIR"/*.nix "$STATE_DIR"/*.json "$SYNC_DIR/state/" 2>/dev/null || true
|
||||
|
||||
# 3. Commit and Push
|
||||
git add .
|
||||
if git diff-index --quiet HEAD --; then
|
||||
echo "No changes to backup."
|
||||
else
|
||||
git commit -m "Auto-sync backup from $(date +'%Y-%m-%d %H:%M:%S')"
|
||||
# We use a try-catch pattern for push because upstream might not exist yet
|
||||
echo "Pushing to remote..."
|
||||
git push -u origin master || git push -u origin main
|
||||
echo "Backup successful."
|
||||
fi
|
||||
|
||||
elif [[ "$COMMAND" == "pull" ]]; then
|
||||
echo "Pulling backup from remote repository..."
|
||||
git fetch
|
||||
# Hard reset to exactly match remote
|
||||
git reset --hard origin/master 2>/dev/null || git reset --hard origin/main
|
||||
|
||||
echo "Restoring configuration and state..."
|
||||
|
||||
# 1. Restore user flakes (Requires sudo)
|
||||
if [ -d "$SYNC_DIR/nixos" ]; then
|
||||
sudo cp -r "$SYNC_DIR/nixos/"* "$CONFIG_DIR/"
|
||||
sudo chmod -R u+w "$CONFIG_DIR"
|
||||
fi
|
||||
|
||||
# 2. Restore state files
|
||||
if [ -d "$SYNC_DIR/state" ]; then
|
||||
mkdir -p "$STATE_DIR"
|
||||
cp -r "$SYNC_DIR/state/"* "$STATE_DIR/"
|
||||
fi
|
||||
|
||||
echo "Applying updates..."
|
||||
# Apply the restored settings
|
||||
sudo nixos-rebuild switch --flake "$CONFIG_DIR#default"
|
||||
home-manager switch --flake "$CONFIG_DIR#default" --impure
|
||||
|
||||
echo "Restore successful."
|
||||
|
||||
else
|
||||
echo "Unknown command: $COMMAND"
|
||||
exit 1
|
||||
fi
|
||||
@@ -7,7 +7,7 @@ STATE_DIR="$HOME/.config/home-manager"
|
||||
THEME_STATE_FILE="$STATE_DIR/theme-state.nix"
|
||||
WALLPAPER_STATE_FILE="$STATE_DIR/wallpaper-state.nix"
|
||||
|
||||
THEME_NAME=$(cat "$THEME_STATE_FILE" 2>/dev/null || echo "dracula")
|
||||
THEME_NAME=$(cat "$THEME_STATE_FILE" 2>/dev/null || echo "nord")
|
||||
|
||||
if [ -d "/etc/nixos/nomarchy/themes" ]; then
|
||||
THEMES_DIR="/etc/nixos/nomarchy/themes"
|
||||
|
||||
@@ -25,7 +25,7 @@ fi
|
||||
|
||||
mkdir -p "$STATE_DIR"
|
||||
|
||||
if [ ! -d "$THEMES_DIR/$THEME_NAME" ] && ! [[ "$THEME_NAME" == "dracula" || "$THEME_NAME" == "nord" ]]; then
|
||||
if [ ! -d "$THEMES_DIR/$THEME_NAME" ] && ! [[ "$THEME_NAME" == "nord" ]]; then
|
||||
echo "Theme '$THEME_NAME' not found in $THEMES_DIR"
|
||||
# Check if it exists in the palettes file
|
||||
# (Assuming nomarchy-palettes.nix is imported in Nix)
|
||||
|
||||
Reference in New Issue
Block a user