From 066464265e3201e0b1ddbd94a2f80a9d4d410ce1 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 7 Jun 2023 17:35:50 +0100
Subject: [PATCH] Use microsoft-edge on work machine, update hyprland
 accordingly

---
 home/H0615/elitherl.nix       | 17 ++++++++++++++---
 home/H0615/hypr/hyprland.conf |  9 +++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/home/H0615/elitherl.nix b/home/H0615/elitherl.nix
index 59464e7a..074aa22f 100644
--- a/home/H0615/elitherl.nix
+++ b/home/H0615/elitherl.nix
@@ -1,8 +1,9 @@
-{...}: {
+{pkgs, ...}: {
   imports = [../work.nix ../desktop/hyprland.nix];
   home.username = "elitherl";
   home.homeDirectory = "/home/elitherl";
   home.stateVersion = "22.11";
+  home.packages = [pkgs.microsoft-edge];
 
   programs.fish.functions.nvsync = ''
     rsync -avz --filter=':- .gitignore' --exclude='.git*'\
@@ -36,7 +37,12 @@
           "battery#bat2"
           "tray"
         ];
-        "wlr/workspaces" = {"format-icons" = {"5" = "󰒍";};};
+        "wlr/workspaces" = {
+          "format-icons" = {
+            "2" = "󰇩";
+            "5" = "󰒍";
+          };
+        };
       };
       alt = {
         "include" = [
@@ -47,7 +53,12 @@
         "modules-left" = [];
         "modules-center" = ["wlr/workspaces"];
         "modules-right" = [];
-        "wlr/workspaces" = {"format-icons" = {"5" = "󰒍";};};
+        "wlr/workspaces" = {
+          "format-icons" = {
+            "2" = "󰇩";
+            "5" = "󰒍";
+          };
+        };
       };
     };
   };
diff --git a/home/H0615/hypr/hyprland.conf b/home/H0615/hypr/hyprland.conf
index fd369f7c..2d77b759 100644
--- a/home/H0615/hypr/hyprland.conf
+++ b/home/H0615/hypr/hyprland.conf
@@ -4,18 +4,19 @@ monitor=HDMI-A-1,preferred,auto,auto
 monitor=DP-1,preferred,auto,auto,transform,1
 
 windowrule = float, title:^([Zz]oom).*$
+windowrule = float, ^(Nxplayer.bin)$
 windowrule = center, title:^([Zz]oom).*$
-windowrule = workspace 4 silent, ^(Microsoft Teams - Preview)$
+windowrule = workspace 2 silent, ^(Microsoft-edge)$
 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
+exec-once = microsoft-edge