Readd quickshell-git, add glaze for dependencies

installed)

Containerfile

@@ -11,6 +11,10 @@ COPY ./build_files /
 FROM scratch as system-files
 COPY ./system_files /
 
+# hold custom built rpms
+FROM scratch as custom-rpms
+COPY ./custom_rpms /
+
 # Hold key
 FROM scratch as key
 COPY ./cosign.pub /keys/hydros.pub
@@ -26,6 +30,7 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
     --mount=type=bind,from=akmods,source=/rpms,target=/tmp/rpms \
     --mount=type=bind,from=key,source=/keys,target=/tmp/keys \
     --mount=type=bind,from=system-files,source=/,target=/tmp/sys_files \
+    --mount=type=bind,from=custom-rpms,source=/,target=/tmp/custom_rpms \
     --mount=type=cache,dst=/var/cache/ \
     --mount=type=cache,dst=/usr/etc/ \
     --mount=type=tmpfs,dst=/var/log/ \

build_files/build.sh

@@ -12,8 +12,8 @@ dnf -y install /tmp/rpms/ublue-os/ublue-os-akmods*.rpm
 
 # dnf
 /ctx/dnf/rpmfusion.sh
-/ctx/dnf/hyprland.sh
 /ctx/dnf/greeter.sh
+/ctx/dnf/hyprland.sh
 /ctx/dnf/environment.sh
 /ctx/dnf/applications.sh
 /ctx/dnf/themes.sh

build_files/copyfiles.sh

