gentoo: quickshell update + small change (#3687)

sdata/dist-gentoo/README.md

@@ -25,7 +25,7 @@ metapackage supports those architectures yet.
 The dependency installer:
 
 1. Installs `eselect-repository`, `rsync`, and `smart-live-rebuild`.
-2. Enables the GURU and hyproverlay repositories when necessary.
+2. Enables the GURU repository when necessary.
 3. Copies [`overlay/`](overlay/) to `/var/db/repos/ii-dots` and installs its
    repository configuration.
 4. Generates `/etc/portage/package.accept_keywords/illogical-impulse` for the

sdata/dist-gentoo/overlay/gui-apps/illogical-impulse-quickshell-git/Manifest

@@ -1 +1 @@
-DIST illogical-impulse-quickshell-git-0.1.0.tar.gz 473016 BLAKE2B 35d712b60cbb71a544fb18e8c6b068ede1573add6478e0b25021b262797f40b36183dc95378b3f6f8c09f7e0e5f135377b2524137b91253dfaf5042dc48ede21 SHA512 6fa10237fe12f58ce4bbb625d3ae3830b03ffa965b4ab88eb2ba6d7dec37fbca4e4eb7f20ed8ceecee3343e0cb764c7cf7a219ffccb394371ee2765ad7f8c319
+DIST illogical-impulse-quickshell-git-0.1.0-4f508be500dea6e5732cc3d50382a0048b17e7b1.tar.gz 500872 BLAKE2B daf2e04a7044f19da7ab5e63b29db650ce497905743c85545c7bfa6e0a153030d32df139c1e25b94a539b4632eee6e677f2672f546a7229eb8a73914aaf791a8 SHA512 23140d813a3b4c2dbc609587b9a85e4748a2c61065c26d5eef647bd060733a21d2d25c402595ec21e3cbf2564730c7fe4d187910b14b00fe56815a965d8884cc

sdata/dist-gentoo/overlay/gui-apps/illogical-impulse-quickshell-git/illogical-impulse-quickshell-git-0.1.0-r8.ebuild

@@ -5,11 +5,11 @@ EAPI=8
 
 inherit cmake toolchain-funcs
 
-COMMIT="7511545ee20664e3b8b8d3322c0ffe7567c56f7a"
+COMMIT="4f508be500dea6e5732cc3d50382a0048b17e7b1"
 
 DESCRIPTION="Toolkit for building desktop widgets using QtQuick"
 HOMEPAGE="https://quickshell.org/"
-SRC_URI="https://github.com/quickshell-mirror/quickshell/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/quickshell-mirror/quickshell/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz"
 S="${WORKDIR}/quickshell-${COMMIT}"
 
 LICENSE="LGPL-3"

sdata/dist-gentoo/overlay/metadata/layout.conf

@@ -1,3 +1,3 @@
-masters = gentoo guru hyproverlay
+masters = gentoo guru
 thin-manifests = true
 sign-manifests = false

sdata/dist-gentoo/useflags

@@ -8,7 +8,7 @@ net-misc/wget ssl
 x11-terms/kitty wayland
 media-fonts/nerdfonts jetbrainsmono
 
-gui-wm/hyprland::hyproverlay X guiutils
+gui-wm/hyprland X guiutils
 
 gnome-base/gnome-keyring pam ssh-agent
 net-misc/networkmanager concheck tools wifi

sdata/subcmd-install/2.setups.sh

@@ -27,35 +27,49 @@ v install-python-packages
 showfun setup_user_group
 v setup_user_group
 
-if [[ ! -z $(systemctl --version) ]]; then
-  # For Fedora, uinput is required for the virtual keyboard to function, and udev rules enable input group users to utilize it.
-  if [[ "$OS_GROUP_ID" == "fedora" ]]; then
-    v bash -c "echo uinput | sudo tee /etc/modules-load.d/uinput.conf"
-    v bash -c 'echo SUBSYSTEM==\"misc\", KERNEL==\"uinput\", MODE=\"0660\", GROUP=\"input\" | sudo tee /etc/udev/rules.d/99-uinput.rules'
-  else
-    v bash -c "echo i2c-dev | sudo tee /etc/modules-load.d/i2c-dev.conf"
-  fi
-  # TODO: find a proper way for enable Nix installed ydotool. When running `systemctl --user enable ydotool, it errors "Failed to enable unit: Unit ydotool.service does not exist".
-  if [[ ! "${INSTALL_VIA_NIX}" == true ]]; then
+if [[ -d /run/systemd/system ]]; then
+  if systemctl --version >/dev/null 2>&1; then
+    # For Fedora, uinput is required for the virtual keyboard to function, and udev rules enable input group users to utilize it.
     if [[ "$OS_GROUP_ID" == "fedora" ]]; then
-      v prepare_systemd_user_service
-    fi
-    # When $DBUS_SESSION_BUS_ADDRESS and $XDG_RUNTIME_DIR are empty, it commonly means that the current user has been logged in with `su - user` or `ssh user@hostname`. In such case `systemctl --user enable <service>` is not usable. It should be `sudo systemctl --machine=$(whoami)@.host --user enable <service>` instead.
-    if [[ ! -z "${DBUS_SESSION_BUS_ADDRESS}" ]]; then
-      v systemctl --user enable ydotool --now
+      v bash -c "echo uinput | sudo tee /etc/modules-load.d/uinput.conf"
+      v bash -c 'echo SUBSYSTEM==\"misc\", KERNEL==\"uinput\", MODE=\"0660\", GROUP=\"input\" | sudo tee /etc/udev/rules.d/99-uinput.rules'
     else
-      v sudo systemctl --machine=$(whoami)@.host --user enable ydotool --now
+      v bash -c "echo i2c-dev | sudo tee /etc/modules-load.d/i2c-dev.conf"
     fi
+    # TODO: find a proper way for enable Nix installed ydotool. When running `systemctl --user enable ydotool, it errors "Failed to enable unit: Unit ydotool.service does not exist".
+    if [[ ! "${INSTALL_VIA_NIX}" == true ]]; then
+      if [[ "$OS_GROUP_ID" == "fedora" ]]; then
+        v prepare_systemd_user_service
+      fi
+      # When $DBUS_SESSION_BUS_ADDRESS and $XDG_RUNTIME_DIR are empty, it commonly means that the current user has been logged in with `su - user` or `ssh user@hostname`. In such case `systemctl --user enable <service>` is not usable. It should be `sudo systemctl --machine=$(whoami)@.host --user enable <service>` instead.
+      if [[ ! -z "${DBUS_SESSION_BUS_ADDRESS}" ]]; then
+        v systemctl --user enable ydotool --now
+      else
+        v sudo systemctl --machine=$(whoami)@.host --user enable ydotool --now
+      fi
+    fi
+    v sudo systemctl enable bluetooth --now
+  else
+    echo -e "${STY_RED}Systemd detected, but the systemctl command is unavailable.${STY_RST}"
+    pause
   fi
-  v sudo systemctl enable bluetooth --now
-elif [[ ! -z $(openrc --version) ]]; then
-  v bash -c "echo 'modules=i2c-dev' | sudo tee -a /etc/conf.d/modules"
-  v sudo rc-update add modules boot
-  v sudo rc-update add ydotool default
-  v sudo rc-update add bluetooth default
+elif [[ -f /run/openrc/softlevel ]]; then
+  if openrc --version >/dev/null 2>&1; then
+    v sudo mkdir -p /etc/modules-load.d
+    v bash -c "printf '%s\n' i2c-dev | sudo tee /etc/modules-load.d/i2c-dev.conf"
+    if [[ -f /etc/conf.d/modules ]]; then
+      v sudo sed -i '/^modules=i2c-dev$/d' /etc/conf.d/modules
+    fi
+    v sudo rc-update add modules boot
+    v sudo rc-update add ydotool default
+    v sudo rc-update add bluetooth default
 
-  x sudo rc-service ydotool start
-  x sudo rc-service bluetooth start
+    x sudo rc-service ydotool start
+    x sudo rc-service bluetooth start
+  else
+    echo -e "${STY_RED}OpenRC detected, but the openrc command is unavailable.${STY_RST}"
+    pause
+  fi
 elif [[ ! -z $(dinitctl --version 2>/dev/null) ]]; then
   # Modules loading
   v bash -c "echo i2c-dev | sudo tee -a /etc/modules"