From 6cd8d278b4834f6aad7ab52bf2ce2880a4d9ab47 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 26 Sep 2023 11:34:32 +0100
Subject: [PATCH] Remove teams-for-linux, move nomachine rules to main config

---
 home/hyprland/config.nix |  7 +++----
 hosts/Ronin/home.nix     | 13 +------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index c6ff412c..c6974c1b 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -153,19 +153,18 @@ in ''
   windowrule = center,(Pinentry)
   windowrule = float,(thunar)
   windowrule = center,(thunar)
-  windowrule = nofullscreenrequest,(org.remmina.Remmina)
-  windowrule = nomaximizerequest,(org.remmina.Remmina)
   windowrule = float,(wlogout)
   windowrule = size 80% 80%,(wlogout)
   windowrule = center,(wlogout)
   windowrule = nofullscreenrequest,(wlogout)
   windowrule = nomaximizerequest,(wlogout)
+  windowrule = nofullscreenrequest,(Nxplayer.bin)
+  windowrule = nomaximizerequest,(Nxplayer.bin)
   windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox)
   windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox)
   windowrulev2 = workspace special silent, title:^(Firefox — Sharing Indicator)$
   windowrulev2 = workspace special silent, title:^(.*is sharing (your screen|a window)\.)$
   windowrulev2 = float,title:(Open),class:(soffice)
-  windowrulev2 = float,class:(org.remmina.Remmina),title:^(Remmina Remote Desktop Client)$
   windowrulev2 = float,class:(steam),title:(Friends List)
   windowrulev2 = float,class:(steam),title:(Steam Settings)
 
@@ -217,7 +216,7 @@ in ''
   bind = SUPER, R, moveworkspacetomonitor, 8 current
   bind = SUPER, R, workspace, 8
   bind = SUPER SHIFT, R, movetoworkspace, 8
-  windowrule = workspace 8,(org.remmina.Remmina)
+  windowrule = workspace 8,(Nxplayer.bin)
 
   # 9: [g]aming
   bind = SUPER, G, moveworkspacetomonitor, 9 current
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index 6c29ef85..d3ee97ff 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -1,12 +1,7 @@
 { config, pkgs, lib, user, ... }:
 
 {
-  home.packages = with pkgs; [
-    davmail
-    openfortivpn
-    nomachine-client
-    teams-for-linux
-  ];
+  home.packages = with pkgs; [ davmail openfortivpn nomachine-client ];
   programs = {
     git.userEmail = "evie.litherland-smith@ukaea.uk";
     ssh.matchBlocks = {
@@ -123,15 +118,9 @@
     monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1
     monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,0x0,1
 
-    windowrule = nofullscreenrequest,(Nxplayer.bin)
-    windowrule = nomaximizerequest,(Nxplayer.bin)
     windowrulev2 = nofullscreenrequest,title:(Zoom|zoom)
     windowrulev2 = nomaximizerequest,title:(Zoom|zoom)
 
-    windowrule = workspace 6,(teams-for-linux)
-    windowrulev2 = workspace 7,title:(Zoom|zoom)
-    windowrule = workspace 8,(Nxplayer.bin)
-
     exec-once = ${pkgs.davmail}/bin/davmail -notray
   '';
 }