From e383b075e9d49de7594df20d2f53815d0eac4996 Mon Sep 17 00:00:00 2001
From: Nickiel12 <nicholasyoungsumner@gmail.com>
Date: Fri, 17 Nov 2023 12:15:09 -0800
Subject: [PATCH] swapped workspaces to work with ewwtilities update

---
 modules/ewwbar/eww-config/status_bars.yuck | 23 +++++++++++-----------
 modules/hyprland/displays.nix              | 18 ++++++++---------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/modules/ewwbar/eww-config/status_bars.yuck b/modules/ewwbar/eww-config/status_bars.yuck
index 186f9ce..5ea14a6 100644
--- a/modules/ewwbar/eww-config/status_bars.yuck
+++ b/modules/ewwbar/eww-config/status_bars.yuck
@@ -58,20 +58,18 @@
 		:spacing "12"
 		:css "* {margin-left: 20px; margin-right: 20px;}"
 		(box
-			:class {current-idx == "1" ? "active-workspace" : "regular"}
+			:class {current-idx == "2" ? "active-workspace" : "regular"}
 			(label :text ""))
 		(box
-			:class {current-idx == "3" ? "active-workspace" : "regular"}
+			:class {current-idx == "4" ? "active-workspace" : "regular"}
 			(label :text ""))
 		(box
-			:class {current-idx == "5" ? "active-workspace" : "regular"}
+			:class {current-idx == "6" ? "active-workspace" : "regular"}
 			(label :text ""))
 		(box
-			:class {current-idx == "7" ? "active-workspace" : "regular"}
+			:class {current-idx == "8" ? "active-workspace" : "regular"}
 			(label :text ""))
-		(box
-			:class {current-idx == "9" ? "active-workspace" : "regular"}
-			(label :text ""))))
+			))
 
 (defwidget bar_right []
   (centerbox :orientation "h"
@@ -89,16 +87,19 @@
 		:spacing "12"
 		:css "* {margin-left: 20px; margin-right: 20px;}"
 		(box
-			:class {current-idx == "2" ? "active-workspace" : "regular"}
+			:class {current-idx == "1" ? "active-workspace" : "regular"}
 			(label :text ""))
 		(box
-			:class {current-idx == "4" ? "active-workspace" : "regular"}
+			:class {current-idx == "3" ? "active-workspace" : "regular"}
 			(label :text ""))
 		(box
-			:class {current-idx == "6" ? "active-workspace" : "regular"}
+			:class {current-idx == "5" ? "active-workspace" : "regular"}
 			(label :text ""))
 		(box
-			:class {current-idx == "8" ? "active-workspace" : "regular"}
+			:class {current-idx == "7" ? "active-workspace" : "regular"}
+			(label :text ""))
+		(box
+			:class {current-idx == "9" ? "active-workspace" : "regular"}
 			(label :text ""))))
 
 (defwindow full_screen_bar
diff --git a/modules/hyprland/displays.nix b/modules/hyprland/displays.nix
index b4412bd..aa9a59a 100644
--- a/modules/hyprland/displays.nix
+++ b/modules/hyprland/displays.nix
@@ -15,16 +15,16 @@ in
     ];
 
     workspace = if (hostname == "NicksNixDesktop") then [
-      "2,monitor:DP-3,default:true"
-      "4,monitor:DP-3"
-      "6,monitor:DP-3"
-      "8,monitor:DP-3"
-
-      "1,monitor:DP-2,default:true"
-      "3,monitor:DP-2"
-      "5,monitor:DP-2"
-      "7,monitor:DP-2"
+      "1,monitor:DP-3,default:true"
+      "3,monitor:DP-3"
+      "5,monitor:DP-3"
+      "7,monitor:DP-3"
       "9,monitor:DP-2"
+
+      "2,monitor:DP-2,default:true"
+      "4,monitor:DP-2"
+      "6,monitor:DP-2"
+      "8,monitor:DP-2"
     ] else [
 
     ];