From ea16dabe34008291b34ad82ee9faabb8f6899850 Mon Sep 17 00:00:00 2001
From: Daryl Ronningen <relms@relms.dev>
Date: Sat, 4 Jan 2025 17:38:58 -0800
Subject: [PATCH] fix some waybar styling and add battery

---
 flake.lock                                    | 18 +++----
 hardware/boot/grub.nix                        |  1 +
 .../modules/desktop/environments/hyprland.nix | 52 +++++++++++++++++--
 3 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index a9d0d12..e99b69b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -60,11 +60,11 @@
         "nuscht-search": "nuscht-search"
       },
       "locked": {
-        "lastModified": 1735634086,
-        "narHash": "sha256-DTcB/kBZULyJztXXnH3OVF5LHLl+O670DuLZZNUMnNo=",
+        "lastModified": 1736033375,
+        "narHash": "sha256-CeTokGIJpTd8kfaqLy3ururMe4N+LZpF62ofXAh0KtU=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "63290ea1d2a28e65195017ed78a81cfc242ef0df",
+        "rev": "89bbaf1987e8e0e2c891463ebb5be3a6cbd781a1",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735774425,
-        "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
+        "lastModified": 1736013363,
+        "narHash": "sha256-P4lsS2Y5GzBfC8OfXtD/xWEucX6oHGTjOzjEjEJbXfc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
+        "rev": "0d7908bd09165db6699908b7e3970f137327cbf0",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735471104,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "lastModified": 1735834308,
+        "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
         "type": "github"
       },
       "original": {
diff --git a/hardware/boot/grub.nix b/hardware/boot/grub.nix
index da970d6..3eea842 100644
--- a/hardware/boot/grub.nix
+++ b/hardware/boot/grub.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   boot = {
+    tmp.cleanOnBoot = true;
     loader = {
       grub = {
         enable = true;
diff --git a/home/modules/desktop/environments/hyprland.nix b/home/modules/desktop/environments/hyprland.nix
index 6cc72e8..2447329 100644
--- a/home/modules/desktop/environments/hyprland.nix
+++ b/home/modules/desktop/environments/hyprland.nix
@@ -123,13 +123,18 @@
 
         modules-left = ["custom/nixicon" "hyprland/workspaces" "hyprland/window"];
         modules-center = ["clock"];
-        modules-right = ["tray"];
+        modules-right = ["battery" "custom/separator" "tray"];
 
         "custom/nixicon" = {
           format = "    ";
           tooltip = false;
         };
 
+        "custom/separator" = {
+          format = "  |  ";
+          tooltip = false;
+        };
+
         clock = {
           interval = 1;
           locale = "en_US.utf8";
@@ -151,6 +156,23 @@
           };
         };
 
+        battery = {
+          bat = "BAT1";
+          interval = 5;
+          full-at = 80;
+          states = {
+            warning = 20;
+            critical = 10;
+          };
+          format = "{icon} {capacity}%";
+          tooltip-format = "{timeTo} \n {power} W \n {cycles} Cycles ({health}%)";
+          format-icons = {
+            discharging = ["󰁺" "󰁽" "󰁿" "󰂁" "󰁹"];
+            charging = ["󰂆" "󰂈" "󰂉" "󰂊" "󰂅"];
+          };
+          format-time = "{H}:{M}";
+        };
+
         "hyprland/workspaces" = {
           active-only = false;
           all-outputs = true;
@@ -182,6 +204,13 @@
         border-radius: 10px;
       }
 
+      .modules-right {
+        background-color: #313244;
+        border-radius: 5px;
+        margin: 5px;
+        padding: 5px;
+      }
+
       tooltip {
         background-color: #1e1e2e;
         border: 1px solid #f5c2e7;
@@ -197,6 +226,12 @@
         color: #7EBAE4;
       }
 
+      #custom-separator {
+        padding-left: 2px;
+        padding-right: 2px;
+        color: #a6adc8;
+      }
+
       #workspaces {
         margin-top: 5px;
         margin-bottom: 5px;
@@ -236,13 +271,22 @@
         border-radius: 0px 5px 5px 0px;
       }
 
-      #tray {
-        border-radius: 0px 5px 5px 0px;
-        margin: 5px;
+      #clock {
+        margin-top: 5px;
+        margin-bottom: 5px;
         padding: 5px;
+        border-radius: 5px;
         background-color: #313244;
       }
 
+      #battery.warning {
+        color: #f9e2af;
+      }
+
+      #battery.critical {
+        color: #f38ba8;
+      }
+
       @keyframes blinker {
         50% {
           opacity: 0;