From 524db89061067819054a3b8d20a3cf14c5532aa4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 11 Sep 2023 13:46:52 +0100
Subject: [PATCH] Fix rofi-power-menu

---
 home/hyprland/config.nix       | 37 +++++++++++++++++-----------------
 home/hyprland/rofi/default.nix |  6 ++++--
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index cd406f6f..5837cf9b 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, theme, ... }:
+{ config, pkgs, theme, ... }: ''
+  exec-once = ${pkgs.libsForQt5.polkit-kde-agent}/bin/polkit-kde-authentication-agent-1
 
-''
   source = ${theme}
   source = ./extra.conf
   monitor=,preferred,auto,auto
@@ -96,21 +96,21 @@
   bind = SUPER ALT, S, exec, [workspace 5] alacritty -e ncspot
 
   # Misc useful binds
-  bind=,Print,exec,grim -g "$(slurp)"
+  bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"
   bind=,XF86Calculator,exec,pkill rofi || rofi -show calc
   # Sound
-  bindl=,XF86AudioMute,exec,pamixer -t
-  bindl=,XF86AudioMicMute,exec,pamixer --default-source -t
-  binde=,XF86AudioRaiseVolume,exec,pamixer -i 5
-  binde=,XF86AudioLowerVolume,exec,pamixer -d 5
+  bindl=,XF86AudioMute,exec,${pkgs.pamixer}/bin/pamixer -t
+  bindl=,XF86AudioMicMute,exec,${pkgs.pamixer}/bin/pamixer --default-source -t
+  binde=,XF86AudioRaiseVolume,exec,${pkgs.pamixer}/bin/pamixer -i 5
+  binde=,XF86AudioLowerVolume,exec,${pkgs.pamixer}/bin/pamixer -d 5
   # Brightness
-  binde=,XF86MonBrightnessUp,exec,brightnessctl s +5%
-  binde=,XF86MonBrightnessDown,exec,brightnessctl s 5%-
+  binde=,XF86MonBrightnessUp,exec,${pkgs.brightnessctl}/bin/brightnessctl s +5%
+  binde=,XF86MonBrightnessDown,exec,${pkgs.brightnessctl}/bin/brightnessctl s 5%-
   # Playback
-  binde=,XF86AudioPlay,exec,playerctl play-pause
-  binde=,XF86AudioStop,exec,playerctl play-pause
-  binde=,XF86AudioPrev,exec,playerctl previous
-  binde=,XF86AudioNext,exec,playerctl next
+  binde=,XF86AudioPlay,exec,${pkgs.playerctl}/bin/playerctl play-pause
+  binde=,XF86AudioStop,exec,${pkgs.playerctl}/bin/playerctl play-pause
+  binde=,XF86AudioPrev,exec,${pkgs.playerctl}/bin/playerctl previous
+  binde=,XF86AudioNext,exec,${pkgs.playerctl}/bin/playerctl next
 
   bind = SUPER, H, movefocus, l
   bind = SUPER, L, movefocus, r
@@ -219,10 +219,9 @@
   bindm = SUPER, mouse:272, movewindow
   bindm = SUPER, mouse:273, resizewindow
 
-  exec-once = polkit-kde-authentication-agent-1
-  exec-once = waybar
-  exec-once = swaync
-  exec-once = hyprpaper
-  exec-once = protonmail-bridge -n
-  exec-once = davmail -notray
+  exec-once = ${pkgs.waybar}/bin/waybar
+  exec-once = ${pkgs.swaynotificationcenter}/bin/swaync
+  exec-once = ${pkgs.hyprpaper}/bin/hyprpaper
+  exec-once = ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n
+  exec-once = ${pkgs.davmail}/bin/davmail -notray
 ''
diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix
index 583a26f7..86cd517d 100644
--- a/home/hyprland/rofi/default.nix
+++ b/home/hyprland/rofi/default.nix
@@ -1,5 +1,7 @@
 { pkgs, config, ... }:
-let icon-theme = config.gtk.iconTheme.name;
+let
+  icon-theme = config.gtk.iconTheme.name;
+  power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu";
 in {
   home.packages = with pkgs; [ rofi-power-menu libqalculate ];
   programs.rofi = {
@@ -8,7 +10,7 @@ in {
     pass.enable = true;
     plugins = with pkgs; [ rofi-calc ];
     extraConfig = {
-      modi = "window,run,drun,ssh,filebrowser,calc,combi";
+      modi = "window,run,drun,ssh,filebrowser,calc,${power-menu},combi";
       combi-modi = "window,drun,ssh,filebrowser";
       sort = true;
       sorting-method = "fzf";