Add privacy module to waybar, fix pcmanfm against a config

modules/home/wms/programs/waybar/default.nix

@@ -3,6 +3,7 @@
   programs.waybar = let
     swayWorkspaceModule = {
       format = "{name}";
+      sort-by-number = true;
       enable-bar-scroll = true;
       warp-on-scroll = false;
       disable-scroll-wraparound = true;
@@ -38,16 +39,18 @@
       ];
     };
 
-    # CPU, Ram and Vram
+    # Monitoring
     cpuModule = {
       format = "  {usage}%";
       interval = 3;
     };
+
     ramModule = {
       format = "  {used}G";
       tooltip = false;
       interval = 3;
     };
+
     vramModule = {
       exec = pkgs.writeScript "vramScript" ''
         # Don't run the script if running on integrated graphics
@@ -94,6 +97,7 @@
       interval = 1;
       tooltip = true;
     };
+
     shortClockModule = {
       exec = "echo '  '$(date +'%l:%M%p' | sed 's/^ //')";
       on-click = ''wl-copy $(date "+%Y-%m-%d-%H%M%S"); notify-send "Date copied."'';
@@ -101,8 +105,9 @@
       tooltip = false;
     };
 
-    # Tray, gamemode, bluetooth, and network tray modules
+    # Misc
     trayModule.spacing = 5;
+
     networkModule = {
       format-ethernet = "󰈀";
       format-wifi = "";
@@ -112,6 +117,7 @@
       tooltip-format-wifi = "{ipaddr}\n{essid} ({signalStrength}%)";
       tooltip-format-disconnected = "Disconnected";
     };
+
     bluetoothModule = {
       format = "";
       format-disabled = "";
@@ -122,24 +128,30 @@
       tooltip-format-enumerate-connected-battery = "{device_alias} {device_battery_percentage}%";
       on-click = "rofi-bluetooth";
     };
+
     scratchpadModule = {
       format = "   {count}";
       show-empty = false;
       tooltip = true;
       tooltip-format = "{title}";
     };
+
     gamemodeModule = {
       format = "{glyph}";
       glyph = "󰖺";
       hide-not-running = true;
       use-icon = true;
-      icon-spacing = 3;
       icon-size = 19;
+      icon-spacing = 3;
       tooltip = true;
       tooltip-format = "Gamemode On";
     };
 
-    # Special per-bar modules
+    privacyModule = {
+      icon-spacing = 5;
+      icon-size = 15;
+    };
+
     mediaModule = {
       format = "  {title}";
       format-paused = "  {artist}";
@@ -170,6 +182,7 @@
       interval = 2;
       on-click = "makotoggle";
     };
+
     weatherModule = {
       exec = "${pkgs.wttrbar}/bin/wttrbar --ampm";
       format = "{}°";
@@ -199,7 +212,7 @@
       display1 = {
         name = "bar1";
         position = "top";
-        layer = "bottom";
+        layer = "top";
         output = [
           config.displays.d1
           "VGA-1"
@@ -218,6 +231,7 @@
           "custom/clock-long"
           "gamemode"
           "sway/scratchpad"
+          "privacy"
           "tray"
           "bluetooth"
           "network"
@@ -231,6 +245,7 @@
         "custom/vram" = vramModule;
         "custom/clock-long" = longClockModule;
         "gamemode" = gamemodeModule;
+        "privacy" = privacyModule;
         "sway/scratchpad" = scratchpadModule;
         "tray" = trayModule;
         "bluetooth" = bluetoothModule;
@@ -239,7 +254,7 @@
       display2 = {
         name = "bar2";
         position = "top";
-        layer = "bottom";
+        layer = "top";
         output = [ config.displays.d2 ];
         modules-left = [
           "sway/workspaces"
@@ -270,7 +285,7 @@
       display3 = {
         name = "bar3";
         position = "top";
-        layer = "bottom";
+        layer = "top";
         output = [ config.displays.d3 ];
         modules-left = [
           "sway/workspaces"