From 6c9a91ded9886a965b249cbc6b6d76f4a8539d8e Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 31 Mar 2024 08:23:29 +0100
Subject: [PATCH] Remove remote workspace, replace with web browser workspace

Move waybar window and MPRIS modules to centre

Change Vanguard window rules to workspace rules to bind to specific
monitors
---
 home/hyprland/default.nix |  6 +++---
 home/waybar/default.nix   | 11 ++++++-----
 hosts/Vanguard/home.nix   | 10 ++++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index fb96b9a1..7bfa6b52 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -189,9 +189,9 @@
         ++ (lib.lists.forEach layers ignorealpha);
       windowrule = [
         # Workspace binds
-        "workspace 2, (libreoffice|soffice)(.*)"
-        "workspace 3, (com.obsproject.Studio|WebCord|signal|whatsapp-for-linux|teams-for-linux)"
-        "workspace 4, (x2goclient|Nxplayer.bin)"
+        "workspace 2, firefox"
+        "workspace 3, (libreoffice|soffice)(.*)"
+        "workspace 4, (com.obsproject.Studio|WebCord|signal|whatsapp-for-linux|teams-for-linux)"
         "workspace 5 silent, (steam|org.prismlauncher.PrismLauncher)" # Keep silent to avoid popups taking focus
 
         # Float + move system windows
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index f878c64e..f306c06a 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -16,10 +16,11 @@
       # Layout
       "modules-left" = [
         "hyprland/workspaces"
+      ];
+      "modules-center" = [
         "hyprland/window"
         "mpris"
       ];
-      "modules-center" = [];
       "modules-right" = [
         "custom/notification"
         "pulseaudio"
@@ -58,9 +59,9 @@
         format = "{icon}";
         format-icons = {
           "1" = "󰟀 ";
-          "2" = "󱧶 ";
-          "3" = "󰭻 ";
-          "4" = "󰢹 ";
+          "2" = "󰖟 ";
+          "3" = "󱧶 ";
+          "4" = "󰭻 ";
           "5" = "󰹁 ";
           "6" = "󰫃 ";
           "7" = "󰫄 ";
@@ -82,7 +83,7 @@
         };
       };
       mpris = {
-        "format" = "| {player_icon} {status_icon} {artist} - {title}";
+        "format" = "{player_icon} {status_icon} {artist} - {title}";
         "tooltip-format" = "{player_icon} ({player}) {dynamic}";
         "title-len" = 48;
         "interval" = 1;
diff --git a/hosts/Vanguard/home.nix b/hosts/Vanguard/home.nix
index 5f95b2f6..de2d1740 100644
--- a/hosts/Vanguard/home.nix
+++ b/hosts/Vanguard/home.nix
@@ -1,9 +1,11 @@
 {...}: {
   wayland.windowManager.hyprland.settings = {
-    windowrule = [
-      "monitor HDMI-A-2, (signal|whatsapp-for-linux|teams-for-linux)"
-      "monitor DP-1, steam"
-      "monitor HDMI-A-2, (WebCord|com.obsproject.Studio)"
+    workspace = [
+      "1, monitor:desc:Acer Technologies ED270R TJMEE0043W01, default:true"
+      "2, monitor:desc:Ancor Communications Inc VS278 FALMQS032358, default:true"
+      "3, monitor:desc:Acer Technologies ED270R TJMEE0043W01"
+      "4, monitor:desc:Ancor Communications Inc VS278 FALMQS032358"
+      "5, monitor:desc:Acer Technologies ED270R TJMEE0043W01"
     ];
     monitor = [
       "desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1.00,vrr,2"