From fd2217aba7a9442d2f43f08d0bcd634910ebaba6 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 1 Jan 2025 07:38:15 +0000
Subject: [PATCH] Add workspace monitor rules for Vanguard

Remove silent version of workspace rules

Ignore user units in waybar systemd-failed-units widget
---
 system/Vanguard.nix      | 23 +++++++++++++++++++----
 system/home/hyprland.nix |  3 +--
 system/home/waybar.nix   |  9 +++++----
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/system/Vanguard.nix b/system/Vanguard.nix
index 17191b36..84d18c3f 100644
--- a/system/Vanguard.nix
+++ b/system/Vanguard.nix
@@ -45,10 +45,25 @@
         input-overlay
       ];
     };
-    wayland.windowManager.hyprland.settings.monitor = [
-      "desc:Acer Technologies ED270R TJMEE0043W01,1920x1080@144,0x140,1.0,vrr,2"
-      "desc:Microstep MSI G27CQ4 E2,2560x1440@144,1920x0,1.25,vrr,2"
-    ];
+    wayland.windowManager.hyprland.settings =
+      let
+        primary = "Microstep MSI G27CQ4 E2";
+        secondary = "Acer Technologies ED270R TJMEE0043W01";
+      in
+      {
+        monitor = [
+          "desc:${primary},2560x1440@144,1920x0,1.25,vrr,2"
+          "desc:${secondary},1920x1080@144,0x140,1.0,vrr,2"
+        ];
+        workspace = [
+          "2, monitor:desc:${secondary}"
+          "3, monitor:desc:${secondary}"
+          "4, monitor:desc:${primary}"
+          "5, monitor:desc:${primary}"
+          "6, monitor:desc:${primary}"
+          "7, monitor:desc:${primary}"
+        ];
+      };
   };
   boot = {
     kernel.sysctl = {
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index b98e2679..a734aad5 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -268,8 +268,7 @@
         "workspace 4, (libreoffice|soffice)(.*)" # Documents
         "workspace 5, (org.remmina.Remmina|Nxplayer.bin)" # Remote Desktop
         "workspace 6, (PrusaSlicer)" # 3D Printing
-        "workspace 7, (steam_app|lutris|page.kramo.Cartridges|org.prismlauncher.PrismLauncher|gw2-64.exe|rsi launcher.exe)" # Gaming
-        "workspace 7 silent, (steam|explorer.exe)" # Gaming (Silent)
+        "workspace 7, (steam_app|steam|lutris|page.kramo.Cartridges|org.prismlauncher.PrismLauncher|explorer.exe|gw2-64.exe|rsi launcher.exe)" # Gaming
 
         # PrismLauncher / Minecraft
         "float, org.prismlauncher.PrismLauncher"
diff --git a/system/home/waybar.nix b/system/home/waybar.nix
index 2720d25a..bcab2779 100644
--- a/system/home/waybar.nix
+++ b/system/home/waybar.nix
@@ -105,7 +105,10 @@
           "paused" = "󰏤";
           "stopped" = "󰓛";
         };
-        "ignored-players" = [ "firefox" ];
+        "ignored-players" = [
+          "com"
+          "firefox"
+        ];
       };
       pulseaudio = {
         scroll-step = 5;
@@ -233,10 +236,8 @@
       "systemd-failed-units" = {
         hide-on-ok = true;
         format = "󰀦";
-        tooltip = true;
-        tooltip-format = "System failed:{nr_failed_system}\nUser failed:{nr_failed_user}";
         system = true;
-        user = true;
+        user = false;
       };
       "custom/notification" =
         let