Switch hypr source (#20)

Build hypr ecosystem directly instead of solopasha, as he is MIA. May attempt to make a personal rpm repo to build hypr ecosystem, but for now just build directly.

Reviewed-on: #20

Ended up switching to another copr repo building hyprland

Co-authored-by: Eriq Taing <eriq12@protonmail.com>
Co-committed-by: Eriq Taing <eriq12@protonmail.com>

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

@@ -2,18 +2,16 @@
 
 set -ouex pipefail
 
+# remove
 /ctx/dnf/remove.sh
 
-# install openrazer
-dnf -y install /tmp/rpms/ublue-os/ublue-os-akmods*.rpm
-
 # copy
 /ctx/copyfiles.sh
 
 # 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/environment.sh

@@ -9,6 +9,7 @@ dnf5 -y install \
     playerctl \
     qt5-qtwayland \
     qt6-qtwayland \
+    qt6ct \
     xdg-desktop-portal \
     xdg-desktop-portal-gtk \
     xdg-desktop-portal-kde \

build_files/dnf/hyprland.sh

@@ -2,25 +2,28 @@
 
 set -ouex pipefail
 
-dnf5 -y copr enable solopasha/hyprland
+dnf5 -y copr enable lionheartp/Hyprland
-#dnf5 -y copr enable errornointernet/quickshell
+dnf5 -y copr enable errornointernet/quickshell
+dnf5 -y copr enable tofik/nwg-shell
 
 dnf5 -y install \
+    kitty kitty-kitten \
+    kitty-shell-integration \
+    kitty-terminfo \
     aquamarine \
     hyprland-git \
     hyprpolkitagent \
-    hyprshot \
+    grim \
+    slurp \
     hyprland-qt-support \
-    hyprqt6engine \
+    hyprland-guiutils \
-    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 lionheartp/Hyprland
-#dnf5 -y copr disable errornointernet/quickshell
+dnf5 -y copr disable errornointernet/quickshell
+dnf5 -y copr disable tofik/nwg-shell

build_files/dnf/remove.sh

@@ -14,56 +14,6 @@ dnf5 -y remove firefox \
     virtualbox-guest-additions \
     spice-vdagent \
     spice-webdavd \
-    ibus-hangul ibus-chewing \
+    qemu-guest-agent \
-    ibus-anthy-python ibus-anthy \
-    ibus-libpinyin ibus-m17n \
-    orca brltty \
-    opensc qemu-guest-agent \
-    google-noto-naskh-arabic-vf-fonts \
-    google-noto-sans-arabic-vf-fonts \
-    google-noto-sans-armenian-vf-fonts \
-    google-noto-sans-bengali-vf-fonts \
-    google-noto-sans-canadian-aboriginal-vf-fonts \
-    google-noto-sans-cherokee-vf-fonts \
-    google-noto-sans-cjk-vf-fonts \
-    google-noto-sans-devanagari-vf-fonts \
-    google-noto-sans-ethiopic-vf-fonts \
-    google-noto-sans-georgian-vf-fonts \
-    google-noto-sans-gothic-fonts \
-    google-noto-sans-gujarati-vf-fonts \
-    google-noto-sans-gurmukhi-vf-fonts \
-    google-noto-sans-hebrew-vf-fonts \
-    google-noto-sans-kannada-vf-fonts \
-    google-noto-sans-khmer-vf-fonts \
-    google-noto-sans-lao-vf-fonts \
-    google-noto-sans-meetei-mayek-vf-fonts \
-    google-noto-sans-mono-cjk-vf-fonts \
-    google-noto-sans-nko-fonts \
-    google-noto-sans-ol-chiki-vf-fonts \
-    google-noto-sans-oriya-vf-fonts \
-    google-noto-sans-sinhala-vf-fonts \
-    google-noto-sans-syriac-vf-fonts \
-    google-noto-sans-tamil-vf-fonts \
-    google-noto-sans-telugu-vf-fonts \
-    google-noto-sans-thaana-vf-fonts \
-    google-noto-sans-thai-vf-fonts \
-    google-noto-serif-armenian-vf-fonts \
-    google-noto-serif-bengali-vf-fonts \
-    google-noto-serif-cjk-vf-fonts \
-    google-noto-serif-devanagari-vf-fonts \
-    google-noto-serif-ethiopic-vf-fonts \
-    google-noto-serif-georgian-vf-fonts \
-    google-noto-serif-gujarati-vf-fonts \
-    google-noto-serif-gurmukhi-vf-fonts \
-    google-noto-serif-hebrew-vf-fonts \
-    google-noto-serif-kannada-vf-fonts \
-    google-noto-serif-khmer-vf-fonts \
-    google-noto-serif-lao-vf-fonts \
-    google-noto-serif-oriya-vf-fonts \
-    google-noto-serif-sinhala-vf-fonts \
-    google-noto-serif-tamil-vf-fonts \
-    google-noto-serif-telugu-vf-fonts \
-    google-noto-serif-thai-vf-fonts \
-    opensc qemu-guest-agent \
     nano \
     PackageKit-gstreamer-plugin

build_files/dnf/terra.sh

@@ -5,5 +5,6 @@ set -ouex pipefail
 dnf5 -y config-manager addrepo --from-repofile=https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 
 dnf5 -y install zed
+dnf5 -y install swww
 
 rm -f /etc/yum.repos.d/terra.repo

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

system_files/etc/environment.d/theme.conf

@@ -1,2 +1,2 @@
-QT_QPA_PLATFORMTHEME=hyprqt6engine
+QT_QPA_PLATFORMTHEME=qt6ct
 QT_QUICK_CONTROLS_STYLE=org.hyprland.style