From 6ba393d433c87a54597b6215e915f0f2ea550c3e Mon Sep 17 00:00:00 2001
From: marc <marc@sastre.cat>
Date: Tue, 5 Nov 2024 21:52:07 +0100
Subject: [PATCH] Fix rofi, eww and gpg

---
 config/eww/scripts/get-active-workspace.sh | 2 +-
 config/eww/scripts/get-workspaces.sh       | 2 +-
 config/rofi/menus/bluetooth/bluetooth.rasi | 2 +-
 config/rofi/menus/launcher/launcher.rasi   | 2 +-
 config/rofi/menus/pass/pass.rasi           | 2 +-
 config/rofi/menus/powermenu/powermenu.rasi | 2 +-
 config/rofi/menus/wifi/wifi.rasi           | 2 +-
 modules/desktop/rofi.nix                   | 9 ++++++---
 modules/system/gpg.nix                     | 2 +-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/config/eww/scripts/get-active-workspace.sh b/config/eww/scripts/get-active-workspace.sh
index 7bb8fe3..c80f7f0 100644
--- a/config/eww/scripts/get-active-workspace.sh
+++ b/config/eww/scripts/get-active-workspace.sh
@@ -2,5 +2,5 @@
 
 hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id'
 
-socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - |
+socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - |
   stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}'
diff --git a/config/eww/scripts/get-workspaces.sh b/config/eww/scripts/get-workspaces.sh
index 7ca4a05..575e380 100644
--- a/config/eww/scripts/get-workspaces.sh
+++ b/config/eww/scripts/get-workspaces.sh
@@ -6,6 +6,6 @@ spaces (){
 }
 
 spaces
-socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do
+socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do
 	spaces
 done
diff --git a/config/rofi/menus/bluetooth/bluetooth.rasi b/config/rofi/menus/bluetooth/bluetooth.rasi
index 62e4b80..8f63f9e 100644
--- a/config/rofi/menus/bluetooth/bluetooth.rasi
+++ b/config/rofi/menus/bluetooth/bluetooth.rasi
@@ -4,7 +4,7 @@
  *
  **/
 
-@import "../../theme.rasi"
+@import "~/.config/rofi/theme.rasi"
 
 /*****----- Configuration -----*****/
 configuration {
diff --git a/config/rofi/menus/launcher/launcher.rasi b/config/rofi/menus/launcher/launcher.rasi
index 6a78f03..8399c4d 100644
--- a/config/rofi/menus/launcher/launcher.rasi
+++ b/config/rofi/menus/launcher/launcher.rasi
@@ -4,7 +4,7 @@
  *
  **/
 
-@import "../../theme.rasi"
+@import "~/.config/rofi/theme.rasi"
 
 /*****----- Configuration -----*****/
 configuration {
diff --git a/config/rofi/menus/pass/pass.rasi b/config/rofi/menus/pass/pass.rasi
index dd7009a..9cea3bc 100644
--- a/config/rofi/menus/pass/pass.rasi
+++ b/config/rofi/menus/pass/pass.rasi
@@ -4,7 +4,7 @@
  *
  **/
 
-@import "../../theme.rasi"
+@import "~/.config/rofi/theme.rasi"
 
 /*****----- Configuration -----*****/
 configuration {
diff --git a/config/rofi/menus/powermenu/powermenu.rasi b/config/rofi/menus/powermenu/powermenu.rasi
index a5ca2bf..ad9d115 100644
--- a/config/rofi/menus/powermenu/powermenu.rasi
+++ b/config/rofi/menus/powermenu/powermenu.rasi
@@ -4,7 +4,7 @@
  *
  **/
 
-@import "../../theme.rasi"
+@import "~/.config/rofi/theme.rasi"
 
 /*****----- Configuration -----*****/
 configuration {
diff --git a/config/rofi/menus/wifi/wifi.rasi b/config/rofi/menus/wifi/wifi.rasi
index dbb565b..f665962 100755
--- a/config/rofi/menus/wifi/wifi.rasi
+++ b/config/rofi/menus/wifi/wifi.rasi
@@ -4,7 +4,7 @@
  *
  **/
 
-@import "../../theme.rasi"
+@import "~/.config/rofi/theme.rasi"
 
 /*****----- Configuration -----*****/
 configuration {
diff --git a/modules/desktop/rofi.nix b/modules/desktop/rofi.nix
index ab047ee..3bd420d 100644
--- a/modules/desktop/rofi.nix
+++ b/modules/desktop/rofi.nix
@@ -10,9 +10,12 @@ in
     enable = lib.mkEnableOption "rofi";
   };
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      rofi
-    ];
+    environment.systemPackages = with pkgs;
+      if hyprCfg.enable then [
+        rofi-wayland
+      ] else [
+        rofi
+      ];
 
     hm.xdg.configFile."rofi/menus".source = ../../config/rofi/menus;
     hm.xdg.configFile."rofi/nix.png".source = nix-colors-lib.nixWallpaperFromScheme {
diff --git a/modules/system/gpg.nix b/modules/system/gpg.nix
index d678876..b5fe978 100644
--- a/modules/system/gpg.nix
+++ b/modules/system/gpg.nix
@@ -11,7 +11,7 @@ in
     programs.gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
-      pinentryPackage = pkgs.pinentry-rofi;
+      pinentryPackage = pkgs.pinentry-qt;
     };
     environment.systemPackages = with pkgs; [
       pinentry