From 81c1382843da6e0a6535d37db592b0955bdafb38 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 31 Jan 2024 07:21:01 +0000
Subject: [PATCH] rofi: move setting package and terminal into
 hyprland/default.nix

Allows setting alternate packages / terminals depending on how it's
used

Change hyprland to reference rofi.finalPackage instead of package
---
 home/hyprland/default.nix | 13 +++++++++----
 home/rofi/default.nix     |  3 ---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 70c7474c..a527bc7f 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -20,6 +20,11 @@
     ../nyxt/default.nix
     ../obs/default.nix
   ];
+  programs.rofi = with pkgs; {
+    package = rofi-wayland;
+    terminal = "${alacritty}/bin/alacritty";
+    pass.package = rofi-pass-wayland;
+  };
   services = {
     gpg-agent.pinentryFlavor = "gnome3";
     avizo.enable = true;
@@ -218,11 +223,11 @@
             # See https://wiki.hyprland.org/Configuring/Keywords/ for more
             "SUPER, F1, exec, ${swaylock.package}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse"
             "SUPER, Q, killactive,"
-            "SUPER SHIFT, Q, exec, ${rofi.package}/bin/rofi -replace -show power-menu"
+            "SUPER SHIFT, Q, exec, ${rofi.finalPackage}/bin/rofi -replace -show power-menu"
             "SUPER, V, togglefloating"
             "SUPER, M, fullscreen, 0"
             "SUPER SHIFT, M, fullscreen, 1"
-            "SUPER, tab, exec, ${rofi.package}/bin/rofi -replace -show window"
+            "SUPER, tab, exec, ${rofi.finalPackage}/bin/rofi -replace -show window"
             "SUPER, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass"
             "SUPER SHIFT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --last-used"
             "SUPER ALT, P, exec, pkill rofi || ${rofi.pass.package}/bin/rofi-pass --insert"
@@ -230,7 +235,7 @@
             "SUPER SHIFT, Z, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw"
 
             # Common program shortcuts
-            "SUPER, Space, exec, ${rofi.package}/bin/rofi -replace -show combi"
+            "SUPER, Space, exec, ${rofi.finalPackage}/bin/rofi -replace -show combi"
             "SUPER, Return, exec, ${alacritty.package}/bin/alacritty"
             "SUPER SHIFT, Return, exec, ${emacs.finalPackage}/bin/emacsclient -c"
             "SUPER, S, exec, ${alacritty.package}/bin/alacritty -e btm --group --battery"
@@ -238,7 +243,7 @@
 
             # Misc useful binds
             '',Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"''
-            ",XF86Calculator,exec,${rofi.package}/bin/rofi -replace -show calc"
+            ",XF86Calculator,exec,${rofi.finalPackage}/bin/rofi -replace -show calc"
 
             # Movement binds
             "SUPER, H, movefocus, l"
diff --git a/home/rofi/default.nix b/home/rofi/default.nix
index a2309368..79a0846d 100644
--- a/home/rofi/default.nix
+++ b/home/rofi/default.nix
@@ -6,12 +6,9 @@
   stylix.targets.rofi.enable = true;
   programs.rofi = {
     enable = true;
-    package = pkgs.rofi-wayland;
     location = "center";
-    terminal = "${pkgs.alacritty}/bin/alacritty";
     pass = {
       enable = true;
-      package = pkgs.rofi-pass-wayland;
       extraConfig = ''
         USERNAME_field='login'
       '';