From c073d556d8a923206e359ad13fca7b3763464a1e Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 11 Sep 2023 09:25:17 +0100
Subject: [PATCH] Rename some things in hyprland config

---
 home/hyprland/config.nix | 68 +++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index e7f8cdb0..cd406f6f 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -1,10 +1,6 @@
 { config, pkgs, theme, ... }:
-let
-  emacsPackage = pkgs.emacs29-pgtk;
-  firefoxPackage = pkgs.firefox-wayland;
-  rofiPackage = pkgs.rofi-wayland;
-  swaylockPackage = pkgs.swaylock-effects;
-in ''
+
+''
   source = ${theme}
   source = ./extra.conf
   monitor=,preferred,auto,auto
@@ -79,42 +75,42 @@ in ''
   }
 
   # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-  bind = SUPER, F1, exec, ${swaylockPackage}/bin/swaylock
+  bind = SUPER, F1, exec, swaylock
   bind = SUPER, M, fullscreen, 0
-  bind = SUPER, P, exec, pkill rofi || ${pkgs.rofi-pass}/bin/rofi-pass
-  bind = SUPER, X, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t
+  bind = SUPER, P, exec, pkill rofi || rofi-pass
+  bind = SUPER, X, exec, swaync-client -t
   bind = SUPER SHIFT, M, fullscreen, 1
   bind = SUPER SHIFT, Q, killactive,
   bind = SUPER SHIFT, Space, togglefloating
-  bind = SUPER SHIFT, P, exec, pkill rofi || ${rofiPackage}/bin/rofi -show power-menu
+  bind = SUPER SHIFT, P, exec, pkill rofi || rofi -show power-menu
 
   # Common program shortcuts
-  bind = SUPER, E, exec, ${emacsPackage}/bin/emacsclient -c -a 'emacs'
-  bind = SUPER, B, exec, pkill rofi || ${rofiPackage}/bin/rofi -show filebrowser
-  bind = SUPER, Space, exec, pkill rofi || ${rofiPackage}/bin/rofi -show combi
-  bind = SUPER, Return, exec, ${pkgs.alacritty}/bin/alacritty
-  bind = SUPER SHIFT, Return, exec, pkill rofi || ${rofiPackage}/bin/rofi -show run
+  bind = SUPER, E, exec, emacsclient -c -a 'emacs'
+  bind = SUPER, B, exec, pkill rofi || rofi -show filebrowser
+  bind = SUPER, Space, exec, pkill rofi || rofi -show combi
+  bind = SUPER, Return, exec, alacritty
+  bind = SUPER SHIFT, Return, exec, pkill rofi || rofi -show run
 
-  bind = SUPER ALT, W, exec, [workspace 2] ${firefoxPackage}/bin/firefox
-  bind = SUPER ALT, F, exec, [workspace 4] ${pkgs.alacritty}/bin/alacritty -e mc
-  bind = SUPER ALT, S, exec, [workspace 5] ${pkgs.alacritty}/bin/alacritty -e ncspot
+  bind = SUPER ALT, W, exec, [workspace 2] firefox
+  bind = SUPER ALT, F, exec, [workspace 4] alacritty -e mc
+  bind = SUPER ALT, S, exec, [workspace 5] alacritty -e ncspot
 
   # Misc useful binds
-  bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"
-  bind=,XF86Calculator,exec,pkill rofi || ${rofiPackage}/bin/rofi -show calc
+  bind=,Print,exec,grim -g "$(slurp)"
+  bind=,XF86Calculator,exec,pkill rofi || rofi -show calc
   # Sound
-  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
+  bindl=,XF86AudioMute,exec,pamixer -t
+  bindl=,XF86AudioMicMute,exec,pamixer --default-source -t
+  binde=,XF86AudioRaiseVolume,exec,pamixer -i 5
+  binde=,XF86AudioLowerVolume,exec,pamixer -d 5
   # Brightness
-  binde=,XF86MonBrightnessUp,exec,${pkgs.brightnessctl}/bin/brightnessctl s +5%
-  binde=,XF86MonBrightnessDown,exec,${pkgs.brightnessctl}/bin/brightnessctl s 5%-
+  binde=,XF86MonBrightnessUp,exec,brightnessctl s +5%
+  binde=,XF86MonBrightnessDown,exec,brightnessctl s 5%-
   # Playback
-  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
+  binde=,XF86AudioPlay,exec,playerctl play-pause
+  binde=,XF86AudioStop,exec,playerctl play-pause
+  binde=,XF86AudioPrev,exec,playerctl previous
+  binde=,XF86AudioNext,exec,playerctl next
 
   bind = SUPER, H, movefocus, l
   bind = SUPER, L, movefocus, r
@@ -223,10 +219,10 @@ in ''
   bindm = SUPER, mouse:272, movewindow
   bindm = SUPER, mouse:273, resizewindow
 
-  exec-once = ${pkgs.libsForQt5.polkit-kde-agent}/bin/polkit-kde-authentication-agent-1
-  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
+  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
 ''