From bae8a7b91256396446aa9e880b21954234143df4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 16 Jun 2024 06:34:50 +0100
Subject: [PATCH] Add sway/window to alt waybar config

Slightly change monitor config definition
---
 home/Northstar.nix                  |  8 +++-----
 home/Tone.nix                       |  8 +++-----
 home/Vanguard.nix                   | 16 +++++++++-------
 programs/desktop/waybar/default.nix |  2 --
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/home/Northstar.nix b/home/Northstar.nix
index 7898af7..fc30fd9 100644
--- a/home/Northstar.nix
+++ b/home/Northstar.nix
@@ -1,12 +1,10 @@
 {...}: {
   imports = [./default.nix];
-  wayland.windowManager.sway.config = let
-    defaultOutput = "eDP-1";
-  in {
-    output.${defaultOutput}.scale = "1.25";
+  wayland.windowManager.sway.config = {
+    output."eDP-1".scale = "1.25";
     workspaceOutputAssign = [
       {
-        output = defaultOutput;
+        output = "eDP-1";
         workspace = "1";
       }
     ];
diff --git a/home/Tone.nix b/home/Tone.nix
index a08f267..7fde6f2 100644
--- a/home/Tone.nix
+++ b/home/Tone.nix
@@ -1,12 +1,10 @@
 {...}: {
   imports = [./work.nix];
-  wayland.windowManager.sway.config = let
-    defaultOutput = "eDP-1";
-  in {
-    output.${defaultOutput}.scale = "1.25";
+  wayland.windowManager.sway.config = {
+    output."eDP-1".scale = "1.25";
     workspaceOutputAssign = [
       {
-        output = defaultOutput;
+        output = "eDP-1";
         workspace = "1";
       }
     ];
diff --git a/home/Vanguard.nix b/home/Vanguard.nix
index e638c0b..c786d7a 100644
--- a/home/Vanguard.nix
+++ b/home/Vanguard.nix
@@ -12,9 +12,7 @@
     freecad
     prusa-slicer
   ];
-  wayland.windowManager.sway.config = let
-    defaultOutput = "DP-2";
-  in {
+  wayland.windowManager.sway.config = {
     output = {
       "Acer Technologies ED270R TJMEE0043W01" = {
         mode = "1920x1080@165Hz";
@@ -28,21 +26,25 @@
     };
     workspaceOutputAssign = [
       {
-        output = defaultOutput;
+        output = "HDMI-A-1";
         workspace = "1";
       }
+      {
+        output = "DP-2";
+        workspace = "2";
+      }
     ];
     startup = [
-      {command = "${pkgs.xorg.xrandr}/bin/xrandr --output ${defaultOutput} --primary";}
+      {command = "${pkgs.xorg.xrandr}/bin/xrandr --output DP-2 --primary";}
     ];
   };
   programs.waybar.settings = {
     main.output = ["DP-2"];
     alt = {
-      inherit (config.programs.waybar.settings.main) layer position "sway/workspaces";
+      inherit (config.programs.waybar.settings.main) layer position "sway/workspaces" "sway/window" "clock";
       name = "alt";
       output = ["HDMI-A-1"];
-      "modules-left" = ["sway/workspaces"];
+      "modules-left" = ["sway/workspaces" "sway/window"];
       "modules-center" = [];
       "modules-right" = ["clock"];
     };
diff --git a/programs/desktop/waybar/default.nix b/programs/desktop/waybar/default.nix
index a2a4116..5baaa17 100644
--- a/programs/desktop/waybar/default.nix
+++ b/programs/desktop/waybar/default.nix
@@ -48,8 +48,6 @@
           default = "󰋙 ";
           urgent = "󰁡 ";
         };
-        # show-special = false;
-        # sort-by-number = true;
         all-outputs = false;
         persistent-workspaces = {
           "1" = [];