From 47fa0b2761068c548090626be3620c552d5907fb Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 31 May 2024 09:33:10 +0100
Subject: [PATCH] Add remmina with window rules

Add sway/window to waybar (left slot)
---
 home/default.nix                    | 1 +
 programs/desktop/sway/default.nix   | 3 ++-
 programs/desktop/waybar/default.nix | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 6abb775..5d87a0b 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -104,6 +104,7 @@
       evince
       libreoffice-fresh
       inkscape
+      remmina
       webcord
       signal-desktop
       whatsapp-for-linux
diff --git a/programs/desktop/sway/default.nix b/programs/desktop/sway/default.nix
index 4b6c35a..9754c63 100644
--- a/programs/desktop/sway/default.nix
+++ b/programs/desktop/sway/default.nix
@@ -102,8 +102,9 @@
               {app_id = "whatsapp-for-linux";}
               {app_id = "teams-for-linux";}
               {app_id = "twinkle";}
-              {class = "Nxplayer\.bin";}
+              {app_id = "org\.remmina\.Remmina";}
               {app_id = "Nxplayer\.bin";}
+              {class = "Nxplayer\.bin";}
             ])
           ++ [];
       };
diff --git a/programs/desktop/waybar/default.nix b/programs/desktop/waybar/default.nix
index 3020991..350bfd3 100644
--- a/programs/desktop/waybar/default.nix
+++ b/programs/desktop/waybar/default.nix
@@ -25,11 +25,11 @@
         # Layout
         "modules-left" = [
           "sway/workspaces"
+          "sway/window"
         ];
-        "modules-center" = [
-          "mpris"
-        ];
+        "modules-center" = [];
         "modules-right" = [
+          "mpris"
           "custom/notification"
           "pulseaudio"
           "network"
@@ -71,7 +71,7 @@
           "max-length" = 50;
           "rewrite" = {
             "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
-            "(Alacritty.*)" = "  $1";
+            "(foot.*)" = "  $1";
             "(.*) - mpv" = "󰦟  $1";
             "swayimg: (.*)" = "󰋩  $1";
             "(btm)" = "  Resource Usage [$1]";