From 62445838afdd54184e8d4c1b618c4d5ed4361903 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Tue, 7 Jun 2022 18:16:53 +0200
Subject: upgrade to NixOS 22.05

---
 usecases/desktop/graphical/waybar.nix | 164 +++++++++++++++++-----------------
 1 file changed, 81 insertions(+), 83 deletions(-)

(limited to 'usecases/desktop/graphical')

diff --git a/usecases/desktop/graphical/waybar.nix b/usecases/desktop/graphical/waybar.nix
index e9a227a..84fa694 100644
--- a/usecases/desktop/graphical/waybar.nix
+++ b/usecases/desktop/graphical/waybar.nix
@@ -30,104 +30,102 @@ inputs:
           "tray"
         ];
 
-        modules = {
-          mpd = lib.mkIf config.services.mpd.enable {
-            format = "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) <span font_desc='Font Awesome 5 Free'></span>";
-            format-stopped = "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped <span font_desc='Font Awesome 5 Free'></span>";
-            format-disconnected = "Disconnected <span font_desc='Font Awesome 5 Free'></span>";
-
-            on-click-middle = "${pkgs.alacritty}/bin/alacritty --command ncmpcpp";
-
-            consume-icons = {
-              on = " ";
-            };
-
-            random-icons = {
-              on = " ";
-            };
-
-            repeat-icons = {
-              on = " ";
-            };
-
-            single-icons = {
-              on = "1 ";
-            };
-
-            state-icons = {
-              playing = "";
-              paused = "";
-            };
-          };
+        mpd = lib.mkIf config.services.mpd.enable {
+          format = "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) <span font_desc='Font Awesome 5 Free'></span>";
+          format-stopped = "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped <span font_desc='Font Awesome 5 Free'></span>";
+          format-disconnected = "Disconnected <span font_desc='Font Awesome 5 Free'></span>";
 
-          idle_inhibitor = {
-            format = "{icon}";
-            format-icons = {
-              activated = "";
-              deactivated = "";
-            };
-          };
+          on-click-middle = "${pkgs.alacritty}/bin/alacritty --command ncmpcpp";
 
-          clock = {
-            tooltip-format = "{:%Y-%m-%d | %H:%M}";
-            format-alt = "{:%Y-%m-%d}";
+          consume-icons = {
+            on = " ";
           };
 
-          cpu = { format = "{usage}% "; };
-
-          memory = { format = "{}% "; };
-
-          battery = {
-            states = { good = 90; };
-            format = "{capacity}% {icon}";
-            format-icons = [
-              "<span font_desc='Font Awesome 5 Free'></span>"
-              "<span font_desc='Font Awesome 5 Free'></span>"
-              "<span font_desc='Font Awesome 5 Free'></span>"
-              "<span font_desc='Font Awesome 5 Free'></span>"
-              "<span font_desc='Font Awesome 5 Free'></span>"
-            ];
+          random-icons = {
+            on = " ";
           };
 
-          "network#eth" = {
-            interface = "enp*";
-            format-ethernet = "{ipaddr}/{cidr} ";
-            format-disconnected = "Disconnected ";
+          repeat-icons = {
+            on = " ";
           };
 
-          "network#wlan" = {
-            interface = "wlp*";
-            format-wifi = "{essid} ({signalStrength}%) <span font_desc='Font Awesome 5 Free'></span>";
-            format-disconnected = "Disconnected <span font_desc='Font Awesome 5 Free'></span>";
-            tooltip = true;
-            tooltip-format-wifi = "{ipaddr}/{cidr}";
+          single-icons = {
+            on = "1 ";
           };
 
-          temperature = {
-            hwmon-path = "/sys/class/hwmon/hwmon0/temp1_input";
-            format = "{temperatureC} °C ";
+          state-icons = {
+            playing = "";
+            paused = "";
           };
+        };
 
-          backlight = {
-            format = "{percent}% <span font_desc='Font Awesome 5 Free'>{icon}</span>";
-            format-icons = [ "" "" ];
+        idle_inhibitor = {
+          format = "{icon}";
+          format-icons = {
+            activated = "";
+            deactivated = "";
           };
+        };
+
+        clock = {
+          tooltip-format = "{:%Y-%m-%d | %H:%M}";
+          format-alt = "{:%Y-%m-%d}";
+        };
+
+        cpu = { format = "{usage}% "; };
+
+        memory = { format = "{}% "; };
+
+        battery = {
+          states = { good = 90; };
+          format = "{capacity}% {icon}";
+          format-icons = [
+            "<span font_desc='Font Awesome 5 Free'></span>"
+            "<span font_desc='Font Awesome 5 Free'></span>"
+            "<span font_desc='Font Awesome 5 Free'></span>"
+            "<span font_desc='Font Awesome 5 Free'></span>"
+            "<span font_desc='Font Awesome 5 Free'></span>"
+          ];
+        };
+
+        "network#eth" = {
+          interface = "enp*";
+          format-ethernet = "{ipaddr}/{cidr} ";
+          format-disconnected = "Disconnected ";
+        };
+
+        "network#wlan" = {
+          interface = "wlp*";
+          format-wifi = "{essid} ({signalStrength}%) <span font_desc='Font Awesome 5 Free'></span>";
+          format-disconnected = "Disconnected <span font_desc='Font Awesome 5 Free'></span>";
+          tooltip = true;
+          tooltip-format-wifi = "{ipaddr}/{cidr}";
+        };
+
+        temperature = {
+          hwmon-path = "/sys/class/hwmon/hwmon0/temp1_input";
+          format = "{temperatureC} °C ";
+        };
+
+        backlight = {
+          format = "{percent}% <span font_desc='Font Awesome 5 Free'>{icon}</span>";
+          format-icons = [ "" "" ];
+        };
 
-          pulseaudio = {
-            format = "{volume}% {icon}";
-            format-bluetooth = "{volume}% {icon}";
-            format-muted = "";
-            format-icons = {
-              headphones = "";
-              handsfree = "";
-              headset = "";
-              phone = "";
-              portable = "";
-              car = "";
-              default = [ "" "" ];
-            };
-            on-click = "pavucontrol";
+        pulseaudio = {
+          format = "{volume}% {icon}";
+          format-bluetooth = "{volume}% {icon}";
+          format-muted = "";
+          format-icons = {
+            headphones = "";
+            handsfree = "";
+            headset = "";
+            phone = "";
+            portable = "";
+            car = "";
+            default = [ "" "" ];
           };
+          on-click = "pavucontrol";
         };
       }];
 
-- 
cgit v1.2.3