configures waybar

flake.nix

@@ -10,10 +10,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    ironbar = {
-      url = "github:JakeStanger/ironbar";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nix-darwin.url = "github:LnL7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     ip-whitelist.url = "github:Oak-Digital/nixos-ip-whitelist-firewall";

home/linux.nix

@@ -39,7 +39,6 @@
     krita
     gpustat
     librewolf
-    pamixer
   ];
 
   imports = [
@@ -57,7 +56,6 @@
     ../modules/wm/cliphist
     ../modules/wm/awww
     ../modules/wm/fuzzel
-    ../modules/wm/ironbar
     ../modules/wm/waybar
     ../modules/wm/niri
   ];

hosts/dnsc-machine/default.nix

@@ -63,7 +63,6 @@
       dennis = {
         imports = [
           inputs.zen-browser.homeModules.beta
-          inputs.ironbar.homeManagerModules.default
           ../../home/linux.nix
         ];
       };

modules/wm/niri/config/config.kdl

@@ -179,8 +179,6 @@ layout {
 // STARTUP
 spawn-at-startup "swaync"
 spawn-at-startup "swww-daemon"
-spawn-at-startup "ironbar"
-spawn-at-startup "blueman-applet"
 spawn-at-startup "tailscale systray"
 spawn-sh-at-startup "~/.config/awww/bin/random-bg.sh ~/Pictures/Wallpapers/safe/dark"
 

modules/wm/waybar/config/config.jsonc

@@ -21,8 +21,10 @@
     "niri/workspaces"
   ],
   "modules-right": [
-    "wireplumber",
+    "wireplumber#source",
-    "tray"
+    "wireplumber#sink",
+    "tray",
+    "custom/power"
   ],
   // Module Configuration 
   "niri/workspaces": {
@@ -66,9 +68,25 @@
     "format": "{percentage_used}%",
     "max-length": 2
   },
-  "wireplumber": {
+  "wireplumber#source": {
-    "on-click": "pamixer -t",
+    "node-type": "Audio/Source",
+    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle",
     "on-click-right": "pwvucontrol",
+    "scroll-step": 5.0,
+    "tooltip-format": "{node_name} ({source_volume}%)",
+    "format": "{icon}",
+    "format-muted": "󰍭",
+    "format-icons": {
+      "default": [
+        "󰍬"
+      ]
+    }
+  },
+  "wireplumber#sink": {
+    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+    "on-click-right": "pwvucontrol",
+    "scroll-step": 5.0,
+    "tooltip-format": "{node_name} ({volume}%)",
     "format": "{icon}",
     "format-muted": "󰖁",
     "format-icons": {
@@ -82,5 +100,16 @@
   "tray": {
     "icon-size": 14,
     "spacing": 18
+  },
+  "custom/power": {
+    "format": "󰐥",
+    "tooltip": false,
+    "menu": "on-click",
+    "menu-file": "~/.config/waybar/power_menu.xml",
+    "menu-actions": {
+      "lock": "hyprlock",
+      "reboot": "reboot",
+      "shutdown": "shutdown"
+    }
   }
 }

modules/wm/waybar/config/power_menu.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <object class="GtkMenu" id="menu">
+        <child>
+            <object class="GtkMenuItem" id="lock">
+                <property name="label">Suspend</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkMenuItem" id="reboot">
+                <property name="label">Hibernate</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkMenuItem" id="shutdown">
+                <property name="label">Shutdown</property>
+            </object>
+        </child>
+    </object>
+</interface>

modules/wm/waybar/config/style.css

@@ -6,14 +6,26 @@
 }
 
 tooltip,
-#tray menu {
+menu {
   background: rgba(15, 11, 12, 0.9);
   border-radius: 8px;
   border: 2px solid #572454;
 }
 
+menuitem {
+  color: #ffffff;
+  margin-left: 4px;
+  margin-right: 4px;
+  border-radius: 4px;
+}
+
+menuitem:hover {
+  color: #331531;
+  background-color: #c57faf;
+}
+
 window#waybar {
-  background-color: rgba(15, 11, 12, 0.999);
+  background-color: rgba(15, 11, 12, 0.95);
   border-radius: 8px;
   color: #ffffff;
 }
@@ -50,11 +62,23 @@ window#waybar {
 
 #wireplumber {
   font-size: 16px;
+  margin-top: 4px;
+  margin-bottom: 4px;
 }
 
 #tray {
   margin: 4px;
+  margin-top: 0;
   border-radius: 4px;
   padding-top: 10px;
   padding-bottom: 10px;
 }
+
+#custom-power {
+  background-color: #331531;
+  font-size: 16px;
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+}

modules/wm/waybar/default.nix

@@ -8,7 +8,7 @@
   programs.waybar = {
     enable = true;
     systemd = {
-      enable = false;
+      enable = true;
       target = "graphical-session.target";
     };
   };