From be14bb4cfc6fd14afe0b8a4cd82dfbcd85e8b6ae Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Wed, 31 Jan 2024 17:32:32 +0800
Subject: [PATCH] Clean up waybar

---
 home/fhauser/applications/waybar.nix | 57 +++-------------------------
 1 file changed, 6 insertions(+), 51 deletions(-)

diff --git a/home/fhauser/applications/waybar.nix b/home/fhauser/applications/waybar.nix
index 0f125ef..11459d1 100644
--- a/home/fhauser/applications/waybar.nix
+++ b/home/fhauser/applications/waybar.nix
@@ -4,21 +4,18 @@
 
   programs.waybar = {
     enable = true;
+    systemd = {
+      enable = true;
+      target = "tray.target";
+    };
     settings = [{
       position = "top";
       #height = 
       modules-left = [ "sway/mode" "sway/workspaces" ];
       modules-center = [ "sway/window" ];
       modules-right = [
-        "backlight"
         "idle_inhibitor"
-        #"cpu"
-        "temperature"
-        #"memory"
-        #"disk"
-        "network"
-        "bluetooth"
-        #"custom/keyboard-layout"
+        "backlight"
         "battery"
         "pulseaudio"
         "tray"
@@ -61,16 +58,6 @@
         };
       };
 
-      #"custom/keyboard-layout" = {
-      #  exec = pkgs.writeShellScript "keyboard-layout" "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4";
-      #  # Interval set only as a fallback, as the value is updated by signal
-      #  interval = "30";
-      #  format = "  {}"; # Icon: keyboard
-      #  # Signal sent by Sway key binding (~/.config/sway/key-bindings)
-      #  signal = "1"; # SIGHUP
-      #  tooltip = "false";
-      #};
-
       memory = {
         interval = "5";
         format = " {}%"; # Icon: microchip
@@ -80,14 +67,6 @@
         };
       };
 
-      network = {
-        interval = "5";
-        format-wifi = " {essid}: {ipaddr} ({signalStrength}%)"; # Icon: wifi
-        format-ethernet = "🔗 {ifname}: {ipaddr}/{cidr}"; # Icon: ethernet
-        format-disconnected = "🔗";
-        tooltip-format = "{ifname}: {ipaddr}";
-      };
-
       "sway/mode" = {
         format =
           ''<span style="italic">  {}</span>''; # Icon: expand-arrows-alt
@@ -128,24 +107,10 @@
         on-click = "pavucontrol";
       };
 
-      temperature = {
-        critical-threshold = 80;
-        interval = 5;
-        format = "{icon}  {temperatureC}°C";
-        format-icons = [
-          "" # Icon: temperature-empty
-          "" # Icon: temperature-quarter
-          "" # Icon: temperature-half
-          "" # Icon: temperature-three-quarters
-          "" # Icon: temperature-full
-        ];
-        tooltip = "true";
-      };
-
       idle_inhibitor = {
         format = "{icon}";
         format-icons = {
-          activated = "";
+          activated = " active";
           deactivated = "";
         };
       };
@@ -156,8 +121,6 @@
       };
     }];
 
-    systemd.enable = true;
-
     style = ''
       /* =============================================================================
        *
@@ -370,12 +333,4 @@
       }
     '';
   };
-  systemd.user.services.waybar = with lib; {
-    #      Install.WantedBy = mkForce [ "sway-session.target" ]; # TODO: Set as systemd.target with 22.05
-    Unit = {
-      Requisite = mkForce [ ];
-      After = mkForce [ ];
-      PartOf = [ "tray.target" ];
-    };
-  };
 }