From 9c13691d36bd63a4f28c2974c899446ef265b6ca Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 9 Aug 2023 14:00:25 +0100
Subject: [PATCH] Add waybar icon, program shortcuts

---
 home/hyprland/default.nix                     | 21 ++++++++++++-------
 .../waybar/modules/wlr_workspaces.nix         |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index bb18f2db..447260aa 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -124,8 +124,6 @@ in {
       # See https://wiki.hyprland.org/Configuring/Keywords/ for more
       bind = SUPER, Return, exec, ${pkgs.alacritty}/bin/alacritty
       bind = SUPER, F1, exec, ${pkgs.swaylock-effects}/bin/swaylock
-      bind = SUPER, X, exec, ${pkgs.emacs}/bin/emacsclient -c -a 'emacs'
-      bind = SUPER, T, exec, ${pkgs.xfce.thunar}/bin/thunar
       bind = SUPER, Space, exec, ${anyrunPackage}/bin/anyrun
       bind = SUPER, M, fullscreen, 0
       bind = SUPER SHIFT, Q, killactive,
@@ -133,6 +131,15 @@ in {
       bind = SUPER SHIFT, Return, exec, pkill rofi || ${pkgs.rofi-wayland}/bin/rofi -show ssh
       bind = SUPER SHIFT, P, exec, pkill rofi || ${pkgs.rofi-wayland}/bin/rofi -show power-menu
 
+      # Common program shortcuts
+      bind = SUPER ALT, X, exec, ${pkgs.emacs}/bin/emacsclient -c -a 'emacs'
+      bind = SUPER ALT, W, exec, ${pkgs.firefox-wayland}/bin/firefox
+      bind = SUPER ALT, E, exec, ${pkgs.thunderbird}/bin/thunderbird
+      bind = SUPER ALT, F, exec, ${pkgs.xfce.thunar}/bin/thunar
+      bind = SUPER ALT, Z, exec, ${pkgs.zotero}/bin/zotero
+      bind = SUPER ALT, S, exec, ${pkgs.alacritty}/bin/alacritty -e ncspot
+      bind = SUPER ALT, V, exec, ${pkgs.bitwarden}/bin/bitwarden
+
       # Misc useful binds
       bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"
       # Sound
@@ -183,7 +190,6 @@ in {
       bind = SUPER SHIFT, F, movetoworkspace, name:files
       windowrule = workspace name:files,(org.pwmt.zathura)
       windowrule = workspace name:files,^(libreoffice).*
-      windowrule = workspace name:files,(Zotero)
       windowrule = workspace name:files,(thunar)
       windowrulev2 = workspace name:files,title:(Open),class:(soffice)
       windowrulev2 = float,title:(Open),class:(soffice)
@@ -203,10 +209,11 @@ in {
       windowrulev2 = nofullscreenrequest,title:(Zoom|zoom)
       windowrulev2 = nomaximizerequest,title:(Zoom|zoom)
 
-      # reference
-      bind = SUPER, Z, moveworkspacetomonitor, name:reference current
-      bind = SUPER, Z, workspace, name:reference
-      bind = SUPER SHIFT, Z, movetoworkspace, name:reference
+      # library
+      bind = SUPER, Z, moveworkspacetomonitor, name:library current
+      bind = SUPER, Z, workspace, name:library
+      bind = SUPER SHIFT, Z, movetoworkspace, name:library
+      windowrule = workspace name:files,(Zotero)
 
       # music
       bind = SUPER, S, moveworkspacetomonitor, name:music current
diff --git a/home/hyprland/waybar/modules/wlr_workspaces.nix b/home/hyprland/waybar/modules/wlr_workspaces.nix
index 95b732f6..613dd35e 100644
--- a/home/hyprland/waybar/modules/wlr_workspaces.nix
+++ b/home/hyprland/waybar/modules/wlr_workspaces.nix
@@ -9,7 +9,7 @@
     "email" = "󰻧";
     "files" = "󰝰";
     "chat" = "󰭹";
-    "call" = "󰍫";
+    "library" = "󰮩";
     "music" = "󰲸";
     "vault" = "󰌾";
     "remote" = "󰢹";