From 26ab6ef0adce424ea1cbbcffc96afa8ec9bb746b Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Sun, 24 Mar 2024 01:14:40 -0400
Subject: [PATCH] hyprland: updated waybar config

---
 home/hyprland.nix           | 44 +++++++++++++++++++++++++++++++++++--
 hosts/petalburg/default.nix |  1 +
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/home/hyprland.nix b/home/hyprland.nix
index 26d7cef7..0448f767 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -15,6 +15,8 @@
       overskride
       udiskie
       xfce.thunar
+      playerctl
+      pavucontrol
     ];
 
     wayland.windowManager.hyprland = {
@@ -24,6 +26,24 @@
 
     xdg.configFile."hypr/hypridle.conf".source = ./dotfiles/hypridle.conf;
     programs.waybar.enable = true;
+    programs.waybar.style = ''
+      * {
+         border: none;
+         border-radius: 0;
+         font-family: DroidSansM Nerd Font Mono;
+      }
+      window#waybar {
+         background: #000;
+         color: #FFFFFF;
+      }
+      #workspaces button {
+         padding: 5px 10px;
+      }
+      #clock, #battery, #pulseaudio, #network {
+        padding: 0 10px;
+        margin: 0 5px;
+      }
+    '';
     programs.waybar.settings = {
         mainBar = {
             layer = "top";
@@ -35,14 +55,34 @@
             ];
             modules-left = [ "hyprland/workspaces" "hyprland/mode" ];
             modules-center = [ "hyprland/window" ];
-            modules-right = [ "tray" "battery" "clock"];
+            modules-right = [ "tray" "network" "pulseaudio" "battery" "clock"];
 
             "hyprland/workspaces" = {
                 all-outputs = true;
             };
             "clock" = {
+                "tooltip-format" = "{:%Y-%m-%d | %H:%M}";
                 "interval" = 60;
-                "format" = "{:%I:%M}";
+                "format" = "{:%I:%M%p}";
+            };
+            "battery" = {
+              "format" = "　{capacity}%";
+              "on-click" = "pp-adjuster";
+            };
+            "pulseaudio" = {
+                "format" = "　{volume}%";
+                 "format-bluetooth" = "{volume}% {icon}";
+                 "format-muted" = "";
+                 "format-icons"=  {
+                     "headphones" = "";
+                     "handsfree" = "";
+                     "headset" = "";
+                 };
+                "on-click" = "pavucontrol";
+            };
+            "network" = {
+                "format-wifi" = "　{signalStrength}%";
+                "format-disconnected" = "⚠";
             };
         };
     };
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index f48f43c3..5200f65c 100644
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@@ -55,6 +55,7 @@ in {
   imports =
     [ 
       ../../modules/kde.nix
+      ../../modules/hyprland.nix
       ../../modules/plymouth.nix
       ../../modules/zram_swap.nix
       ../../system