From 1dc2fb31b698bbcd80c51fea84a7e6364f0ed362 Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Sat, 22 Oct 2022 11:19:09 +0200
Subject: [PATCH] adjust some waybar settings

---
 modules/programs/waybar.nix | 63 ++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index b1891b9..37c9eb2 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -28,6 +28,7 @@
       style = ''
         * {
           border: none;
+          border-radius: 0;
           font-family: FiraCode Nerd Font Mono;
           font-size: 13px;
           min-height: 0;
@@ -37,21 +38,33 @@
           border-bottom: 3px solid transparent;
           color: white;
         }
-        workspace,
         idle_inhibitor,
-        mode,
         clock,
         pulseaudio,
         network,
         mpd,
         memory,
         network,
-        window,
         cpu,
         disk,
         battery {
-          margin: 15px;
-          padding: 5px;
+          margin: 0 6px;
+          padding: 0 5px;
+        }
+        mode {
+            background: transparent;
+            border-bottom: 2px solid gray;
+        }
+        cpu {
+            background: transparent;
+            border-bottom: 2px solid yellow;
+            color: white;
+        }
+        
+        memory {
+            background: transparent;
+            border-bottom: 2px solid green;
+            color: white;
         }
         workspaces button {
           padding: 0 5px;
@@ -95,7 +108,7 @@
         modules-center = [ "clock" ];
         #modules-left = [ "wlr/mode" "wlr/workspaces" "wlr/window" ];
         modules-left = [ "wlr/workspaces" ];
-        modules-right = [ "idle_inhibitor" "pulseaudio" "network" "cpu" "memory" "temperature" "battery" "tray" ];
+        modules-right = [ "idle_inhibitor" "pulseaudio" "network" "cpu" "memory" "backlight" "temperature" "battery" "tray" ];
         #modules-right = [ "cpu" "memory" "pulseaudio" "clock" "tray" ];
 
         "sway/workspaces" = {
@@ -118,7 +131,6 @@
         };
         "wlr/workspaces" = {
           format = "{icon}";
-          color = "white";
           format-icons = {
             "1"="";
             "2"="";
@@ -143,17 +155,17 @@
             };
         };
         cpu = {
-          format = "{usage}%";
+          format = "{usage}% ";
           tooltip = false;
           interval = 2;
         };
         disk = {
-          format = "{percentage_used}%";
+          format = "{percentage_used}% ";
           path = "/";
           interval = 30;
         };
         memory = {
-          format = "{}%";
+          format = "{}% ";
           interval = 5;
         };
         temperature = {
@@ -164,11 +176,11 @@
             };
             "thermal-zone" = 2;
             "hwmon-path" = "/sys/class/hwmon/hwmon3/temp1_input";
-            "format" = "{icon}{temperatureC}°C";
+            "format" = "{temperatureC}°C {icon}";
             "format-icons" = ["" "" "" "" ""];
         };
         backlight = {
-            "format" = "{icon}{percent}%";
+            "format" = "{percent}% {icon}";
             "format-icons" = ["" ""];
             "on-scroll-up" = "light -A +5%";
             "on-scroll-down" = "light -U -5%";
@@ -180,27 +192,28 @@
             warning = 20;
             critical = 5;
           };
-          format = "{icon}{capacity}%";
-          format-charging = "{capacity}%";
-          format-plugged = "{capacity}%";
-          format-alt = "{icon}{time}";
+          format = "{capacity}% {icon}";
+          format-charging = "{capacity}% ";
+          format-plugged = "{capacity}% ";
+          format-alt = "{time} {icon}";
           format-icons = ["" "" "" "" ""];
         };
         network = {
-          format-wifi = "";
-          format-ethernet = " {ifname}: {ipaddr}/{cidr}";
-          format-linked = "睊{ifname} (No IP)";
-          format-disconnected = "睊Not connected";
+          format-wifi = " {ipaddr}";
+          format-ethernet = "{ifname}: {ipaddr}/{cidr} ";
+          format-linked = "{ifname} (No IP) 睊";
+          format-disconnected = "Not connected ⚠";
           format-alt = "{ifname}: {ipaddr}/{cidr}";
           tooltip-format = "{essid} {signalStrength}%";
           on-click-right = "${pkgs.alacritty}/bin/alacritty -e nmtui";
         };
         pulseaudio = {
-          format = "{icon}{volume}% {format_source}";
-          format-bluetooth = "{icon}{volume}% {format_source}";
-          format-bluetooth-muted = "{volume}% {format_source}";
-          format-muted = "{format_source}";
-          format-source = "{volume}%";
+          scroll-step = 1;
+          format = "{volume}% {icon} {format_source}";
+          format-bluetooth = "{volume}% {icon} {format_source}";
+          format-bluetooth-muted = "{volume}% {icon} {format_source}";
+          format-muted = " {format_source}";
+          format-source = "{volume}% ";
           #format-source = "<span font='14'></span>";
           format-source-muted = "";
           format-icons = {