Gentoo Updates (#2371)

2026-06-05 14:59:27 -05:00 · 2025-11-10 14:51:31 +08:00
parent d001bc1269 80d62c438f
commit a54a8d8daf
34 changed files with 472 additions and 323 deletions
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Illogical Impulse Audio Dependencies"
 HOMEPAGE=""

-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="strip"
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Illogical Impulse Backlight Dependencies"
 HOMEPAGE=""

-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="strip"
@@ -6,24 +6,22 @@ EAPI=8
 DESCRIPTION="Illogical Impulse Basic Dependencies"
 HOMEPAGE=""

-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="strip"

 DEPEND=""
 RDEPEND="
-	net-misc/axel
 	sys-devel/bc
 	sys-apps/coreutils
 	app-misc/cliphist
 	dev-build/cmake
 	net-misc/curl
-	net-misc/rsync
 	net-misc/wget
 	sys-apps/ripgrep
 	dev-python/jq
-	dev-build/meson
 	x11-misc/xdg-user-dirs
+	net-misc/rsync
 	app-misc/yq-go
 "
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
-Bibata_VER=2.0.6

 DESCRIPTION="Material Based Cursor Theme, installed for illogical-impulse dotfiles"
 HOMEPAGE=""
-SRC_URI="https://github.com/ful1e5/Bibata_Cursor/releases/download/v${Bibata_VER}/Bibata-Modern-Classic.tar.xz -> bibata-modern-classic.tar.xz"
+SRC_URI="https://github.com/ful1e5/Bibata_Cursor/releases/download/v${PV}/Bibata-Modern-Classic.tar.xz -> bibata-modern-classic.tar.xz"

-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="strip"
@@ -2,90 +2,40 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
-DART_SASS_VER=1.78.0
-SPACE_GROTESK_VER=1.1.4

 DESCRIPTION="Illogical Impulse Fonts and Theming Dependencies"
-HOMEPAGE=""
-SRC_URI="
-https://github.com/Bali10050/Darkly/archive/refs/heads/main.tar.gz -> ${P}-darkly.tar.gz
-https://github.com/naipefoundry/gabarito/archive/refs/heads/main.tar.gz -> ${P}-gabarito.tar.gz
-https://github.com/googlefonts/rubik/archive/refs/heads/main.tar.gz -> ${P}-rubik.tar.gz
-https://github.com/ThomasJockin/readexpro/archive/refs/heads/master.tar.gz -> ${P}-readexpro.tar.gz
-https://github.com/mjkim0727/breeze-plus/archive/refs/heads/main.tar.gz -> ${P}-breeze-plus.tar.gz
-https://github.com/lassekongo83/adw-gtk3/archive/refs/heads/main.tar.gz -> ${P}-adw-gtk3.tar.gz
-https://github.com/google/material-design-icons/raw/refs/heads/master/variablefont/MaterialSymbolsOutlined%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsOutlined.ttf
-    https://github.com/google/material-design-icons/raw/refs/heads/master/variablefont/MaterialSymbolsRounded%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsRounded.ttf
-    https://github.com/google/material-design-icons/raw/refs/heads/master/variablefont/MaterialSymbolsSharp%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsSharp.ttf
-https://github.com/floriankarsten/space-grotesk/archive/refs/tags/${SPACE_GROTESK_VER}.tar.gz -> ${P}-space-grotesk-${SPACE_GROTESK_VER}.tar.gz
-"
-LICENSE="GPL-2"
+
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="strip"

 DEPEND=""
 RDEPEND="
+	x11-themes/adw-gtk3
 	kde-plasma/breeze
+	kde-plasma/breeze-plus
+	x11-themes/darkly
 	sys-apps/eza
 	app-shells/fish
 	media-libs/fontconfig
 	x11-terms/kitty
 	x11-misc/matugen
+	media-fonts/space-grotesk
 	app-shells/starship
+	media-fonts/gabarito
 	media-fonts/jetbrains-mono
+	media-fonts/material-symbols-variable
+	media-fonts/readex-pro
+	media-fonts/roboto-flex
+	media-fonts/rubik-vf
 	media-fonts/twemoji
 "
-
-# Source directories
-S="${WORKDIR}"
-S_DARKLY="${S}/Darkly-main"
-S_GABARITO="${S}/gabarito-main"
-S_RUBIK="${S}/rubik-main"
-S_READEXPRO="${S}/readexpro-master"
-S_ADW_GTK3="${S}/adw-gtk3-main"
-S_BREEZE_PLUS="${S}/breeze-plus-main"
-S_SPACE_GROTESK="${S}/space-grotesk-${SPACE_GROTESK_VER}"
-
-src_unpack() {
-	default
-
-	mv "${WORKDIR}/dart-sass-${DART_SASS_VER}-linux-x64" "${S_DART_SASS}"
-}
-
-src_compile() {
-	cd "${S_DARKLY}"
-	mkdir -p build
-	cd build
-	cmake .. -DBUILD_QT5=OFF -DBUILD_QT6=ON
-	cmake --build . --parallel=$(nproc)
-
-	cd "${S_ADW_GTK3}"
-	meson setup build
-	meson compile -C build
-}
-
-src_install() {
-	cd "${S_DARKLY}/build"
-	cmake --install . --destdir="${D}"
-
-	insinto /usr/share/fonts/ttf-gabarito
-	doins "${S_GABARITO}"/fonts/ttf/*.ttf
-
-	insinto /usr/share/fonts/ttf-readex-pro
-	doins "${S_READEXPRO}"/fonts/ttf/*.ttf
-
-	insinto /usr/share/fonts/material-symbols
-	doins "${DISTDIR}"/MaterialSymbols*.ttf
-
-	insinto /usr/share/fonts/OTF
-	doins "${S_SPACE_GROTESK}"/fonts/otf/*.otf
-
-	insinto /usr/share/themes
-	doins -r "${S_BREEZE_PLUS}"/src/breeze-plus*
-
-	cd "${S_ADW_GTK3}"
-	meson install -C build --destdir="${D}"
-
-	fc-cache -f
-}
+##### CUSTOM EBUILDS
+# x11-themes/adw-gtk3
+# x11-themes/darkly
+# media-fonts/space-grotesk
+# media-fonts/gabarito
+# media-fonts/material-symbols-variable
+# media-fonts/readex-pro
+# media-fonts/rubik-vf
@@ -1,28 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake git-r3
-
-DESCRIPTION="Hyprland graphics / resource utilities (live/HEAD)"
-HOMEPAGE="https://github.com/hyprwm/hyprgraphics"
-
-# For live ebuilds, Portage clones the git repo
-EGIT_REPO_URI="https://github.com/hyprwm/hyprgraphics.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=gui-libs/hyprutils-0.1.1:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libjxl:=
-	media-libs/libspng
-	media-libs/libwebp:=
-	sys-apps/file
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-
@@ -1,35 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake git-r3
-
-DESCRIPTION="QML style provider for hypr* Qt apps"
-HOMEPAGE="https://github.com/hyprwm/hyprland-qt-support"
-EGIT_REPO_URI="https://github.com/hyprwm/hyprland-qt-support.git"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-qt/qtbase:6
-	dev-qt/qtdeclarative:6
-	>=dev-libs/hyprlang-0.6.0
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_QML_PREFIX="${EPFREIX}/$(get_libdir)/qt6/qml"
-	)
-
-	cmake_src_configure
-}
@@ -1,26 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake git-r3
-
-DESCRIPTION="Hyprland QT/qml utility apps"
-HOMEPAGE="https://github.com/hyprwm/hyprland-qtutils"
-EGIT_REPO_URI="https://github.com/hyprwm/hyprland-qtutils.git"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-qt/qtbase:6
-	dev-qt/qtdeclarative:6
-	dev-qt/qtwayland:6
-	gui-libs/hyprutils:=
-	gui-libs/hyprland-qt-support
-	kde-frameworks/qqc2-desktop-style:6
-"
-
-DEPEND="${RDEPEND}"
@@ -1,25 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs git-r3
-
-DESCRIPTION="Official implementation library for the hypr config language"
-HOMEPAGE="https://github.com/hyprwm/hyprlang"
-EGIT_REPO_URI="https://github.com/hyprwm/hyprlang.git"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=gui-libs/hyprutils-0.7.1:="
-DEPEND="${RDEPEND}"
-BDEPEND="|| ( >=sys-devel/gcc-14:* >=llvm-core/clang-18:* )"
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	tc-check-min_ver gcc 14
-	tc-check-min_ver clang 18
-}
@@ -1,37 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="A Hyprland implementation of wayland-scanner, in and for C++"
-HOMEPAGE="https://github.com/hyprwm/hyprwayland-scanner/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/hyprwm/hyprwayland-scanner.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/hyprwm/hyprwayland-scanner/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-fi
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm64 x86"
-SLOT="0"
-
-RDEPEND=">=dev-libs/pugixml-1.14"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
-		eerror "Hyprland requires >=llvm-core/clang-16 to build"
-		eerror "Please upgrade Clang: emerge -v1 llvm-core/clang"
-		die "Clang version is too old to compile Hyprland!"
-	fi
-}
@@ -14,19 +14,10 @@ RESTRICT="strip"
 DEPEND=""
 RDEPEND="
 	gui-apps/hypridle
-	gui-libs/hyprcursor
-	gui-libs/hyprland-qtutils
-	gui-libs/hyprland-qt-support
-	dev-libs/hyprlang
 	gui-apps/hyprlock
 	gui-apps/hyprpicker
 	gui-apps/hyprsunset
-	gui-libs/hyprutils
-	dev-libs/hyprland-protocols
-	dev-libs/hyprgraphics
-	gui-libs/aquamarine
 	gui-wm/hyprland
-	dev-util/hyprwayland-scanner
 	gui-libs/xdg-desktop-portal-hyprland
 	gui-apps/wl-clipboard
 "
@@ -21,7 +21,6 @@ RDEPEND="
 	dev-cpp/cairomm
 "

-# Use WORKDIR directly after stripping top-level folder
 S="${WORKDIR}"

 src_unpack() {
@@ -38,7 +37,7 @@ src_prepare() {
 }

 src_compile() {
-	cd "${S}" || die
+	cd "${S}"
 	mkdir -p build
 	cmake -B build -S . -DCMAKE_BUILD_TYPE=None
 	cmake --build build
@@ -53,4 +52,3 @@ src_install() {
 	insinto /usr/share/licenses/illogical-impulse-microtex-git
 	doins LICENSE
 }
-
@@ -7,9 +7,9 @@ DESCRIPTION="A fork of mjkim0727/OneUI4-Icons for illogical-impulse dotfiles"
 HOMEPAGE=""
 SRC_URI="https://github.com/end-4/OneUI4-Icons/archive/main.tar.gz -> ${P}.tar.gz"

-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="strip"

 DEPEND=""
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Illogical Impulse XDG Desktop Portals"
 HOMEPAGE=""

-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 RESTRICT="strip"
@@ -6,12 +6,10 @@ EAPI=8
 DESCRIPTION="Illogical Impulse Python Dependencies"
 HOMEPAGE=""

-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-RESTRICT="strip"

-# SASSC is not needed here, pkgbuild is capping
 DEPEND=""
 RDEPEND="
 	dev-python/clang
@@ -20,6 +20,21 @@ IUSE="+breakpad +jemalloc +sockets +wayland +layer-shell +session-lock +toplevel
 RDEPEND="
 	dev-qt/qtbase:6
 	dev-qt/qtsvg:6
+	dev-qt/qt5compat:6
+
+	dev-qt/qtimageformats:6
+	dev-qt/qtmultimedia:6
+	dev-qt/qtpositioning:6
+	dev-qt/qtquicktimeline:6
+	dev-qt/qtsensors:6
+	dev-qt/qtsvg:6
+	dev-qt/qttools:6
+	dev-qt/qttranslations:6
+	dev-qt/qtvirtualkeyboard:6
+	dev-qt/qtwayland:6
+	kde-apps/kdialog
+	kde-frameworks/syntax-highlighting:6
+
 	jemalloc? ( dev-libs/jemalloc )
 	wayland? (
 		dev-libs/wayland
@@ -34,9 +49,6 @@ RDEPEND="
 	mpris? ( dev-qt/qtdbus )
 	pam? ( sys-libs/pam )
 	bluetooth? ( net-wireless/bluez )
-
-
-
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -60,7 +72,7 @@ BDEPEND="
 src_configure(){
 	mycmakeargs=(
 			-DCMAKE_BUILD_TYPE=RelWithDebInfo
-			-DDISTRIBUTOR="Gentoo GURU"
+			-DDISTRIBUTOR="Gentoo Illogical-Impulses"
 			-DINSTALL_QML_PREFIX="lib64/qt6/qml"
 			-DCRASH_REPORTER=$(usex breakpad ON OFF)
 			-DUSE_JEMALLOC=$(usex jemalloc ON OFF)
@@ -6,10 +6,9 @@ EAPI=8
 DESCRIPTION="Illogical Impulse Screenshot and Recording Dependencies"
 HOMEPAGE=""

-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-RESTRICT="strip"

 DEPEND=""
 RDEPEND="
@@ -3,31 +3,15 @@

 EAPI=8

-DESCRIPTION="Illogical Impulse GTK/Qt Dependencies"
+DESCRIPTION="Illogical Impulse Toolkit Dependencies"
 HOMEPAGE=""

-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-RESTRICT="strip"

 DEPEND=""
 RDEPEND="
-	kde-apps/kdialog
-	dev-qt/qt5compat
-	dev-qt/qtbase
-	dev-qt/qtdeclarative
-	dev-qt/qtimageformats
-	dev-qt/qtmultimedia
-	dev-qt/qtpositioning
-	dev-qt/qtquicktimeline
-	dev-qt/qtsensors
-	dev-qt/qtsvg
-	dev-qt/qttools
-	dev-qt/qttranslations
-	dev-qt/qtvirtualkeyboard
-	dev-qt/qtwayland
-	kde-frameworks/syntax-highlighting
 	sys-power/upower
 	gui-apps/wtype
 	x11-misc/ydotool
@@ -6,10 +6,9 @@ EAPI=8
 DESCRIPTION="Illogicall Impulse Widget Dependencies"
 HOMEPAGE=""

-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-RESTRICT="strip"

 DEPEND=""
 RDEPEND="
@@ -17,9 +16,11 @@ RDEPEND="
 	dev-libs/glib
 	media-gfx/imagemagick
 	gui-apps/hypridle
-	gui-libs/hyprutils
 	gui-apps/hyprlock
 	gui-apps/hyprpicker
+	app-misc/songrec
 	app-i18n/translate-shell
 	gui-apps/wlogout
 "
+##### CUSTOM EBUILDS
+# app-misc/songrec
@@ -0,0 +1,26 @@
+HYPR_DIR="local-pkgs/hyprland"
+FT_DIR="local-pkgs/fonts-and-themes"
+WIDGETS_DIR="local-pkgs/widgets"
+
+function import_ebuild(){
+	from_dir="$1"
+	to_dir="$2"
+	ename="$3"
+	x sudo rm -rf "${ebuild_dir}/${to_dir}/${ename}"
+	x sudo mkdir -p "${ebuild_dir}/${to_dir}/${ename}"
+	v sudo cp ./sdata/dist-gentoo/${from_dir}/${ename}*.ebuild "${ebuild_dir}/${to_dir}/${ename}"
+	v sudo ebuild "${ebuild_dir}/${to_dir}/${ename}/${ename}"*.ebuild digest
+}
+
+############### FONTS AND THEMES
+import_ebuild "${FT_DIR}" "media-fonts" "gabarito"
+import_ebuild "${FT_DIR}" "media-fonts" "material-symbols-variable"
+import_ebuild "${FT_DIR}" "media-fonts" "readex-pro"
+import_ebuild "${FT_DIR}" "media-fonts" "rubik-vf"
+import_ebuild "${FT_DIR}" "media-fonts" "space-grotesk"
+import_ebuild "${FT_DIR}" "kde-plasma" "breeze-plus"
+import_ebuild "${FT_DIR}" "x11-themes" "darkly"
+import_ebuild "${FT_DIR}" "media-fonts" "roboto-flex"
+
+############### WIDGETS
+import_ebuild "${WIDGETS_DIR}" "app-misc" "songrec"
@@ -18,17 +18,19 @@ printf "${STY_RST}"
 pause

 printf "${STY_YELLOW}"
-printf "https://github.com/end-4/dots-hyprland/blob/main/sdata/dist-gentoo/README.md"
-printf "Checkout the above README for potential bug fixes or additional information"
+printf "https://github.com/end-4/dots-hyprland/blob/main/sdata/dist-gentoo/README.md\n"
+printf "Checkout the above README for potential bug fixes or additional information\n\n"
 printf "${STY_RST}"
 pause

-x sudo emerge --noreplace --quiet app-eselect/eselect-repository
-x sudo emerge --noreplace --quiet app-portage/smart-live-rebuild
+x sudo emerge --update --quiet app-eselect/eselect-repository
+x sudo emerge --update --quiet app-portage/smart-live-rebuild
+# Currently using 3.12 python, this doesn't need to be default though
+x sudo emerge --update --quiet dev-lang/python:3.12

-if [[ -z $(eselect repository list | grep localrepo) ]]; then
-	v sudo eselect repository create localrepo
-	v sudo eselect repository enable localrepo 
+if [[ -z $(eselect repository list | grep ii-dots) ]]; then
+	v sudo eselect repository create ii-dots
+	v sudo eselect repository enable ii-dots
 fi

 if [[ -z $(eselect repository list | grep -E ".*guru \*.*") ]]; then
@@ -40,18 +42,29 @@ arch=$(portageq envvar ACCEPT_KEYWORDS)
 # Exclude hyprland, will deal with that separately
 metapkgs=(illogical-impulse-{audio,backlight,basic,bibata-modern-classic-bin,fonts-themes,hyprland,kde,microtex-git,oneui4-icons-git,portal,python,quickshell-git,screencapture,toolkit,widgets})

-ebuild_dir="/var/db/repos/localrepo"
+ebuild_dir="/var/db/repos/ii-dots"

-# Unmasks
+
+########## IMPORT KEYWORDS (START)
+# Illogical-Impulse
 x sudo cp ./sdata/dist-gentoo/keywords ./sdata/dist-gentoo/keywords-user
 x sed -i "s/$/ ~${arch}/" ./sdata/dist-gentoo/keywords-user
 v sudo cp ./sdata/dist-gentoo/keywords-user /etc/portage/package.accept_keywords/illogical-impulse

-# Use Flags
+# QT
+x sudo cp ./sdata/dist-gentoo/qt-keywords ./sdata/dist-gentoo/qt-keywords-user
+x sed -i "s/$/ ~${arch}/" ./sdata/dist-gentoo/qt-keywords-user
+v sudo cp ./sdata/dist-gentoo/qt-keywords-user /etc/portage/package.accept_keywords/qt
+
+########## IMPORT UNMASKS
+sudo mkdir -p /etc/portage/package.unmask/
+v sudo cp ./sdata/dist-gentoo/qt-unmasks /etc/portage/package.unmask/qt
+
+########## IMPORT USEFLAGS
 v sudo cp ./sdata/dist-gentoo/useflags /etc/portage/package.use/illogical-impulse
 v sudo sh -c 'cat ./sdata/dist-gentoo/additional-useflags >> /etc/portage/package.use/illogical-impulse'

-# Update system
+########## UPDATE SYSTEM
 v sudo emerge --sync
 v sudo emerge --quiet --newuse --update --deep @world
 v sudo emerge --quiet @smart-live-rebuild
@@ -60,35 +73,12 @@ v sudo emerge --depclean
 # Remove old ebuilds (if this isn't done the wildcard will fuck upon a version change)
 x sudo rm -fr ${ebuild_dir}/app-misc/illogical-impulse-*

-###### LIVE EBUILDS START
-HYPR_DIR="illogical-impulse-hyprland"
-x sudo mkdir -p ${ebuild_dir}/dev-libs/hyprgraphics/
-x sudo mkdir -p ${ebuild_dir}/gui-libs/hyprland-qt-support
-x sudo mkdir -p ${ebuild_dir}/gui-libs/hyprland-qtutils
-x sudo mkdir -p ${ebuild_dir}/dev-libs/hyprlang
-x sudo mkdir -p ${ebuild_dir}/dev-libs/hyprlang
-x sudo mkdir -p ${ebuild_dir}/dev-util/hyprwayland-scanner
+source ./sdata/dist-gentoo/import-local-pkgs.sh

-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprgraphics*.ebuild ${ebuild_dir}/dev-libs/hyprgraphics
-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprland-qt-support*.ebuild ${ebuild_dir}/gui-libs/hyprland-qt-support
-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprland-qtutils*.ebuild ${ebuild_dir}/gui-libs/hyprland-qtutils
-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprlang*.ebuild ${ebuild_dir}/dev-libs/hyprlang
-v sudo cp ./sdata/dist-gentoo/${HYPR_DIR}/hyprwayland-scanner*.ebuild ${ebuild_dir}/dev-util/hyprwayland-scanner
-
-v sudo ebuild ${ebuild_dir}/dev-libs/hyprgraphics/hyprgraphics*9999.ebuild digest
-v sudo ebuild ${ebuild_dir}/gui-libs/hyprland-qt-support/hyprland-qt-support*9999.ebuild digest
-v sudo ebuild ${ebuild_dir}/gui-libs/hyprland-qtutils/hyprland-qtutils*9999.ebuild digest
-v sudo ebuild ${ebuild_dir}/dev-libs/hyprlang/hyprlang*9999.ebuild digest
-v sudo ebuild ${ebuild_dir}/dev-util/hyprwayland-scanner/hyprwayland-scanner*9999.ebuild digest
-###### LIVE EBUILDS END
-
-# Install dependencies
+########## INSTALL ILLOGICAL-IMPUSEL EBUILDS
 for i in "${metapkgs[@]}"; do
 	x sudo mkdir -p ${ebuild_dir}/app-misc/${i}
 	v sudo cp ./sdata/dist-gentoo/${i}/${i}*.ebuild ${ebuild_dir}/app-misc/${i}/
 	v sudo ebuild ${ebuild_dir}/app-misc/${i}/*.ebuild digest
-	v sudo emerge --quiet app-misc/${i}
+	v sudo emerge --update --quiet app-misc/${i}
 done
-
-# Currently using 3.12 python, this doesn't need to be default though
-v sudo emerge --noreplace --quiet dev-lang/python:3.12
@@ -29,17 +29,27 @@ gui-apps/fuzzel
 gui-apps/quickshell **
 gui-apps/wlogout
 dev-cpp/sdbus-c++
-dev-libs/hyprland-protocols **
-gui-libs/aquamarine **
-gui-libs/hyprutils **
-dev-util/hyprwayland-scanner **
-dev-libs/hyprlang **
-dev-libs/hyprgraphics **
-gui-libs/hyprcursor **
-gui-libs/hyprland-qt-support **
-gui-libs/hyprland-qtutils **
-gui-wm/hyprland **
+dev-libs/hyprland-protocols
+gui-libs/aquamarine
+gui-libs/hyprutils
+dev-util/hyprwayland-scanner
+dev-libs/hyprlang
+dev-libs/hyprgraphics
+gui-libs/hyprcursor
+gui-libs/hyprland-qt-support
+gui-libs/hyprland-qtutils
+gui-wm/hyprland
 x11-libs/libxkbcommon
 dev-util/breakpad
 dev-libs/linux-syscall-support
 dev-embedded/libdisasm
+kde-plasma/breeze-plus
+x11-themes/darkly
+x11-themes/adw-gtk3
+media-fonts/space-grotesk
+media-fonts/gabarito **
+media-fonts/material-symbols-variable **
+media-fonts/readex-pro
+media-fonts/rubik-vf
+media-fonts/roboto-flex
+app-misc/songrec
@@ -0,0 +1,22 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Breeze styled extra icon theme for KDE"
+HOMEPAGE="https://github.com/mjkim0727/breeze-plus"
+SRC_URI="https://github.com/mjkim0727/breeze-plus/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RDEPEND="kde-plasma/breeze"
+BDEPEND=""
+
+S="${WORKDIR}/${PN}-${PV}"
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r src/breeze-plus*
+}
+
@@ -0,0 +1,54 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# NOTE: Did not include QT5 backwards compatibility
+
+inherit cmake
+
+DESCRIPTION="Fork of Lightly - A modern style for Qt applications"
+HOMEPAGE="https://github.com/Bali10050/Darkly"
+SRC_URI="https://github.com/Bali10050/darkly/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	kde-frameworks/kcoreaddons:6
+	kde-frameworks/kconfig:6
+	kde-frameworks/kguiaddons:6
+	kde-frameworks/ki18n:6
+	kde-frameworks/kiconthemes:6
+	kde-frameworks/kwindowsystem:6
+	kde-frameworks/kcmutils:6
+	kde-frameworks/frameworkintegration:6
+	kde-frameworks/kconfigwidgets:6
+	kde-plasma/kdecoration:6
+	dev-qt/qtdeclarative:6
+"
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-build/cmake
+	kde-frameworks/extra-cmake-modules
+	dev-vcs/git
+"
+
+S="${WORKDIR}/Darkly-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		-DBUILD_QT5=OFF
+		-DBUILD_QT6=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm -rf "${ED}/usr/$(get_libdir)/cmake" || die
+}
+
@@ -0,0 +1,22 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font git-r3
+
+DESCRIPTION="Illogical Impulse Fonts and Theming Dependencies"
+HOMEPAGE=""
+EGIT_REPO_URI="https://github.com/naipefoundry/gabarito"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS=""
+
+FONT_S="${S}/fonts/ttf"
+FONT_SUFFIX="ttf"
+
+src_install() {
+	font_src_install
+	dodoc OFL.txt
+}
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="Material Design icons by Google - variable fonts"
+HOMEPAGE="https://github.com/google/material-design-icons"
+
+BASE_URL="https://github.com/google/material-design-icons/raw/refs/heads/master"
+
+SRC_URI="
+	${BASE_URL}/variablefont/MaterialSymbolsOutlined%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsOutlined-FILL-GRAD-opsz-wght.ttf
+	${BASE_URL}/variablefont/MaterialSymbolsRounded%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsRounded-FILL-GRAD-opsz-wght.ttf
+	${BASE_URL}/variablefont/MaterialSymbolsSharp%5BFILL,GRAD,opsz,wght%5D.ttf -> MaterialSymbolsSharp-FILL-GRAD-opsz-wght.ttf
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+S="${WORKDIR}"
+
+FONT_SUFFIX="ttf"
+
+src_unpack() {
+	mkdir -p "${S}"
+	cp "${DISTDIR}/MaterialSymbolsOutlined-FILL-GRAD-opsz-wght.ttf" \
+		"${S}/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf"
+	cp "${DISTDIR}/MaterialSymbolsRounded-FILL-GRAD-opsz-wght.ttf" \
+		"${S}/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].ttf"
+	cp "${DISTDIR}/MaterialSymbolsSharp-FILL-GRAD-opsz-wght.ttf" \
+		"${S}/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].ttf"
+}
+
+src_install() {
+	font_src_install
+}
+
@@ -0,0 +1,21 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="Illogical Impulse Fonts and Theming Dependencies"
+HOMEPAGE=""
+SRC_URI="https://github.com/ThomasJockin/readexpro/archive/refs/heads/master.tar.gz -> ${P}-readexpro.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="strip"
+
+S="${WORKDIR}/readexpro-master"
+
+src_install() {
+	insinto /usr/share/fonts/ttf-readex-pro
+	doins "${S}"/fonts/ttf/*.ttf
+}
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="Upgrades Roboto to become a more powerful typeface system"
+HOMEPAGE="https://github.com/googlefonts/roboto-flex"
+SRC_URI="
+	https://github.com/googlefonts/roboto-flex/releases/download/${PV}/roboto-flex-fonts.zip -> ${P}.zip
+	https://github.com/googlefonts/roboto-flex/raw/main/OFL.txt -> ${P}-OFL.txt
+"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/roboto-flex-fonts"
+
+FONT_SUFFIX="ttf"
+FONT_S="${S}/fonts/variable"
+
+src_install() {
+	font_src_install
+	dodoc "${DISTDIR}/${P}-OFL.txt"
+}
@@ -0,0 +1,27 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="e337a5f69a9bea30e58d05bd40184d79cc099628"
+
+inherit font
+
+DESCRIPTION="A sans serif font family with slightly rounded corners: variable font version"
+HOMEPAGE="https://github.com/googlefonts/rubik"
+SRC_URI="https://github.com/googlefonts/rubik/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+S="${WORKDIR}/rubik-${COMMIT}"
+
+FONT_S="${S}/fonts/variable"
+FONT_SUFFIX="ttf"
+
+src_install() {
+	font_src_install
+	dodoc OFL.txt AUTHORS.txt CONTRIBUTORS.txt
+}
+
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="Space Grotesk OTF font from 38C3 styleguide"
+HOMEPAGE="https://events.ccc.de/congress/2024/infos/styleguide.html"
+SRC_URI="https://events.ccc.de/congress/2024/infos/styleguide/38c3-styleguide-full-v2.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/fonts/space-grotesk-${PV}"
+
+FONT_S="${S}/otf"
+FONT_SUFFIX="otf"
+
+src_install() {
+	font_src_install
+
+	dodoc OFL.txt
+}
+
@@ -0,0 +1,48 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Illogicall Impulse Widget Dependencies"
+HOMEPAGE=""
+SRC_URI="https://github.com/marin-m/SongRec/archive/${PV}.tar.gz -> ${P}-SongRec.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# need for cargo fetch, idk how to get around it if possible
+RESTRICT="strip network-sandbox"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/SongRec-${PV}"
+
+src_prepare() {
+	default
+	export CARGO_HOME="${WORKDIR}/cargo"
+	cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+}
+
+src_compile() {
+	export CARGO_HOME="${WORKDIR}/cargo"
+	cargo build --release --frozen --offline
+}
+
+src_install() {
+	dobin target/release/songrec
+	insinto /usr/share/applications
+
+	doins packaging/rootfs/usr/share/applications/com.github.marinm.songrec.desktop
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins packaging/rootfs/usr/share/icons/hicolor/scalable/apps/com.github.marinm.songrec.svg
+
+	insinto /usr/share/metainfo
+	doins packaging/rootfs/usr/share/metainfo/com.github.marinm.songrec.metainfo.xml
+
+	insinto /usr/share/songrec/translations
+	doins -r translations/*
+
+	dodoc README.md
+}
@@ -0,0 +1,27 @@
+dev-qt/qtbase
+dev-qt/qtdeclarative
+dev-qt/qtlanguageserver
+dev-qt/qtsvg
+dev-qt/qtshadertools
+dev-qt/qttranslations
+dev-qt/qttools
+dev-qt/qt5compat
+dev-qt/qtcore
+dev-qt/qtdbus
+dev-qt/qtgraphicaleffects
+dev-qt/qtgui
+dev-qt/qtimageformats
+dev-qt/qtlocation
+dev-qt/qtmultimedia
+dev-qt/qtnetwork
+dev-qt/qtpositioning
+dev-qt/qtquick3d
+dev-qt/qtquickcontrols2
+dev-qt/qtquicktimeline
+dev-qt/qtsensors
+dev-qt/qtspeech
+dev-qt/qttest
+dev-qt/qtvirtualkeyboard
+dev-qt/qtwayland
+dev-qt/qtwayland
+dev-qt/qtwidgets
@@ -0,0 +1,27 @@
+dev-qt/qtbase
+dev-qt/qtdeclarative
+dev-qt/qtlanguageserver
+dev-qt/qtsvg
+dev-qt/qtshadertools
+dev-qt/qttranslations
+dev-qt/qttools
+dev-qt/qt5compat
+dev-qt/qtcore
+dev-qt/qtdbus
+dev-qt/qtgraphicaleffects
+dev-qt/qtgui
+dev-qt/qtimageformats
+dev-qt/qtlocation
+dev-qt/qtmultimedia
+dev-qt/qtnetwork
+dev-qt/qtpositioning
+dev-qt/qtquick3d
+dev-qt/qtquickcontrols2
+dev-qt/qtquicktimeline
+dev-qt/qtsensors
+dev-qt/qtspeech
+dev-qt/qttest
+dev-qt/qtvirtualkeyboard
+dev-qt/qtwayland
+dev-qt/qtwayland
+dev-qt/qtwidgets
@@ -56,8 +56,7 @@ fi

 # _icons_, _konsole_, _hypr_, and _quickshell_ are are chowned to user since they're emerge in as root by default.
 if [[ "$OS_GROUP_ID" == "gentoo" ]]; then
-  v sudo chown -R $(whoami):$(whoami) ~/.config/hypr/
-  v sudo chown -R $(whoami):$(whoami) ~/.config/quickshell/
+  v sudo chown -R $(whoami):$(whoami) ~/.local/
 fi

 v gsettings set org.gnome.desktop.interface font-name 'Rubik 11'