2 files changed, 29 insertions, 94 deletions
diff --git a/common/home/programs/waybar/default.nix b/common/home/programs/waybar/default.nix
index 5cdf011..8415b02 100644
--- a/common/home/programs/waybar/default.nix
+++ b/common/home/programs/waybar/default.nix
@@ -9,52 +9,19 @@
 			height = 20;
 			outputs = "*";
 			spacing = 0;
-			modules-left = [ "hyprland/workspaces" ];
-			modules-center = [ ];
-			modules-right = [
+			modules-left = [
 				"pulseaudio"
 				"bluetooth"
 				"hyprland/language"
 				"battery"
+			];
+			modules-center = [
+				"clock"
+			];
+			modules-right = [
 				"tray"
 			];
 
-			"hyprland/workspaces" = {
-				format = "{icon}";
-				format-icons = {
-					"1" =  "α";
-					"2" =  "β";
-					"3" =  "γ";
-					"4" =  "δ";
-					"5" =  "ε";
-					"6" =  "ζ";
-					"7" =  "η";
-					"8" =  "θ";
-					"9" =  "ι";
-					"10" = "κ";
-					"11" = "α";
-					"12" = "β";
-					"13" = "γ";
-					"14" = "δ";
-					"15" = "ε";
-					"16" = "ζ";
-					"17" = "η";
-					"18" = "θ";
-					"19" = "ι";
-					"20" = "κ";
-					"21" = "α";
-					"22" = "β";
-					"23" = "γ";
-					"24" = "δ";
-					"25" = "ε";
-					"26" = "ζ";
-					"27" = "η";
-					"28" = "θ";
-					"29" = "ι";
-					"30" = "κ";
-				};
-				all-outputs = false;
-			};
 
 			"hyprland/window" = {
 				separate-outputs = true;
diff --git a/common/home/programs/waybar/style.css b/common/home/programs/waybar/style.css
index de8f3d4..1d646c0 100644
--- a/common/home/programs/waybar/style.css
+++ b/common/home/programs/waybar/style.css
@@ -7,57 +7,19 @@ window {
 	color: #ebdbb2;
 }
 
-#language {
+#language,
+#pulseaudio,
+#bluetooth,
+#battery,
+#clock {
 	font-size: 12px;
-	padding-right: 10px;
-}
-
-#pulseaudio {
-	font-size: 12px;
-}
-
-#bluetooth {
-	padding-left: 10px;
-	padding-right: 10px;
-	font-size: 12px;
-}
-
-#workspaces  {
-	padding: 5px;
-	background: #252525;
-	border-radius: 5px;
-}
-
-#workspaces button {
-	padding: 0px;
-	border-radius: 3px;
-	min-width: 20px;
-	min-height: 20px;
-	border: none;
-	font-size: 12px;
-}
-
-#workspaces button.active {
-	background: #504945;
-}
-
-#workspaces button:hover {
-	background: #3c3836;
-	padding: 0px;
-	border: none;
-}
-
-#workspaces button.active:hover {
-	background: #504945;
-	padding: 0px;
+	margin-left: 5px;
+	margin-right: 5px;
 }
 
 #battery {
 	background: #458588;
 	color: #282828;
-	margin-right: 5px;
-	padding-left: 5px;
-	padding-right: 5px;
 }
 
 #battery.charging {
@@ -72,17 +34,23 @@ window {
 	background: #fb4934;
 }
 
-.modules-left {
-	margin: 5px;
-	margin-bottom: 0px;
-	border-radius: 5px;
+.modules-center, .modules-right, .modules-left {
+	padding: 5px;
+	margin: 0px;
+	background: #3c3836;
+}
+
+.modules-center {
+	border-bottom-left-radius: 5px;
+	border-bottom-right-radius: 5px;
 }
 
 .modules-right {
-	padding-left: 10px;
-	padding-right: 10px;
-	background: #3c3836;
-	border-radius: 5px;
-	margin: 5px;
-	margin-bottom: 0px;
+	border-bottom-left-radius: 5px;
+	padding-right: 8px;
+	padding-left: 8px;
+}
+
+.modules-left {
+	border-bottom-right-radius: 5px;
 }