From 61a382482032f3a38f89e7365ad3e165fc68c864 Mon Sep 17 00:00:00 2001
From: DerGrumpf <p.keier@beyerstedt-it.de>
Date: Sun, 6 Apr 2025 23:05:07 +0200
Subject: [PATCH] Changed: Waybar

---
 home/hyprland/waybar/single-monitor.nix | 73 ++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 7 deletions(-)

diff --git a/home/hyprland/waybar/single-monitor.nix b/home/hyprland/waybar/single-monitor.nix
index cd2c032..759a83c 100644
--- a/home/hyprland/waybar/single-monitor.nix
+++ b/home/hyprland/waybar/single-monitor.nix
@@ -1,8 +1,8 @@
 {
-  pkgs,
-  config,
+  pkgs;
+  config;
   ...
-}: {
+} = {
     programs.waybar = {
         enable = true;
         package = pkgs.waybar;
@@ -19,9 +19,7 @@
                 ];
 
                 modules-left = [ 
-                    "custom/smallspacer"
                     "hyprland/workspaces"
-                    "custom/spacer"
                     "mpris"
                 ];
 
@@ -29,7 +27,12 @@
                     "custom/weather"
                 ];
                 
-                modules-right = [  ];
+                modules-right = [
+                    "network"
+                    "memory"
+                    "cpu"
+                    "clock"
+                ];
 
                 # Widgets
                 "sway/workspaces" = {
@@ -47,7 +50,7 @@
                         mpv = "🎵";
                     };
 
-                    status-icons: {
+                    status-icons = {
                         paused = "▶"; 
                     };
                 };
@@ -60,6 +63,62 @@
                     };
                 };
 
+                network = {
+                        tooltip = true;
+                        format-wifi = "{icon} ";
+                        format-icons = ["󰤟"  "󰤢"  "󰤥"]; 
+                        rotate = 0;
+                        format-ethernet = "󰈀 ";
+                        tooltip-format = "Network = <big><b>{essid}</b></big>\nSignal strength: <b>{signaldBm}dBm ({signalStrength}%)</b>\nFrequency: <b>{frequency}MHz</b>\nInterface: <b>{ifname}</b>\nIP: <b>{ipaddr}/{cidr}</b>\nGateway: <b>{gwaddr}</b>\nNetmask: <b>{netmask}</b>";
+                        format-linked = "󰈀 {ifname} (No IP)";
+                        format-disconnected = " ";
+                        tooltip-format-disconnected = "Disconnected";
+                        on-click = "/usr/local/bin/ags -t ControlPanel";
+                        interval = 2;
+                };
+                    
+                memory = {
+                    interval = 1;
+                    rotate = 270;
+                    format = "{icon}";
+                    format-icons = ["󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥"];
+                    max-length = 10;
+                };
+
+                cpu = {
+                    interval = 1;
+                    format = "{icon}";
+                    rotate = 270;
+                    format-icons = ["󰝦" "󰪞" "󰪟" "󰪠" "󰪡" "󰪢" "󰪣" "󰪤" "󰪥"];
+                };
+
+                clock = {
+                    format = "{:%I:%M %p}";
+                    rotate = 0;
+                    on-click = "/usr/local/bin/ags -t ActivityCenter";
+                    tooltip-format = "<tt>{calendar}</tt>";
+                    
+                    calendar = {
+                        mode = "month";
+                        mode-mon-col = 3;
+                        on-scroll = 1;
+                        on-click-right = "mode";
+                        format = {
+                            months = "<span color='#ffead3'><b>{}</b></span>";
+                            weekdays = "<span color='#ffcc66'><b>{}</b></span>";
+                            today = "<span color='#ff6699'><b>{}</b></span>"
+                        };
+                    };
+
+                    actions = {
+                        on-click-right = "mode";
+                        on-click-forward = "tz_up";
+                        on-click-backward = "tz_down";
+                        on-scroll-up = "shift_up";
+                        on-scroll-down = "shift_down"
+                    };
+                };
+
                 # Custom Widgets
                 "custom/weather" = {
                     exec = "python3 ~/.config/waybar/weather.py waybar";