From 7af353e182d92234d0eb07d50e9ac368bc2fcfb1 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Thu, 28 Mar 2024 09:06:04 +0000
Subject: [PATCH] Reduce to 5 main and 5 backup workspaces

Removed email workspace
---
 home/hyprland/default.nix |  7 ++++---
 home/waybar/default.nix   | 17 +++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 7b8e3c5e..71dd0249 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -189,10 +189,11 @@
         ++ (lib.lists.forEach layers ignorealpha);
       windowrule = [
         # Workspace binds
-        "workspace 2, (libreoffice|soffice|com.obsproject.Studio)(.*)"
+        "workspace 1, com.obsproject.Studio"
+        "workspace 2, (libreoffice|soffice)(.*)"
         "workspace 3, (WebCord|signal|whatsapp-for-linux|teams-for-linux)"
-        "workspace 5, (x2goclient|Nxplayer.bin)"
-        "workspace 6 silent, (steam|org.prismlauncher.PrismLauncher)" # Keep silent to avoid popups taking focus
+        "workspace 4, (x2goclient|Nxplayer.bin)"
+        "workspace 5 silent, (steam|org.prismlauncher.PrismLauncher)" # Keep silent to avoid popups taking focus
 
         # Float + move system windows
         "float, org.kde.polkit-kde-authentication-agent-1|Pinentry"
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 2274e1e9..a43d7b19 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -60,15 +60,13 @@
           "1" = "󰟀 ";
           "2" = "󱧶 ";
           "3" = "󰭻 ";
-          "4" = "󰇮 ";
-          "5" = "󰢹 ";
-          "6" = "󰊗 ";
-          "7" = "󰫃 ";
-          "8" = "󰫄 ";
-          "9" = "󰫅 ";
-          "10" = "󰫆 ";
-          "11" = "󰫇 ";
-          "12" = "󰫈 ";
+          "4" = "󰢹 ";
+          "5" = "󰹁 ";
+          "6" = "󰫃 ";
+          "7" = "󰫄 ";
+          "8" = "󰫅 ";
+          "9" = "󰫆 ";
+          "10" = "󰫇 ";
           default = "󰫈 ";
           urgent = "󰁡 ";
         };
@@ -79,7 +77,6 @@
           "3" = [];
           "4" = [];
           "5" = [];
-          "6" = [];
         };
       };
       mpris = {