From 38fa404775afc165c7e6e0773f3dc829cad89930 Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Mon, 19 Feb 2024 13:01:58 +0330
Subject: [PATCH] fix: keyring

---
 README.md                                       | 5 +++--
 hyprland/.config/hypr/conf/autostart.conf       | 6 ++----
 hyprland/.config/hypr/scripts/keyring-launch.sh | 9 ++-------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 5e2c35c..ea5b7af 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,8 @@ The following packages are required for the proper functioning of Hyprland on Vo
   - elogind : service
   - polkit : service
   - NetworkManager : service
-  - polkit-kde-agent
+  - gnome-keyring
+  - polkit-gnome
   - [ly](https://github.com/fairyglade/ly) : service
   - mesa-dri
   - [pipewire](https://docs.voidlinux.org/config/media/pipewire.html)
@@ -60,12 +61,12 @@ The following packages are required for the proper functioning of Hyprland on Vo
   - grim
   - slurp
   - jq
+  - cliphist
   - wl-clipboard
   - libnotify
   - dunst
   - swayidle
   - swappy
-  - cliphist
   - rofi
   - wlogout
   - font-awesome-6
diff --git a/hyprland/.config/hypr/conf/autostart.conf b/hyprland/.config/hypr/conf/autostart.conf
index f216093..747a0ef 100644
--- a/hyprland/.config/hypr/conf/autostart.conf
+++ b/hyprland/.config/hypr/conf/autostart.conf
@@ -3,12 +3,11 @@
 # -----------------------------------------------------
 
 # core components :
-# exec-once = $scr_path/keyring-launch.sh
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
-exec-once = /usr/libexec/polkit-kde-authentication-agent-1 &
+exec-once = $scr_path/keyring-launch.sh
 exec-once = sleep 1 && pipewire &
 exec-once = sleep 1 && /usr/bin/pipewire-pulse &
-# exec-once = sleep 1 && /usr/bin/wireplumber &
+exec-once = sleep 1 && /usr/bin/wireplumber &
 
 # wallpaper :
 # exec-once = swaybg -i ~/Wallpapers/macos.png &
@@ -20,7 +19,6 @@ exec-once = ~/.config/hypr/scripts/dunst-launch.sh
 # exec-once = eww daemon && eww open bar
 # exec-once = swayidle -w timeout 300 'gtklock' before-sleep 'gtklock' &
 # exec-once = swayidle -w timeout 450 'pidof java || systemctl suspend' & # dont sleep if playing minecraft, else nvidia will fuck up
-# exec-once = sleep 1 && dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # Some fix idk
 # exec-once = wl-paste --watch cliphist store &
 
 # cursor :
diff --git a/hyprland/.config/hypr/scripts/keyring-launch.sh b/hyprland/.config/hypr/scripts/keyring-launch.sh
index 4665997..66d103c 100755
--- a/hyprland/.config/hypr/scripts/keyring-launch.sh
+++ b/hyprland/.config/hypr/scripts/keyring-launch.sh
@@ -1,9 +1,4 @@
 #!/usr/bin/env bash
 
-if [ $(grep -i -w "ID=" /etc/os-release | grep -oP '(?<=")[^"]*') = void ]; then
-    exec gnome-keyring-daemon -sd
-    exec /usr/libexec/polkit-gnome-authentication-agent-1
-else
-    exec gnome-keyring-daemon -sd
-    exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-fi
+exec gnome-keyring-daemon -sd &
+exec /usr/libexec/polkit-gnome-authentication-agent-1