1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110

diff --git a/apps/gui/waybar.nix b/apps/gui/waybar.nix
index abb7fa0a7ffa90d4a72b8905fd4c1ea4b410efc6..fc651edc0059727b61aa0e8bae8d22197bd26d8e 100644
--- a/apps/gui/waybar.nix
+++ b/apps/gui/waybar.nix
@@ -3,10 +3,26 @@ {
   programs.waybar = {
     enable = true;
     settings.bar = {
+      network = {
+        format-alt = "{icon} {signalStrength}%";
+        tooltip-format-wifi = "{icon} {essid} {signalStrength}%";
+        format = "{icon}";
+        format-disabled = "󰤭";
+        on-click-right = "${pkgs.lib.getExe' pkgs.networkmanagerapplet "nm-connection-editor"}";
+        format-icons = [
+          "󰤯"
+          "󰤟"
+          "󰤢"
+          "󰤥"
+          "󰤨"
+        ];
+      };
       backlight = {
         device = "intel_backlight";
+        format-alt = "{icon} {percent}%";
         format = "{icon}";
         format-icons = [
+          ""
           ""
           ""
           ""
@@ -16,11 +32,12 @@           ""
           ""
           ""
           ""
+          ""
         ];
       };
       battery = {
+        format-alt = "{icon} {capacity}%";
         format = "{icon}";
-        format-alt = "{icon}";
         format-charging = "󰂄";
         format-icons = [
           "󰁺"
@@ -40,8 +57,8 @@           warning = 30;
         };
       };
       clock = {
-        format = "🕒 {:%I:%M %p}";
-        format-alt = "📅 {:%m/%d/%Y}";
+        format = "󰥔 {:%I:%M %p}";
+        format-alt = " {:%m/%d/%Y}";
         timezone = "America/Chicago";
         tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
       };
@@ -53,6 +70,7 @@       };
       "custom/power" = {
         format = "⏻";
         on-click = "${pkgs.lib.getExe pkgs.wlogout} &";
+        on-click-right = "swaylock & systemctl suspend";
         tooltip = false;
       };
       layer = "top";
@@ -60,6 +78,7 @@       modules-right = [
         "pulseaudio"
         "backlight"
         "battery"
+        "network"
         "clock"
         "tray"
         "custom/lock"
@@ -67,7 +86,8 @@         "custom/power"
       ];
       position = "top";
       pulseaudio = {
-        format = "{icon}  {volume}%";
+        format-alt = "{icon} {volume}%";
+        format = "{icon}";
         format-icons = {
           default = [
             ""
@@ -76,7 +96,7 @@             " "
           ];
         };
         format-muted = "";
-        on-click = "${pkgs.lib.getExe pkgs.pavucontrol}";
+        on-click-right = "${pkgs.lib.getExe pkgs.pavucontrol}";
       };
       tray = {
         icon-size = 21;
@@ -96,6 +116,7 @@         color: @text;
         margin: 5px 5px;
       }
 
+      #network,
       #tray,
       #backlight,
       #clock,
@@ -132,6 +153,10 @@       }
 
       #backlight, #battery {
           border-radius: 0;
+      }
+
+      #network {
+        color: @lavender;
       }
 
       #pulseaudio {

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/apps/gui/wlogout.nix b/apps/gui/wlogout.nix
index 54fe8b3c73d0d1e725982f74870f88fffa75f51b..4de9aa5599abc4298b327caae0a4a55c8e79459a 100644
--- a/apps/gui/wlogout.nix
+++ b/apps/gui/wlogout.nix
@@ -28,7 +28,7 @@         "keybind" = "s";
       }
       {
         "label" = "suspend";
-        "action" = "systemctl suspend";
+        "action" = "swaylock & systemctl suspend";
         "text" = "Suspend";
         "keybind" = "u";
       }