From 2e83f467388cccd0205680284332f2359790a7d5 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 2 Apr 2024 15:30:24 +0100
Subject: [PATCH] Change workspace 3 to be a music workspace

Remove workspace rule for libreoffice, add a rule for x2go and
nomachine
---
 home/hyprland/default.nix | 2 +-
 home/waybar/default.nix   | 2 +-
 hosts/Ronin/home.nix      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index fbb9bda5..96887e4f 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -198,9 +198,9 @@
       windowrule = [
         # Workspace binds
         "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
+        "workspace 6, (x2goclient|Nxplayer.bin)"
 
         # Float + move system windows
         "float, org.kde.polkit-kde-authentication-agent-1|Pinentry"
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 16eb701f..50f33e14 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -62,7 +62,7 @@
         format-icons = {
           "1" = "󰟀 ";
           "2" = "󰖟 ";
-          "3" = "󱧶 ";
+          "3" = "󰝚 ";
           "4" = "󰭻 ";
           "5" = "󰹁 ";
           "6" = "󰫃 ";
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index aca5f0c7..d5697eca 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -2,7 +2,7 @@
   imports = [../Scorch/home.nix];
   home.packages = [(pkgs.writeShellScriptBin "ukaea-vpn-connect" "sudo ${pkgs.openfortivpn}/bin/openfortivpn -c ${./ukaea-vpn.conf}")];
   wayland.windowManager.hyprland.settings = {
-    workspace = ["4, monitor:eDP-1, default:true"];
+    workspace = ["3, monitor:eDP-1, default:true"];
     monitor = ["eDP-1,1920x1080,2560x576,1.20"];
   };
 }