From f5d94e8bc0d3287b1ed8d99947d38bb5d89886e2 Mon Sep 17 00:00:00 2001 From: nevaforget Date: Sat, 28 Mar 2026 14:30:09 +0100 Subject: [PATCH] fix: replace manual moongreet/moonset installs with paru repo The old fallbacks used git clone + makepkg and uv pip install, which are fragile and bypass the moonarch-pkgbuilds repo. Now sets up the paru custom repo and installs all three packages via paru -S. --- scripts/post-install.sh | 42 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/scripts/post-install.sh b/scripts/post-install.sh index 6be0782..9efd264 100755 --- a/scripts/post-install.sh +++ b/scripts/post-install.sh @@ -70,6 +70,24 @@ else exit 1 fi +# --- Moonarch custom paru repo einrichten --- + +log "Richte Moonarch paru-Repo ein..." +PARU_CONF="$HOME/.config/paru/paru.conf" +mkdir -p "$(dirname "$PARU_CONF")" +if ! grep -q '\[moonarch\]' "$PARU_CONF" 2>/dev/null; then + cat >> "$PARU_CONF" <<'EOCONF' +[moonarch] +Url = https://gitea.moonarch.de/nevaforget/moonarch-pkgbuilds.git +EOCONF + log " + Moonarch-Repo zu paru.conf hinzugefuegt." +else + log " ~ Moonarch-Repo bereits in paru.conf." +fi + +paru -Sy --pkgbuilds --noconfirm +paru -S --needed --noconfirm moonset-git moonlock-git moongreet-git + # --- Themes installieren (Cursor etc.) --- log "Installiere Themes..." @@ -136,30 +154,6 @@ if [[ ! -f "$HOME/.zshrc" ]]; then echo "source /etc/zsh/zshrc.moonarch" >> "$HOME/.zshrc" fi -# --- moongreet installieren (Greeter aus Gitea) --- - -if ! command -v moongreet &>/dev/null; then - log "Installiere moongreet..." - MOONGREET_TMPDIR=$(mktemp -d) - git clone https://gitea.moonarch.de/nevaforget/greetd-moongreet.git "$MOONGREET_TMPDIR/moongreet" - (cd "$MOONGREET_TMPDIR/moongreet/pkg" && makepkg -si --noconfirm) - rm -rf "$MOONGREET_TMPDIR" -else - log "moongreet bereits installiert." -fi - -# --- moonset installieren (Power Menu aus Gitea) --- - -if ! command -v moonset &>/dev/null; then - log "Installiere moonset..." - MOONSET_TMPDIR=$(mktemp -d) - git clone https://gitea.moonarch.de/nevaforget/moonset.git "$MOONSET_TMPDIR/moonset" - (cd "$MOONSET_TMPDIR/moonset" && uv pip install --system .) - rm -rf "$MOONSET_TMPDIR" -else - log "moonset bereits installiert." -fi - # --- moonlock systemd user service --- log "Konfiguriere moonlock User-Service..."