Merge branch 'main' into hypr-caelestia

2026-09-23 21:52:27 +02:00
parent 519432d630 a8947283a5
commit 545485f3c5
30 changed files with 400 additions and 493 deletions
@@ -0,0 +1,29 @@
+# ---------------------------------------------------------------------------
+# Hyprland compositor package list for setup/hypr/setup.sh
+#
+# Wayland compositor, screenshot tool and supporting utilities. The desktop
+# shell (bar, launcher, notifications, lock screen, wallpaper, idle, session
+# menu) on this branch is Caelestia (see hypr/.config/hypr/hyprland.lua:
+# `caelestia shell -d`). Noctalia lives on main.
+#
+#   - Lines starting with '#' and blank lines are ignored.
+#   - Use "@pacman", "@aur" or "@npm" markers to switch section.
+#   - The default section is @pacman.
+# ---------------------------------------------------------------------------
+
+@pacman
+hyprland
+xdg-desktop-portal-hyprland
+hyprpolkitagent
+pantheon-shortcut-overlay
+wev
+wl-clipboard
+hyprshot
+brightnessctl
+wtype
+
+@aur
+hyprmod
+caelestia-shell
+caelestia-cli
+quickshell-git
@@ -0,0 +1,43 @@
+#!/bin/bash
+set -euo pipefail
+
+SETUP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PACKAGES_FILE="$SETUP_DIR/packages.txt"
+
+# shellcheck source=../lib/common.sh
+source "$SETUP_DIR/../lib/common.sh"
+
+# ---------------------------------------------------------------------------
+# Post-install: run Hyprland environment & desktop integration scripts.
+# ---------------------------------------------------------------------------
+run_hypr_scripts() {
+    local scripts_dir
+    scripts_dir="$(repo_root)/hypr/.config/hypr/scripts"
+
+    echo "==> Fuehre ensure-env.sh aus ..."
+    bash "$scripts_dir/ensure-env.sh"
+
+    echo "==> Fuehre portal-host-override.sh aus ..."
+    bash "$scripts_dir/portal-host-override.sh"
+
+    echo "==> Fuehre fix_dolphin_file_associations.sh aus ..."
+    bash "$scripts_dir/fix_dolphin_file_associations.sh"
+}
+
+# ---------------------------------------------------------------------------
+# Main
+# ---------------------------------------------------------------------------
+main() {
+    local -a pacman_pkgs=() aur_pkgs=() npm_pkgs=()
+
+    echo "==> Lese Paketliste: $PACKAGES_FILE"
+    read_packages "$PACKAGES_FILE" pacman_pkgs aur_pkgs npm_pkgs
+
+    install_all_pkgs pacman_pkgs aur_pkgs npm_pkgs
+
+    run_hypr_scripts
+
+    echo "Fertig. Hyprland und das Compositor-Okosystem sind eingerichtet."
+}
+
+main