refactor: clean up Waybar styles, remove user-defaults mechanism
- Remove defaults/user/ and the user-defaults copy loop from post-install.sh and transform.sh — Waybar falls back to /etc/xdg/waybar/ via XDG spec, no provisioning needed. - Remove USER_DEFAULTS constant from lib.sh. - Clean up style.css: remove dead selectors (#net, #cava, #custom-updates, #custom-notification), commented-out blocks, empty rules, duplicate properties, and hardcoded hex color. - Restructure module styling: generic top-level box via > widget > *, group children reset via widget widget > *, explicit exceptions for workspaces/taskbar/window. - Normalize section comments and whitespace. - Update README to remove user/waybar/ from project structure.
This commit is contained in:
@@ -8,7 +8,6 @@ PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
|
||||
OFFICIAL_PACKAGES="$PROJECT_DIR/packages/official.txt"
|
||||
AUR_PACKAGES="$PROJECT_DIR/packages/aur.txt"
|
||||
DEFAULTS_DIR="$PROJECT_DIR/defaults"
|
||||
USER_DEFAULTS="/usr/share/moonarch/user-defaults"
|
||||
|
||||
# --- Helper functions ---
|
||||
|
||||
|
||||
@@ -110,32 +110,6 @@ gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
|
||||
gsettings set org.gnome.desktop.interface icon-theme 'Colloid-Grey-Catppuccin-Dark'
|
||||
gsettings set org.gnome.desktop.interface font-name 'UbuntuSans Nerd Font 11'
|
||||
|
||||
# --- Install user config defaults ---
|
||||
|
||||
log "Installing user config defaults to ~/.config/..."
|
||||
if [[ -d "$USER_DEFAULTS" ]]; then
|
||||
# Each subdirectory in user-defaults/ corresponds to a ~/.config/ directory.
|
||||
# Files are only copied if they don't exist yet (no overwriting).
|
||||
for src_dir in "$USER_DEFAULTS"/*/; do
|
||||
app_name="$(basename "$src_dir")"
|
||||
dest_dir="$HOME/.config/$app_name"
|
||||
mkdir -p "$dest_dir"
|
||||
find "$src_dir" -type f -print0 | while IFS= read -r -d '' src_file; do
|
||||
rel_path="${src_file#"$src_dir"}"
|
||||
dest_file="$dest_dir/$rel_path"
|
||||
if [[ ! -f "$dest_file" ]]; then
|
||||
mkdir -p "$(dirname "$dest_file")"
|
||||
cp "$src_file" "$dest_file"
|
||||
log " + $app_name/$rel_path"
|
||||
else
|
||||
log " ~ $app_name/$rel_path already exists, skipped."
|
||||
fi
|
||||
done
|
||||
done
|
||||
else
|
||||
err "USER_DEFAULTS not found: $USER_DEFAULTS — skipping user config defaults."
|
||||
fi
|
||||
|
||||
# --- Zsh user config ---
|
||||
|
||||
if [[ ! -f "$HOME/.zshrc" ]]; then
|
||||
|
||||
@@ -314,23 +314,6 @@ log "Deploying moonarch config overrides..."
|
||||
cp /usr/share/moonarch/walker-config.toml "$HOME/.config/walker/config.toml"
|
||||
log " + walker/config.toml"
|
||||
|
||||
# Deploy user defaults (overwrite, no existence check)
|
||||
log "Deploying user config defaults to ~/.config/ (overwrite)..."
|
||||
if [[ -d "$USER_DEFAULTS" ]]; then
|
||||
for src_dir in "$USER_DEFAULTS"/*/; do
|
||||
app_name="$(basename "$src_dir")"
|
||||
dest_dir="$HOME/.config/$app_name"
|
||||
mkdir -p "$dest_dir"
|
||||
find "$src_dir" -type f -print0 | while IFS= read -r -d '' src_file; do
|
||||
rel_path="${src_file#"$src_dir"}"
|
||||
dest_file="$dest_dir/$rel_path"
|
||||
mkdir -p "$(dirname "$dest_file")"
|
||||
cp "$src_file" "$dest_file"
|
||||
log " + $app_name/$rel_path"
|
||||
done
|
||||
done
|
||||
fi
|
||||
|
||||
# Zsh: always create a fresh .zshrc that sources Moonarch defaults
|
||||
log "Creating ~/.zshrc with Moonarch defaults..."
|
||||
mkdir -p "$HOME/.zshrc.d"
|
||||
|
||||
Reference in New Issue
Block a user