From 1ca3ef3d822bd2f05720026ae06b24b8ef22fb90 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Thu, 31 Jul 2025 23:09:03 -0400
Subject: [PATCH] Add in quickshell and prepare hyprpanel for deprecation

---
 files/systemd/user/hyprpanel.service  |  1 -
 files/systemd/user/quickshell.service | 18 ++++++++++++++++++
 recipes/components/systemd-module.yml |  1 +
 recipes/dnf/hyprland.yml              | 12 ++++++++++--
 recipes/dnf/sddm.yml                  | 13 +++++++++++++
 5 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 files/systemd/user/quickshell.service

diff --git a/files/systemd/user/hyprpanel.service b/files/systemd/user/hyprpanel.service
index 0b419e0..ed00ad1 100644
--- a/files/systemd/user/hyprpanel.service
+++ b/files/systemd/user/hyprpanel.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=A panel bar branched from AGS maintained by Hyprland devs.
-Documentation=man:waybar(5)
 # order startup after WM
 After=graphical-session.target
 
diff --git a/files/systemd/user/quickshell.service b/files/systemd/user/quickshell.service
new file mode 100644
index 0000000..a984826
--- /dev/null
+++ b/files/systemd/user/quickshell.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=A panel bar branched from AGS maintained by Hyprland devs.
+# order startup after WM
+After=graphical-session.target
+
+[Service]
+Type=exec
+# Repurpose XDG Autostart filtering
+ExecCondition=/lib/systemd/systemd-xdg-autostart-condition "wlroots:sway:Wayfire:labwc:Hyprland" ""
+ExecStart=/usr/bin/quickshell
+Restart=on-failure
+Slice=app-graphical.slice
+
+[Install]
+WantedBy=graphical-session.target
+# Alternatively can be wanted by specific WMs' targets
+# Should also be duplicated in 'After=' to avoid ordering loop
+#WantedBy=wayland-session@hyprland.desktop.target
\ No newline at end of file
diff --git a/recipes/components/systemd-module.yml b/recipes/components/systemd-module.yml
index 46c2e3e..cee6025 100644
--- a/recipes/components/systemd-module.yml
+++ b/recipes/components/systemd-module.yml
@@ -9,4 +9,5 @@ modules:
         - flatpak-user-update.timer
         - swww.service
         - hyprpanel.service
+        # - quickshell.service
         - hyprpolkitagent.service
\ No newline at end of file
diff --git a/recipes/dnf/hyprland.yml b/recipes/dnf/hyprland.yml
index 5346249..3035b65 100644
--- a/recipes/dnf/hyprland.yml
+++ b/recipes/dnf/hyprland.yml
@@ -3,13 +3,21 @@ modules:
     repos:
       copr:
         - solopasha/hyprland
+        - errornointernet/quickshell
     install:
       packages:
         - aquamarine
         - hyprland-git
-        - hyprpanel
         - hyprpolkitagent
         - hyprshot
         - hyprland-qt-support
         - hyprland-qtutils
-        - xdg-desktop-portal-hyprland
\ No newline at end of file
+        - xdg-desktop-portal-hyprland
+        - swww
+        - matugen
+
+        # hyprpanel
+        - hyprpanel
+
+        # quickshell
+        - quickshell
\ No newline at end of file
diff --git a/recipes/dnf/sddm.yml b/recipes/dnf/sddm.yml
index 93e6b5d..3c8e3c4 100644
--- a/recipes/dnf/sddm.yml
+++ b/recipes/dnf/sddm.yml
@@ -9,6 +9,19 @@ modules:
         - qt5-qtquickcontrols2
         - qt5-qtsvg
 
+        # added libraries for quickshell
+        - qt5-qtimageformats
+        - qt5-qtmultimedia
+        - qt6-qtquickcontrols2
+        - qt6-qtsvg
+        - qt6-qtimageformats
+        - qt6-qtmultimedia
+        - qt6-qt5compat
+
+        # added for editing quickshell (qmlls)
+        - qt5-qtdeclarative-devel
+        - qt6-qtdeclarative-devel
+
       # password keeper
         - kf6-kwallet
         - kwalletmanager