From 2267efa5a12a0519a598d193d54b84c343f71e94 Mon Sep 17 00:00:00 2001
From: Derek Taylor <derek@distrotube.com>
Date: Fri, 8 Nov 2024 18:36:04 -0600
Subject: [PATCH] Theming waybar to fit DoomOne colors.

---
 .config/waybar/config.jsonc | 36 ++++++++++++++++++++++++-----
 .config/waybar/style.css    | 45 +++++++++++++++++++++++--------------
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index aed4a59..26c77fc 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -8,14 +8,15 @@
         "hyprland/workspaces"
     ],
     "modules-center": [
-        "clock"
     ],
     "modules-right": [
         "tray",
+	"custom/kernel",
+	"cpu",
         "memory",
-        "network",
+	"custom/diskfree",
+        "clock",
         "wireplumber",
-        "battery",
         "custom/power"
     ],
     "wlr/taskbar": {
@@ -54,10 +55,14 @@
             "9": []
         }
     },
+    "cpu": {
+        "format": "⧯ Cpu: {usage}%" ,
+        "tooltip": false
+    },
     "memory": {
         "interval": 5,
-        "format": "󰍛 {}%",
-        "max-length": 10
+        "format": "󰍛  Mem: {}%",
+        "max-length": 15
     },
     "tray": {
         "spacing": 10
@@ -65,7 +70,7 @@
     "clock": {
         "tooltip-format": "{calendar}",
         "format-alt": "  {:%a, %d %b %Y}",
-        "format": "  {:%I:%M %p}"
+        "format": "⏱  {:%a, %b %d - %H:%M}"
     },
     "network": {
         "format-wifi" : "{icon}",
@@ -135,6 +140,25 @@
         },
         "tooltip": false
     },
+    "custom/pacman": {
+	"format": "{}  ",
+	"interval": "once",
+	"exec": "pacman_packages",
+	"on-click": "update-system",
+	"signal": 8
+    },
+    "custom/kernel": {
+        "format": "❤ {}",
+	"interval": 3600,
+        "max-length": 20,
+         "exec": "uname -r"
+    },
+    "custom/diskfree": {
+        "format": "🖴 Disk: {} used",
+	"interval": 300,
+        "max-length": 20,
+         "exec": "df --total -hl | grep 'sda1' | awk '{print $5}'"
+    },
     "custom/power": {
         "format": "󰤆",
         "tooltip": false,
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index d473c0c..dd98aec 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -2,12 +2,13 @@
   border: none;
   border-radius: 0;
   min-height: 0;
-  font-family: JetBrainsMono Nerd Font;
+  font-family: Ubuntu;
   font-size: 13px;
+  font-weight: bold;
 }
 
 window#waybar {
-  background-color: #181825;
+  background-color: #282c34;
   transition-property: background-color;
   transition-duration: 0.5s;
 }
@@ -50,8 +51,11 @@ window#waybar.hidden {
   background-color: #f38ba8;
 }
 
+#cpu,
 #memory,
+#custom-kernel,
 #custom-power,
+#custom-diskfree,
 #battery,
 #backlight,
 #wireplumber,
@@ -61,12 +65,20 @@ window#waybar.hidden {
   border-radius: 4px;
   margin: 6px 3px;
   padding: 6px 12px;
-  background-color: #1e1e2e;
-  color: #181825;
+  background-color: #282c34;
+  color: #282c34;
+}
+#custom-kernel {
+  background-color: #ff6c6b;
 }
 
 #custom-power {
   margin-right: 6px;
+  background-color: #f2cdcd;
+}
+
+#custom-diskfree {
+  background-color: #fc9867;
 }
 
 #custom-logo {
@@ -78,8 +90,13 @@ window#waybar.hidden {
   color: #1793d1;
 }
 
+#cpu {
+  background-color: #98be65;
+}
+
+
 #memory {
-  background-color: #fab387;
+  background-color: #46d9ff;
 }
 
 #battery {
@@ -89,38 +106,32 @@ window#waybar.hidden {
 #battery.warning,
 #battery.critical,
 #battery.urgent {
-  background-color: #ff0000;
-  color: #FFFF00;
+  background-color: #ff6c6b;
+  color: #f1fa8c;
 }
 
 #battery.charging {
-  background-color: #a6e3a1;
+  background-color: #98be65;
   color: #181825;
 }
 
 #backlight {
-  background-color: #fab387;
+    background-color: #ff6c6b;
 }
 
 #wireplumber {
-  background-color: #f9e2af;
+  background-color: #46d9ff;
 }
 
 #network {
-  background-color: #94e2d5;
+  background-color: #98be65;
   padding-right: 17px;
 }
 
 #clock {
-  font-family: JetBrainsMono Nerd Font;
   background-color: #cba6f7;
 }
 
-#custom-power {
-  background-color: #f2cdcd;
-}
-
-
 tooltip {
   border-radius: 8px;
   padding: 15px;