From c2d973c6da7bc2e0631aa697ebc500f8d82dad49 Mon Sep 17 00:00:00 2001
From: John Costa <johncosta027@gmail.com>
Date: Mon, 7 Jul 2025 19:16:09 +0100
Subject: [PATCH] feat: waybar!!!

---
 config/hypr/hyprland.conf              |  4 +++-
 config/waybar/{config => config.jsonc} | 26 +++++++++++++++-----------
 config/waybar/style.css                | 12 ++++++------
 3 files changed, 24 insertions(+), 18 deletions(-)
 rename config/waybar/{config => config.jsonc} (72%)

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index f1c432c2..beacc476 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -64,7 +64,9 @@ env = HYPRCURSOR_SIZE,24
 env = __NV_DISABLE_EXPLICIT_SYNC,1
 
 exec = gsettings set org.gnome.desktop.interface gtk-theme "catppuccin-mocha-blue-standard+default"   # for GTK3 apps
-exec = gsettings set org.gnome.desktop.interface color-scheme "catppuccin-mocha-blue-standard+default"   # for GTK4 apps
+exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"   # for GTK4 apps
+
+env = QT_QPA_PLATFORMTHEME,qt6ct   # for Qt apps
 
 env = QT_QPA_PLATFORM,wayland
 env = QT_QPA_PLATFORMTHEME,qt5ct
diff --git a/config/waybar/config b/config/waybar/config.jsonc
similarity index 72%
rename from config/waybar/config
rename to config/waybar/config.jsonc
index 73fea6ee..39789c71 100644
--- a/config/waybar/config
+++ b/config/waybar/config.jsonc
@@ -7,14 +7,14 @@
     "modules-center": ["clock", "custom/music"],
     "modules-right": ["pulseaudio", "backlight", "battery", "tray", "custom/lock", "custom/power"],
     "hyprland/workspaces": {
-         "disable-scroll": true,
+          "disable-scroll": true
      },
     "tray": {
         "icon-size": 36,
-        "spacing": 10
+        "spacing": 16
     },
     "custom/music": {
-        "format": "  {}",
+        "format": "♫ {}",
         "escape": true,
         "interval": 5,
         "tooltip": false,
@@ -26,26 +26,30 @@
         "timezone": "Europe/London",
         "format": "{:%H:%M %d/%m/%Y}"
     },
+    "backlight": {
+        "format": "{icon} {percent}%",
+        "format-icons": ["󰃚", "󰃛", "󰃜", "󰃝"]
+    },
     "battery": {
         "states": {
             "warning": 30,
             "critical": 15
         },
         "format": "{icon}",
-        "format-charging": "",
-        "format-plugged": "",
+        "format-charging": "⚡",
+        "format-plugged": "🔌",
         "format-alt": "{icon}",
-        "format-icons": ["", "",  "", "", "", "", "", "", "", "", "", ""]
+        "format-icons": ["", "", "", "", ""]
     },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
         "format": "{icon} {format_source} {volume}%",
-        "format-muted": "",
+        "format-muted": " mute",
         "format-source": "",
-        "format-source-muted": "  ",
+        "format-source-muted": " src mute ",
         "format-icons": {
-            "hdmi": ["", "", " "],
-            "default": ["", "", ""]
+            "hdmi": ["", "", ""],
+            "default": ["", "", ""]
         },
         "on-click": "pavucontrol"
     },
@@ -57,6 +61,6 @@
     "custom/power": {
         "tooltip": false,
         "on-click": "wlogout &",
-        "format": "襤"
+        "format": ""
     }
 }
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 1f5af516..46444e9d 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1,8 +1,8 @@
 @import "mocha.css";
 
 * {
-  font-family: FantasqueSansMono Nerd Font;
-  font-size: 17px;
+  font-family: "SpaceMono Nerd Font";
+  font-size: 20px;
   min-height: 0;
 }
 
@@ -56,6 +56,8 @@
 
 #battery {
   color: @green;
+  margin-right: 1rem;
+  border-radius: 0rem 1rem 1rem 0rem;
 }
 
 #battery.charging {
@@ -68,10 +70,7 @@
 
 #backlight {
   color: @yellow;
-}
-
-#backlight, #battery {
-    border-radius: 0;
+  border-radius: 1rem 0rem 0rem 1rem;
 }
 
 #pulseaudio {
@@ -92,6 +91,7 @@
 
 #custom-power {
     margin-right: 1rem;
+    padding-right: 1.5rem;
     border-radius: 0px 1rem 1rem 0px;
     color: @red;
 }