From e74ec8a593a11d6fe146a474ab4d058caca3c2f6 Mon Sep 17 00:00:00 2001
From: Veneficium <85629831+veneficium42@users.noreply.github.com>
Date: Mon, 23 Dec 2024 12:31:36 +0100
Subject: [PATCH] waybar: simplify style

---
 homeManagerModules/niri/waybar.css  | 70 +++++++----------------------
 homeManagerModules/niri/waybar.json | 40 +++--------------
 2 files changed, 24 insertions(+), 86 deletions(-)

diff --git a/homeManagerModules/niri/waybar.css b/homeManagerModules/niri/waybar.css
index f19dc40..c37a4da 100644
--- a/homeManagerModules/niri/waybar.css
+++ b/homeManagerModules/niri/waybar.css
@@ -1,88 +1,52 @@
-* {
-	font-size: 20px;
-	font-family: monospace;
-}
-
 window#waybar {
-	background-color: transparent;
+	background: transparent;
 	color: #fdf6e3;
 	padding: 1px 0;
 	min-height: 25px;
-}
-
-.modules-right {
-    margin: 2px 10px 0 0;
-}
-.modules-center {
-    margin: 2px 0 0 0;
-}
-.modules-left {
-    margin: 2px 0 0 5px;
-}
-
-#custom-right-arrow-dark,
-#custom-left-arrow-dark {
-	color: #1a1a1a;
 	font-size: 23px;
 }
 
-#workspaces,
-#clock.1,
-#clock.2,
-#clock.3,
-#pulseaudio,
-#memory,
-#cpu,
-#battery,
-#disk,
-#tray {
-	background: #1a1a1a;
+.modules-right {
+	margin: 2px 10px 0 0;
+}
+
+.modules-center {
+	margin: 2px 0 0 0;
+}
+
+.modules-left {
+	margin: 2px 0 0 5px;
 }
 
 #workspaces button {
 	padding: 0 2px;
 	color: #fdf6e3;
 }
-#workspaces button.focused {
-	color: #268bd2;
-}
-#workspaces button:hover {
-	box-shadow: inherit;
-	text-shadow: inherit;
-}
-#workspaces button:hover {
-	background: #1a1a1a;
-	border: #1a1a1a;
-	padding: 0 3px;
-}
 
 #pulseaudio {
 	color: #268bd2;
 }
+
 #memory {
 	color: #2aa198;
 }
+
 #cpu {
 	color: #6c71c4;
 }
+
 #battery {
 	color: #859900;
 }
+
 #battery.warning {
 	color: #d08535;
 }
+
 #battery.critical {
 	color: #ca4238;
 }
+
 #disk {
 	color: #b58900;
-}
-
-#clock,
-#pulseaudio,
-#memory,
-#cpu,
-#battery,
-#disk {
-	padding: 0 10px;
 }
\ No newline at end of file
diff --git a/homeManagerModules/niri/waybar.json b/homeManagerModules/niri/waybar.json
index fae8528..4e63381 100644
--- a/homeManagerModules/niri/waybar.json
+++ b/homeManagerModules/niri/waybar.json
@@ -1,52 +1,27 @@
 {
 	"layer": "top",
 	"position": "top",
-
+	"spacing": 10,
 	"modules-left": [
-		"custom/left-arrow-dark",
-		"niri/workspaces",
-		"custom/right-arrow-dark"
+		"niri/workspaces"
 	],
 	"modules-center": [
-		"custom/left-arrow-dark",
 		"clock#1",
 		"clock#2",
-		"clock#3",
-		"custom/right-arrow-dark"
+		"clock#3"
 	],
 	"modules-right": [
-		"custom/left-arrow-dark",
 		"pulseaudio",
 		"memory",
 		"cpu",
 		"battery",
 		"disk",
-		"tray",
-		"custom/right-arrow-dark"
+		"tray"
 	],
-
-	"custom/left-arrow-dark": {
-		"format": "",
-		"tooltip": false
-	},
-	"custom/left-arrow-light": {
-		"format": "",
-		"tooltip": false
-	},
-	"custom/right-arrow-dark": {
-		"format": "",
-		"tooltip": false
-	},
-	"custom/right-arrow-light": {
-		"format": "",
-		"tooltip": false
-	},
-
 	"sway/workspaces": {
 		"disable-scroll": true,
 		"format": "{name}"
 	},
-
 	"clock#1": {
 		"format": "{:%a}",
 		"tooltip": false
@@ -59,9 +34,8 @@
 		"format": "{:%d-%m}",
 		"tooltip": false
 	},
-
 	"pulseaudio": {
-		"format": "{icon} {volume:2}%",
+		"format": "{icon}    {volume:2}%",
 		"format-bluetooth": "{icon}    {volume}% ",
 		"format-muted": "",
 		"format-icons": {
@@ -105,7 +79,7 @@
 		"path": "/"
 	},
 	"tray": {
-		"icon-size": 20,
-		"spacing": 4
+		"icon-size": 22,
+		"spacing": 6
 	}
 }
\ No newline at end of file