configure new modules

1 files changed, 34 insertions, 9 deletions

diff --git a/modules/waybar.nix b/modules/waybar.nix
index 5653b08..4d45349 100644
--- a/modules/waybar.nix
+++ b/modules/waybar.nix
@@ -3,21 +3,46 @@
 {
   options.waybar.enable = lib.mkEnableOption "Enable and configure Waybar";
   config = lib.mkIf config.waybar.enable {
+
     programs.waybar = {
       enable = true;
       settings = {
         mainBar = {
-          height = 20;
+          height = 15;
           layer = "top";
           position = "bottom";
-          tray = { spacing = 10; };
-          modules-center = [ "sway/window" ];
-          modules-left = [ "sway/workspaces" "sway/mode" ];
+          modules-center = [ ];
+          modules-left = [ "sway/workspaces" ];
           modules-right = [
+            "tray"
+            "privacy"
+            "battery"
             "pulseaudio"
+            "network"
+            "bluetooth"
             "clock"
-            "tray"
           ];
+
+          tray = { spacing = 10; };
+
+          privacy = { icon-size = 16; };
+
+          network = {
+            format-disconnect = "";
+            format-ethernet = "";
+            format-wifi = "{icon} {signalStrength}";
+            format-icon = [ "󰤟" "󰤢" "󰤥" "󰤨" ];
+            tooltip-format-wifi = "{essid}";
+            tooltip-format-ethernet = "{ifname}";
+          };
+
+          bluetooth = {
+            format = " {status}";
+            format-disabled = "";
+            format-no-controller = "";
+            format-connected = " {device_alias}";
+            tooltip = false;
+          };
           
           clock = {
             format-alt = "{:%Y-%m-%d}";
@@ -25,7 +50,7 @@
           };
 
           pulseaudio = {
-            format = "{volume}% {icon}";
+            format = "{icon} {volume}%";
             format-bluetooth = "{volume}% {icon}";
             format-icons = {
               default = [ "" "" "" ];
@@ -43,7 +68,7 @@
         }
 
         window#waybar {
-          background: #000000;
+          background: rgba(0, 0, 0, 0.9);
         }
 
         #workspaces button {
@@ -51,11 +76,11 @@
           padding-right: 5px;
         }
 
-        #clock, #pulseaudio, #tray {
+        #clock, #pulseaudio, #tray, #network, battery, bluetooth {
           padding-left: 5px;
           padding-right: 5px;
         }
       '';
     };
   };
-}
\ No newline at end of file
+}