From e5ac6eabb7f5c293c506eeb52c5929c145f42b72 Mon Sep 17 00:00:00 2001
From: Samuel O'Neal <me@samoneal.io>
Date: Wed, 4 Feb 2026 06:20:09 -0700
Subject: [PATCH] updated to add custom waybar information; updated loading
 commands

---
 hyprland/.config/hypr/exec.conf      |  4 ++-
 waybar/.config/waybar/config.jsonc   | 40 ++++++++++++++++++++++++++--
 waybar/.config/waybar/power_menu.xml | 28 +++++++++++++++++++
 waybar/.config/waybar/style.css      | 34 ++++++++++++++++++++---
 4 files changed, 99 insertions(+), 7 deletions(-)
 create mode 100644 waybar/.config/waybar/power_menu.xml

diff --git a/hyprland/.config/hypr/exec.conf b/hyprland/.config/hypr/exec.conf
index 5594675..46a1cfc 100644
--- a/hyprland/.config/hypr/exec.conf
+++ b/hyprland/.config/hypr/exec.conf
@@ -2,5 +2,7 @@ exec-once = hyprctl setcursor catppuccin-mocha-dark-cursors 28
 # exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = systemctl --user start hyprpolkitagent
 
-exec-once= waybar & mako & hyprpaper & hypridle
+exec-once= waybar & mako & hyprpaper & hypridle & wluma
+
+exec-once = blueman-applet &
 
diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
index 911c2c7..885ff20 100644
--- a/waybar/.config/waybar/config.jsonc
+++ b/waybar/.config/waybar/config.jsonc
@@ -1,8 +1,8 @@
 {
   "position": "top",
-  "modules-left": ["hyprland/workspaces"],
+  "modules-left": ["hyprland/workspaces", "mpris"],
   "modules-center": ["hyprland/window"],
-  "modules-right": ["network", "pulseaudio", "battery", "clock"],
+  "modules-right": ["cpu", "memory", "bluetooth", "network", "pulseaudio", "battery", "clock", "power-profiles-daemon", "custom/power"],
   "clock": {
     "format": "<span foreground='#f5c2e7'>   </span>{:%a %d %H:%M}",
     "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
@@ -36,5 +36,41 @@
           "default": ["", "", " "]
       },
       "on-click": "pavucontrol"
+  },
+"power-profiles-daemon": {
+  "format": "{icon}",
+  "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+  "tooltip": true,
+  "format-icons": {
+    "default": "",
+    "performance": "",
+    "balanced": "",
+    "power-saver": ""
   }
+},
+"bluetooth": {
+	"format": " {status}",
+	"format-connected": " {device_alias}",
+	"format-connected-battery": " {device_alias} {device_battery_percentage}%",
+	// "format-device-preference": [ "device1", "device2" ], // preference list deciding the displayed device
+	"tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
+	"tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
+	"tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
+	"tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
+    "on-click-left": "blueman-manager"
+},
+  "custom/power": {
+"format" : "⏻ ",
+        "tooltip": false,
+        "menu": "on-click",
+        "menu-file": "~/.config/waybar/power_menu.xml",
+        "menu-actions": {
+            "shutdown": "shutdown",
+            "reboot": "reboot",
+            "suspend": "systemctl suspend",
+            "hibernate": "systemctl hibernate",
+        },
+    "escape": true
+  },
+
 }
diff --git a/waybar/.config/waybar/power_menu.xml b/waybar/.config/waybar/power_menu.xml
new file mode 100644
index 0000000..fe42050
--- /dev/null
+++ b/waybar/.config/waybar/power_menu.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <object class="GtkMenu" id="menu">
+        <child>
+            <object class="GtkMenuItem" id="suspend">
+                <property name="label">Suspend</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkMenuItem" id="hibernate">
+                <property name="label">Hibernate</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkMenuItem" id="shutdown">
+                <property name="label">Shutdown</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkSeparatorMenuItem" id="delimiter1" />
+        </child>
+        <child>
+            <object class="GtkMenuItem" id="reboot">
+                <property name="label">Reboot</property>
+            </object>
+        </child>
+    </object>
+</interface>
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 907b8b7..3b8b9ce 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -65,14 +65,17 @@ button:hover {
 #wireplumber,
 #tray,
 #network,
+#bluetooth,
 #mode,
-#scratchpad {
+#scratchpad,
+#power-profiles-daemon,
+#custom-power {
   margin-top: 2px;
   margin-bottom: 2px;
   margin-left: 4px;
   margin-right: 4px;
-  padding-left: 4px;
-  padding-right: 4px;
+  padding-left: 8px;
+  padding-right: 8px;
 }
 
 #clock {
@@ -90,7 +93,7 @@ button:hover {
     border-bottom: 2px solid @blue;
 }
 
-#network {
+#network, #bluetooth {
     color: @yellow;
     border-bottom: 2px solid @yellow;
 }
@@ -109,6 +112,20 @@ button:hover {
     border-bottom: 2px solid @green;
 }
 
+#cpu {
+  color: @mauve;
+  border-bottom: 2px solid @mauve;
+}
+
+#memory {
+  color: @mauve;
+  border-bottom: 2px solid @mauve;
+}
+
+#custom-power {
+  color: #ec9974;
+}
+
 /* If workspaces is the leftmost module, omit left margin */
 .modules-left>widget:first-child>#workspaces {
     margin-left: 0;
@@ -125,3 +142,12 @@ button:hover {
     padding-left: 6px;
     padding-right: 6px;
 }
+
+#custom-power.menu {
+    border-radius: 15px;
+    background: #161320;
+    color: @sapphire;
+}
+#custom-power.menuitem {
+    border-radius: 15px;
+}