merge hypr-caelestia with conflict resolution

This commit is contained in:
2026-09-25 11:57:58 +02:00
9 changed files with 74 additions and 22 deletions
+6 -1
View File
@@ -3,7 +3,8 @@
#
# Wayland compositor, screenshot tool and supporting utilities. The desktop
# shell (bar, launcher, notifications, lock screen, wallpaper, idle, session
# menu) is Noctalia, not a set of standalone ecosystem tools.
# 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.
@@ -22,8 +23,12 @@ hyprshot
brightnessctl
quickshell
noctalia
wtype
@aur
hyprmod
caelestia-shell
caelestia-cli
quickshell-git
hyprsaver
python-terminaltexteffects