From 2f05e76f7fd30ae1a89107d754716e0b0b1c29ae Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 28 Jul 2023 08:01:09 +0100
Subject: [PATCH] Update keybinds and waybar icon style

---
 home/hyprland/hyprland.conf                   | 20 +++++++++----------
 .../waybar/modules/wlr_workspaces.nix         |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf
index 44133a19..55a0d3f9 100644
--- a/home/hyprland/hyprland.conf
+++ b/home/hyprland/hyprland.conf
@@ -105,15 +105,15 @@ bind = SUPER SHIFT, K, movewindow, u
 bind = SUPER SHIFT, J, movewindow, d
 
 # 1: home
-bind = SUPER, A, workspace, 1
-bind = SUPER SHIFT, A, moveworkspacetomonitor, 1 current
+bind = SUPER, A, moveworkspacetomonitor, 1 current
+bind = SUPER, A, movetoworkspace, 1
 bind = SUPER SHIFT, A, workspace, 1
 windowrule = workspace 1,^(steam).*
 windowrule = workspace 1,(.gamescope-wrapped)
 
 # 2: browser
-bind = SUPER, W, workspace, 2
-bind = SUPER SHIFT, W, moveworkspacetomonitor, 2 current
+bind = SUPER, W, moveworkspacetomonitor, 2 current
+bind = SUPER, W, movetoworkspace, 2
 bind = SUPER SHIFT, W, workspace, 2
 windowrule = workspace 2,(firefox)
 windowrule = workspace 2,(chromium-browser)
@@ -122,26 +122,26 @@ windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox)
 windowrulev2 = float,title:^(about:blank).*,class:(chromium-browser)
 
 # 3: files
+bind = SUPER, F, moveworkspacetomonitor, 3 current
 bind = SUPER, F, workspace, 3
-bind = SUPER SHIFT, F, moveworkspacetomonitor, 3 current
-bind = SUPER SHIFT, F, workspace, 3
+bind = SUPER SHIFT, F, movetoworkspace, 3
 windowrule = workspace 3,^(libreoffice).*
 windowrule = workspace 3,(Zotero)
 windowrulev2 = workspace 3,title:(Open),class:(soffice)
 windowrulev2 = float,title:(Open),class:(soffice)
 
 # 4: chat
+bind = SUPER, C, moveworkspacetomonitor, 4 current
 bind = SUPER, C, workspace, 4
-bind = SUPER SHIFT, C, moveworkspacetomonitor, 4 current
-bind = SUPER SHIFT, C, workspace, 4
+bind = SUPER SHIFT, C, movetoworkspace, 4
 windowrule = workspace 4,(Signal)
 windowrule = workspace 4,(fractal)
 windowrule = workspace 4,(discord)
 
 # 5: remote
+bind = SUPER, R, moveworkspacetomonitor, 5 current
 bind = SUPER, R, workspace, 5
-bind = SUPER SHIFT, R, moveworkspacetomonitor, 5 current
-bind = SUPER SHIFT, R, workspace, 5
+bind = SUPER SHIFT, R, movetoworkspace, 5
 windowrule = workspace 5,(Nxplayer.bin)
 windowrule = float,(Nxplayer.bin)
 windowrule = center,(Nxplayer.bin)
diff --git a/home/hyprland/waybar/modules/wlr_workspaces.nix b/home/hyprland/waybar/modules/wlr_workspaces.nix
index 49b32eee..249f08a7 100644
--- a/home/hyprland/waybar/modules/wlr_workspaces.nix
+++ b/home/hyprland/waybar/modules/wlr_workspaces.nix
@@ -2,7 +2,7 @@
   on-click = "activate";
   disable-scroll = true;
   all-outputs = false;
-  format = "{name}:{icon}";
+  format = "{icon}";
   format-icons = {
     "1" = "󰟀";
     "2" = "󰖟";