From 46e7277928ccdc7cfb9d2ee873e233be4fee144f Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 9 Oct 2023 12:23:38 +0100
Subject: [PATCH] Add calendar workspace for hyprland

Adjust some keybinds, update waybar to match new workspace
---
 home/hyprland/config.nix                      | 82 ++++++++++---------
 .../waybar/modules/hyprland_workspaces.nix    | 15 ++--
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index f70072c2..0db09df3 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -115,16 +115,17 @@ in ''
 
   # Common program shortcuts
   bind = SUPER, E, exec, emacsclient -c
-  bind = SUPER SHIFT, E, exec, [workspace 2 silent] emacsclient -c
   bind = SUPER, Space, exec, pkill anyrun || anyrun
   bind = SUPER, Return, exec, alacritty
   bind = SUPER SHIFT, Return, exec, [float] alacritty
 
+  bind = SUPER ALT, T, exec, [workspace 1] alacritty
   bind = SUPER ALT, W, exec, [workspace 3] firefox
-  bind = SUPER ALT, C, exec, [workspace 6] ferdium
-  bind = SUPER ALT, F, exec, [workspace 4] alacritty -e mc
-  bind = SUPER ALT, S, exec, [workspace 5] alacritty -e ncspot
-  bind = SUPER ALT, R, exec, [workspace 7] remmina
+  bind = SUPER ALT, A, exec, [workspace 4] alacritty -e khal interactive
+  bind = SUPER ALT, F, exec, [workspace 5] thunar
+  bind = SUPER ALT, S, exec, [workspace 6] alacritty -e ncspot
+  bind = SUPER ALT, C, exec, [workspace 7] ferdium
+  bind = SUPER ALT, R, exec, [workspace 8] remmina
 
   # Misc useful binds
   bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"
@@ -197,10 +198,10 @@ in ''
   windowrulev2 = float,class:(steam),title:(Steam Settings)
 
   # Workspace definitions
-  # 1: [a]ny
-  bind = SUPER, A, moveworkspacetomonitor, 1 current
-  bind = SUPER, A, workspace, 1
-  bind = SUPER SHIFT, A, movetoworkspace, 1
+  # 1: [t]erminal
+  bind = SUPER, T, moveworkspacetomonitor, 1 current
+  bind = SUPER, T, workspace, 1
+  bind = SUPER SHIFT, T, movetoworkspace, 1
 
   # 2: [d]ev
   bind = SUPER, D, moveworkspacetomonitor, 2 current
@@ -213,39 +214,44 @@ in ''
   bind = SUPER SHIFT, W, movetoworkspace, 3
   windowrule = workspace 3,(firefox)
 
-  # 4: [f]iles
-  bind = SUPER, F, moveworkspacetomonitor, 4 current
-  bind = SUPER, F, workspace, 4
-  bind = SUPER SHIFT, F, movetoworkspace, 4
-  windowrule = workspace 4,^(libreoffice).*
-  windowrulev2 = workspace 4,title:(Open),class:(soffice)
+  # 4: [a]genda (or c[a]lendar)
+  bind = SUPER, A, moveworkspacetomonitor, 4 current
+  bind = SUPER, A, workspace, 4
+  bind = SUPER SHIFT, A, movetoworkspace, 4
+  windowrulev2 = workspace 5,class:(Alacritty),title:(khal interactive)
 
-  # 5: [s]potify (or mu[s]ic)
-  bind = SUPER, S, moveworkspacetomonitor, 5 current
-  bind = SUPER, S, workspace, 5
-  bind = SUPER SHIFT, S, movetoworkspace, 5
-  windowrulev2 = workspace 5,class:(Alacritty),title:(ncspot)
+  # 5: [f]iles
+  bind = SUPER, F, moveworkspacetomonitor, 5 current
+  bind = SUPER, F, workspace, 5
+  bind = SUPER SHIFT, F, movetoworkspace, 5
+  windowrule = workspace 5,^(libreoffice).*
+  windowrulev2 = workspace 5,title:(Open),class:(soffice)
 
