1 files changed, 22 insertions, 31 deletions
diff --git a/users/fcuny/desktop/sway/waybar.nix b/users/fcuny/desktop/sway/waybar.nix
index f71e914..13ee9eb 100644
--- a/users/fcuny/desktop/sway/waybar.nix
+++ b/users/fcuny/desktop/sway/waybar.nix
@@ -4,35 +4,26 @@
   programs.waybar = {
     enable = true;
     systemd.enable = true;
-
-    settings = [{
-      layer = "top";
-      position = "top";
-      height = 30;
-      modules-left = [ "sway/workspaces" ];
-      modules-right = [ "custom/clock" ];
-      modules = {
-        "sway/workspaces" = {
-          disable-scroll = true;
-          all-outputs = true;
-        };
-
-        "custom/clock" = {
-          interval = 30;
-          format = "{%a %b %d %H:%M}";
-        };
-      };
-    }];
-
-    style = ''
-      * {
-        border: none;
-        border-radius: 0;
-        font-size: 15px;
-        min-height: 0;
-        margin: 2px;
-        font-weight: normal;
-      }
-    '';
-  };
+       settings = [{
+          layer = "top";
+          position = "top";
+          height = 24;
+          modules-left = ["sway/workspaces" "sway/mode"];
+          modules-center = ["sway/window"];
+          modules-right = [ "network" "pulseaudio" "clock" ];
+          modules = {
+            "network" = {
+              format-wifi = "{essid} ({signalStrength}%)";
+              format-ethernet = "{ifname}: {ipaddr}/{cidr}";
+              format-disconnected = "Disconnected";
+            };
+            "pulseaudio" = {
+              format = "{icon} {volume}%";
+            };
+            "clock" = {
+              format = "{:%a %d %b %H:%M}";
+            };
+          };
+        }];
+};
 }