From 9682d09156409a28cda391e7a0e0e6a58bd2f6b6 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 5 Jun 2023 17:12:26 +0100
Subject: [PATCH] Add machine specific waybar ws icons and hyprland window
 rules

---
 home/H0615/elitherl.nix                    |  2 ++
 home/H0615/hypr/hyprland.conf              | 15 +++++++++++++--
 home/Vanguard/hypr/hyprland.conf           |  4 ++++
 home/Vanguard/xenia.nix                    |  1 +
 home/desktop/config/hypr/window-rules.conf | 21 ++++-----------------
 home/desktop/config/waybar/modules.json    | 12 ++++--------
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/home/H0615/elitherl.nix b/home/H0615/elitherl.nix
index 5b5fe52f..70315451 100644
--- a/home/H0615/elitherl.nix
+++ b/home/H0615/elitherl.nix
@@ -28,6 +28,7 @@
           "battery#bat2"
           "tray"
         ];
+        "wlr/workspaces" = {"format-icons" = {"5" = "󰒍";};};
       };
       alt = {
         "include" = [
@@ -38,6 +39,7 @@
         "modules-left" = [];
         "modules-center" = ["wlr/workspaces"];
         "modules-right" = [];
+        "wlr/workspaces" = {"format-icons" = {"5" = "󰒍";};};
       };
     };
   };
diff --git a/home/H0615/hypr/hyprland.conf b/home/H0615/hypr/hyprland.conf
index 9e6c38a2..fd369f7c 100644
--- a/home/H0615/hypr/hyprland.conf
+++ b/home/H0615/hypr/hyprland.conf
@@ -1,10 +1,21 @@
 source=./common.conf
+
 monitor=HDMI-A-1,preferred,auto,auto
 monitor=DP-1,preferred,auto,auto,transform,1
+
+windowrule = float, title:^([Zz]oom).*$
+windowrule = center, title:^([Zz]oom).*$
+windowrule = workspace 4 silent, ^(Microsoft Teams - Preview)$
+windowrule = workspace 4, title:^([Zz]oom).*$
+windowrule = workspace 5 silent, ^(Nxplayer.bin)$
+
+windowrule = monitor 1, ^(Microsoft Teams - Preview)$
+windowrule = monitor 1, title:^(Zoom)(.*)$
+windowrule = monitor 1, ^(Nxplayer.bin)$
+
 wsbind=1,HDMI-A-1
 wsbind=2,HDMI-A-1
-wsbind=3,HDMI-A-1
-wsbind=4,HDMI-A-1
 wsbind=5,HDMI-A-1
+
 exec-once = firefox
 exec-once = teams
diff --git a/home/Vanguard/hypr/hyprland.conf b/home/Vanguard/hypr/hyprland.conf
index 6c5c287c..ea8a70c4 100644
--- a/home/Vanguard/hypr/hyprland.conf
+++ b/home/Vanguard/hypr/hyprland.conf
@@ -4,4 +4,8 @@ misc {
 }
 monitor=DP-2,highrr,auto,1
 
+windowrule = workspace 4 silent, ^(discord)$
+windowrule = workspace 5 silent, ^(Steam|steamwebhelper)$
+windowrule = monitor 1, ^(Steam|steamwebhelper)$
+
 exec-once = steam
diff --git a/home/Vanguard/xenia.nix b/home/Vanguard/xenia.nix
index 11f62269..2aa90adf 100644
--- a/home/Vanguard/xenia.nix
+++ b/home/Vanguard/xenia.nix
@@ -29,6 +29,7 @@
           "battery#bat2"
           "tray"
         ];
+        "wlr/workspaces" = {"format-icons" = {"5" = "󰓓";};};
       };
     };
   };
diff --git a/home/desktop/config/hypr/window-rules.conf b/home/desktop/config/hypr/window-rules.conf
index b971daf8..7bde393a 100644
--- a/home/desktop/config/hypr/window-rules.conf
+++ b/home/desktop/config/hypr/window-rules.conf
@@ -1,29 +1,16 @@
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 windowrule = float, ^(foot)$
-windowrule = float, ^(thunar)$
 windowrule = float, ^(pavucontrol)$
 windowrule = float, ^(.blueman-manager-wrapped)$
 windowrule = float, ^(otpclient)$
-windowrule = float, title:^([Zz]oom)(.*)$
 
 windowrule = center, ^(foot)$
-windowrule = center, ^(thunar)$
 windowrule = center, ^(pavucontrol)$
 windowrule = center, ^(.blueman-manager-wrapped)$
 windowrule = move 2% 6%, ^(otpclient)$
-windowrule = center, title:^([Zz]oom)(.*)$
 
-windowrule = workspace 1, ^(VSCodium)$
-windowrule = workspace 2, ^(firefox|librewolf)$
-windowrule = workspace 3 silent, ^(Element|Signal|discord|Microsoft Teams - Preview)$
-windowrule = workspace 3, title:^([Zz]oom)(.*)$
-windowrule = workspace 4 silent, ^(org.qbittorrent.qBittorrent)$
-windowrule = workspace 4 silent, ^(Nxplayer.bin)$
-windowrule = workspace 5 silent, ^(Steam|steamwebhelper)$
+windowrule = workspace 2 silent, ^(firefox)$
+windowrule = workspace 3 silent, ^(thunar|libreoffice).*$
+windowrule = workspace 4 silent, ^(Element|Signal|discord)$
 
-windowrule = monitor 1, ^(VSCodium)$
-windowrule = monitor 1, ^(firefox|librewolf)$
-windowrule = monitor 1, ^(Microsoft Teams - Preview)$
-windowrule = monitor 1, title:^(Zoom)(.*)$
-windowrule = monitor 1, ^(Steam|steamwebhelper)$
-windowrule = monitor 1, ^(Nxplayer.bin)$
+windowrule = monitor 1, ^(firefox)$
diff --git a/home/desktop/config/waybar/modules.json b/home/desktop/config/waybar/modules.json
index d6447689..19d3e112 100644
--- a/home/desktop/config/waybar/modules.json
+++ b/home/desktop/config/waybar/modules.json
@@ -148,9 +148,8 @@
         "format-icons": {
             "1": "󰅴",
             "2": "󰈹",
-            "3": "󰻞",
-            "4": "󰒍",
-            "5": "󰓓",
+            "3": "󰷏",
+            "4": "󰻞",
             "urgent": "",
             "focused": "",
             "default": ""
@@ -160,7 +159,6 @@
             "2": [],
             "3": [],
             "4": [],
-            "5": []
         }
     },
     "sway/workspaces": {
@@ -172,9 +170,8 @@
         "format-icons": {
             "1": "󰅴",
             "2": "󰈹",
-            "3": "󰻞",
-            "4": "󰒍",
-            "5": "󰓓",
+            "3": "󰷏",
+            "4": "󰻞",
             "urgent": "",
             "focused": "",
             "default": ""
@@ -184,7 +181,6 @@
             "2": [],
             "3": [],
             "4": [],
-            "5": []
         }
     }
 }