Changed Waybar

home/hyprland/waybar/single.nix

@@ -1,150 +1,39 @@
+let
+  common = import ./common.nix;
+  hyprland = import ./hyprland.nix;
+in
 {
   enable = true;
   settings = {
-    mainBar = {
-      layer = "top";
-      position = "top";
-      height = 30;
-      output = [
-        "eDP-1"
-        "DP-1"
-        "HDMI-A-1"
-        "Virtual-1"
-      ];
-
-      modules-left = [
-        "hyprland/workspaces"
-        "mpris"
-      ];
-
-      modules-center = [
-        "custom/weather"
-      ];
-
-      modules-right = [
-        "network"
-        "memory"
-        "cpu"
-        "clock"
-      ];
-
-      # Widgets
-      "sway/workspaces" = {
-        disable-scroll = true;
-        all-outputs = true;
-      };
-
-      mpris = {
-        format = "{player_icon} {dynamic}";
-        format-paused = "<span color='grey'>{status_icon} {dynamic}</span>";
-        max-length = 100;
-
-        player-icons = {
-          default = "⏸";
-          mpv = "🎵";
-        };
-
-        status-icons = {
-          paused = "▶";
-        };
-      };
-
-      "hyprland/workspaces" = {
-        format = "{icon}";
-        format-icons = {
-          default = "";
-          active = "";
-        };
-      };
-
-      network = {
-        tooltip = true;
-        format-wifi = "{icon} ";
-        format-icons = [
-          "󰤟"
-          "󰤢"
-          "󰤥"
+    mainBar =
+      {
+        layer = "top";
+        position = "top";
+        height = 30;
+        /*
+          Waybar should use every display available if not output is specified
+          output = [
+            "eDP-1"
+            "DP-1"
+            "HDMI-A-1"
+            "Virtual-1"
+          ];
+        */
+        modules-left = [
+          "custom/nixicon"
+          "clock"
+          "group/media"
         ];
-        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 = [
-          "󰝦"
-          "󰪞"
-          "󰪟"
-          "󰪠"
-          "󰪡"
-          "󰪢"
-          "󰪣"
-          "󰪤"
-          "󰪥"
+        modules-center = [
+          "hyprland/workspaces"
         ];
-        max-length = 10;
-      };
-
-      cpu = {
-        interval = 1;
-        format = "{icon}";
-        rotate = 270;
-        format-icons = [
-          "󰝦"
-          "󰪞"
-          "󰪟"
-          "󰪠"
-          "󰪡"
-          "󰪢"
-          "󰪣"
-          "󰪤"
-          "󰪥"
+        modules-right = [
+          "custom/weather"
+          "group/hardware"
         ];
-      };
-
-      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";
-        restart-interval = 900;
-        return-type = "json";
-      };
-
-    };
+        # Widget configurations
+      }
+      // common.widgets
+      // hyprland.widgets;
   };
-
 }