From 5301ae7af1c9978fbd2f401f18814633374962a6 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 5 Apr 2023 11:17:41 +0100
Subject: [PATCH] Add some custom rofi script shortcuts

---
 nixos/home-manager/env/rofi.nix  |  1 -
 nixos/home-manager/env/sxhkd.nix | 15 +++++++++------
 nixos/home-manager/env/xfce.nix  |  3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/nixos/home-manager/env/rofi.nix b/nixos/home-manager/env/rofi.nix
index b635e33e..2681c8d4 100644
--- a/nixos/home-manager/env/rofi.nix
+++ b/nixos/home-manager/env/rofi.nix
@@ -4,6 +4,5 @@
     enable = true;
     location = "right";
     pass.enable = true;
-    theme = "fancy";
   };
 }
diff --git a/nixos/home-manager/env/sxhkd.nix b/nixos/home-manager/env/sxhkd.nix
index 8c9b25ac..5ba6f68a 100644
--- a/nixos/home-manager/env/sxhkd.nix
+++ b/nixos/home-manager/env/sxhkd.nix
@@ -8,7 +8,7 @@
       "super + shift + Return" = "xfce4-terminal --drop-down";
 
       # Launcher
-      "super + @space" = "rofi -show drun";
+      "super + @space" = "rofi -show drun -theme $HOME/.dotfiles/rofi/rofidmenu.rasi";
 
       # bspwm hotkeys
       "super + Escape" = "pkill -USR1 -x sxhkd";
@@ -17,18 +17,22 @@
       "super + m" = "bspc desktop -l next";
       "super + g" = "bspc node -s biggest";
 
+      # Custom scripts
+      "super + p" = "$HOME/.dotfiles/scripts/powermenu";
+      "super + e" = "$HOME/.dotfiles/scripts/power-profiles";
+
       # State/Flags
       "super + {t,shift + t,s,f}" = "bspc node -t {tiled,pseudo_tiled,floating,fullscreen}";
 
       # Focus/Scap
       "super + {_,shift + }{h,j,k,l}" = "bspc node -{f,s} {west,south,north,east}";
       "super + {_,shift + }{Left,Down,Up,Right}" = "bspc node -{f,s} {west,south,north,east}";
-      "super + {p,b,comma,period}" = "bspc node -f @{parent,brother,first,second}";
+      #"super + {p,b,comma,period}" = "bspc node -f @{parent,brother,first,second}";
       "super + {_,shift + }c" = "bspc node -f {next,prev}.local.!hidden.window";
-      "super + {_,shift + }bracket{left,right}" = "bspc {desktop,monitor} -f {prev,next}";
-      "super + {_,shift + }{9,0}" = "bspc node {-d,-m} {prev,next} --follow";
+      "super + {_,shift + }bracket{left,right}" = "bspc {desktop -f,node -d} {prev,next} --follow";
+      "super + {_,shift + }{comma,period}" = "bspc {monitor -f,node -m} {prev,next} --follow";
       "super + {grave,Tab}" = "bspc {node,desktop} -f last";
-      "super + {_,shift + }{1-8}" = "bspc {desktop -f,node -d} '^{1-8}'";
+      "super + {_,shift + }{1-9,0}" = "bspc {desktop -f,node -d} '^{1-9,10}' --follow";
 
       # Preselect
       "super + ctrl + {h,j,k,l}" = "bspc node -p {west,south,north,east}";
@@ -43,7 +47,6 @@
       "super + w" = "firefox";
       "super + shift + f" = "thunar";
       "super + f" = "kitty -e ranger";
-      "alt + p" = "rofi -show drun";
 
       # Volume control keys
       "XF86AudioMute" = "pamixer -t";
diff --git a/nixos/home-manager/env/xfce.nix b/nixos/home-manager/env/xfce.nix
index 2e53d568..221d35cb 100644
--- a/nixos/home-manager/env/xfce.nix
+++ b/nixos/home-manager/env/xfce.nix
@@ -13,11 +13,14 @@
     xfce.thunar
     ranger
     flameshot
+    power-profiles-daemon
   ];
   xfconf.settings = {
     xsettings = {
       "Net/ThemeName" = "Catppuccin-Frappe-Standard-Blue-Dark";
       "Gtk/CursorThemeName" = "Catppuccin-Macchiato-Dark";
+      "Gtk/FontName" = "Sans 12";
+      "Gtk/MonospaceFontName" = "FiraCode Nerd Font 12";
     };
   };
 }