@@ -16,6 +16,4 @@ cp -r /tmp/sys_files/* /
 git clone --depth 1 https://github.com/ohmyzsh/ohmyzsh.git /usr/share/ohmyzsh
 
 # Install Nordzy-Cursors
-git clone --depth 1 https://github.com/guillaumeboehm/Nordzy-cursors.git /tmp/nordzy-cursors
+dnf install -y /tmp/custom_rpms/nordzy-cursor-sapphire-0.0.1-1.fc43.noarch.rpm
-cp -r /tmp/nordzy-cursors/xcursors/Nordzy-catppuccin-mocha-sapphire /usr/share/icons
-cp -r /tmp/nordzy-cursors/hyprcursors/themes/Nordzy-hyprcursors-catppuccin-mocha-sapphire/* /usr/share/icons/Nordzy-catppuccin-mocha-sapphire

build_files/dnf/hyprland.sh

@@ -3,24 +3,196 @@
 set -ouex pipefail
 
 dnf5 -y copr enable solopasha/hyprland
-#dnf5 -y copr enable errornointernet/quickshell
+dnf5 -y copr enable errornointernet/quickshell
 
 dnf5 -y install \
-    aquamarine \
+    glaze \
-    hyprland-git \
+    uwsm \
-    hyprpolkitagent \
+    grim \
-    hyprshot \
+    slurp \
-    hyprland-qt-support \
-    hyprqt6engine \
-    hyprland-qtutils \
-    xdg-desktop-portal-hyprland \
-    hyprsysteminfo \
     swww \
     nwg-look \
     matugen \
     wlogout \
     material-icons-fonts \
-    SwayNotificationCenter
+    quickshell-git
 
 dnf5 -y copr disable solopasha/hyprland
-#dnf5 -y copr disable errornointernet/quickshell
+dnf5 -y copr disable errornointernet/quickshell
+
+# prep build packages
+dnf -y install ninja-build cmake \
+    meson gcc-c++ libxcb-devel \
+    libX11-devel pixman-devel \
+    wayland-protocols-devel \
+    cairo-devel pango-devel \
+    pixman-devel gtest-devel \
+    kf6-kconfig kf6-kconfig-devel \
+    kf6-kiconthemes kf6-kiconthemes-devel \
+    kf6-kcolorscheme kf6-kcolorscheme-devel \
+    pugixml pugixml-devel \
+    libseat libseat-devel \
+    libinput libinput-devel \
+    libwayland-client wayland-devel \
+    libdrm libdrm-devel \
+    mesa-libgbm mesa-libgbm-devel \
+    libdisplay-info libdisplay-info-devel \
+    hwdata hwdata-devel \
+    iniparser iniparser-devel \
+    libzip libzip-devel \
+    tomlplusplus tomlplusplus-devel \
+    libjpeg-turbo-devel \
+    libwebp-devel \
+    libpng-devel \
+    file-devel \
+    librsvg2-devel \
+    libuuid libuuid-devel \
+    libXcursor libXcursor-devel \
+    re2 re2-devel \
+    muParser muParser-devel \
+    xcb-util-wm-devel \
+    xcb-util-errors xcb-util-errors-devel \
+    xcb-util-renderutil xcb-util-renderutil-devel \
+    xorg-x11-server-Xwayland-devel \
+    libglvnd-devel \
+    glib2 glib2-devel \
+    libliftoff libliftoff-devel \
+    systemd-devel \
+    qt6-qtbase-private-devel
+
+# build hyprland wayland protocol extensions
+git clone https://github.com/hyprwm/hyprland-protocols /tmp/hyprland-protocols
+cd /tmp/hyprland-protocols
+meson setup build
+meson install -C build
+
+# build Hyprwayland scanner
+git clone https://github.com/hyprwm/hyprwayland-scanner.git /tmp/hyprwayland-scanner
+cd /tmp/hyprwayland-scanner
+cmake -DCMAKE_INSTALL_PREFIX=/usr -B build
+cmake --build build -j `nproc`
+cmake --install build
+
+# build hyprutils
+git clone https://github.com/hyprwm/hyprutils.git /tmp/hyprutils
+cd /tmp/hyprutils
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+cmake --install ./build
+
+# build hyprgraphics
+git clone https://github.com/hyprwm/hyprgraphics /tmp/hyprgraphics
+cd /tmp/hyprgraphics
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+cmake --install build
+
+# build hyprlang
+git clone https://github.com/hyprwm/hyprlang.git /tmp/hyprlang
+cd /tmp/hyprlang
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target hyprlang -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
+cmake --install ./build
+
+# build hyprcursor
+git clone https://github.com/hyprwm/hyprcursor.git /tmp/hyprcursor
+cd /tmp/hyprcursor
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
+cmake --install ./build
+
+# build hyprland qt support
+git clone https://github.com/hyprwm/hyprland-qt-support.git /tmp/hyprland-qt-support
+cd /tmp/hyprland-qt-support
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -DINSTALL_QML_PREFIX=/lib/qt6/qml -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+cmake --install ./build
+
+# build hyprqt6engine
+git clone https://github.com/hyprwm/hyprqt6engine.git /tmp/hyprqt6engine
+cd /tmp/hyprqt6engine
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+cmake --install ./build
+
+# build aquamarine
+git clone https://github.com/hyprwm/aquamarine.git /tmp/aquamarine
+cd /tmp/aquamarine
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
+cmake --install ./build
+
+# build hyprtoolkit
+git clone https://github.com/hyprwm/hyprtoolkit.git /tmp/hyprtoolkit
+cd /tmp/hyprtoolkit
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+cmake --install ./build
+
+# build hyprland gui utils
+git clone https://github.com/hyprwm/hyprland-guiutils.git /tmp/hyprland-guiutils
+cd /tmp/hyprland-guiutils
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+cmake --install ./build
+
+# build hyprland
+git clone https://github.com/hyprwm/Hyprland.git /tmp/hyprland-git
+cd /tmp/hyprland-git
+cmake --no-warn-unused-cli -GNinja -DNO_TESTS=TRUE -DBUILD_TESTING=FALSE -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+cmake --install ./build
+
+# build hyprland xdg desktop portal
+git clone --recursive https://github.com/hyprwm/xdg-desktop-portal-hyprland /tmp/xdg-desktop-portal-hyprland/
+cd /tmp/xdg-desktop-portal-hyprland/
+cmake -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib -DCMAKE_INSTALL_PREFIX=/usr -B build
+cmake --build build
+cmake --install build
+
+# build hyprpolkitagent
+git clone https://github.com/hyprwm/hyprpolkitagent.git /tmp/hyprpolkitagent
+cd /tmp/hyprpolkitagent
+cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+cmake --install ./build
+
+# cleanup
+dnf -y remove ninja-build \
+    meson libxcb-devel \
+    libX11-devel pixman-devel \
+    wayland-protocols-devel \
+    cairo-devel pango-devel \
+    pixman-devel gtest-devel \
+    kf6-kconfig-devel \
+    kf6-kiconthemes-devel \
+    kf6-kcolorscheme-devel \
+    pugixml-devel \
+    libseat-devel \
+    libinput-devel \
+    wayland-devel \
+    libdrm-devel \
+    mesa-libgbm-devel \
+    libdisplay-info-devel \
+    hwdata-devel \
+    iniparser-devel \
+    libjpeg-turbo-devel \
+    libwebp-devel \
+    libpng-devel \
+    librsvg2-devel \
+    file-devel \
+    libzip-devel \
+    tomlplusplus-devel \
+    libuuid-devel \
+    libXcursor-devel \
+    re2-devel \
+    muParser-devel \
+    xcb-util-wm-devel \
+    xcb-util-errors-devel \
+    xcb-util-renderutil-devel \
+    xorg-x11-server-Xwayland-devel \
+    libglvnd-devel \
+    glib2-devel \
+    libliftoff-devel \
+    systemd-devel \
+    qt6-qtbase-private-devel

build_files/finalize.sh

@@ -12,6 +12,6 @@ systemctl enable -f flatpak-system-update.timer
 
 # Enable global user SystemD services
 systemctl --global -f enable flatpak-user-update.timer
-systemctl --global -f enable sway-notification-center.service
+systemctl --global -f enable quickshell.service
 systemctl --global -f enable hyprpolkitagent.service
 systemctl --global -f enable swww.service