-  # 6: [c]hat
-  bind = SUPER, C, moveworkspacetomonitor, 6 current
-  bind = SUPER, C, workspace, 6
-  bind = SUPER SHIFT, C, movetoworkspace, 6
-  windowrule = workspace 6,(Signal)
-  windowrule = workspace 6,(fractal)
-  windowrule = workspace 6,(discord)
-  windowrule = workspace 6,(Ferdium)
+  # 6: [s]potify (or mu[s]ic)
+  bind = SUPER, S, moveworkspacetomonitor, 6 current
+  bind = SUPER, S, workspace, 6
+  bind = SUPER SHIFT, S, movetoworkspace, 6
+  windowrulev2 = workspace 6,class:(Alacritty),title:(ncspot)
 
-  # 7: [r]emote
-  bind = SUPER, R, moveworkspacetomonitor, 7 current
-  bind = SUPER, R, workspace, 7
-  bind = SUPER SHIFT, R, movetoworkspace, 7
-  windowrule = workspace 7,(org.remmina.Remmina)
+  # 7: [c]hat
+  bind = SUPER, C, moveworkspacetomonitor, 7 current
+  bind = SUPER, C, workspace, 7
+  bind = SUPER SHIFT, C, movetoworkspace, 7
+  windowrule = workspace 7,(Signal)
+  windowrule = workspace 7,(fractal)
+  windowrule = workspace 7,(Ferdium)
 
-  # 8: [g]aming
-  bind = SUPER, G, moveworkspacetomonitor, 8 current
-  bind = SUPER, G, workspace, 8
-  bind = SUPER SHIFT, G, movetoworkspace, 8
-  windowrule = workspace 8,(steam)
+  # 8: [r]emote
+  bind = SUPER, R, moveworkspacetomonitor, 8 current
+  bind = SUPER, R, workspace, 8
+  bind = SUPER SHIFT, R, movetoworkspace, 8
+  windowrule = workspace 8,(org.remmina.Remmina)
+
+  # 9: [g]aming
+  bind = SUPER, G, moveworkspacetomonitor, 9 current
+  bind = SUPER, G, workspace, 9
+  bind = SUPER SHIFT, G, movetoworkspace, 9
+  windowrule = workspace 9,(steam)
 
   # Special workspaces
   bind = SUPER, comma, workspace, m-1
diff --git a/home/hyprland/waybar/modules/hyprland_workspaces.nix b/home/hyprland/waybar/modules/hyprland_workspaces.nix
index de0f1cee..c5c24cf0 100644
--- a/home/hyprland/waybar/modules/hyprland_workspaces.nix
+++ b/home/hyprland/waybar/modules/hyprland_workspaces.nix
@@ -1,14 +1,15 @@
 {
   format = "{icon}";
   format-icons = {
-    "1" = "󰟀"; # [a]ny
+    "1" = "󰟀"; # [t]erminal
     "2" = "󰳼"; # [d]ev
-    "3" = "󰈹"; # [b]rowser
-    "4" = "󰝰"; # [f]iles
-    "5" = "󰓇"; # [s]potify (or mu[s]ic)
-    "6" = "󰭹"; # [c]hat
-    "7" = "󰢹"; # [r]emote
-    "8" = "󰓓"; # [g]aming
+    "3" = "󰖟"; # [b]rowser
+    "4" = "󰃭"; # [a]genda (or c[a]lendar)
+    "5" = "󰝰"; # [f]iles
+    "6" = "󰲸"; # [s]potify (or mu[s]ic)
+    "7" = "󰭹"; # [c]hat
+    "8" = "󰢹"; # [r]emote
+    "9" = "󰊗"; # [g]aming
     default = "󰛡";
     special = "󰓎";
     urgent = "󰣘";