fix espanso on elecrta, waybar tweaks, wol experiments

home/wm/sway.nix

@@ -100,11 +100,14 @@
         }; # end swayidle
       }
       else {};
-    hostnameInputs =
-      if hostName == "tower" then "us,se"
-      else "se,us";
+    hostnameInput1 =
+      if hostName == "tower" then "us"
+      else "se";
+    hostnameInput2 =
+      if hostName == "tower" then "se"
+      else "us";
   in
-  {
+{
   wayland.windowManager.sway = {
     enable = true;
     wrapperFeatures.gtk = true;
@@ -123,6 +126,7 @@
           middle_emulation = "enabled";
           click_method = "clickfinger";
           clickfinger_button_map = "lrm";
+          scroll_factor = "0.6";
         };
         "type:mouse" = {
           natural_scroll = "disabled";
@@ -130,7 +134,7 @@
           pointer_accel = "0.5";
         };
         "*" = {
-          xkb_layout = hostnameInputs;
+          xkb_layout = "${hostnameInput1},${hostnameInput2}";
           xkb_options = "grp:win_space_toggle";
         };
       }; # end input
@@ -253,26 +257,19 @@
           toggle_key = "OFF";
           preserve_clipboard = true;
           show_notifications = true;
+          keyboard_layout = { layout="${hostnameInput1}"; };
         };
       };
       matches = {
         base = {
           matches = [
             {
-              trigger = ":date";
-              replace = "{{currentdate}}";
-            }
-            {
-              trigger = ":time";
-              replace = "{{currenttime}}";
-            }
-            {
-              trigger = ":ip";
-              replace = "{{pubip}}";
+              trigger = ":ip ";
+              replace = "{{pubip}} ";
             }
             {
               regex = ":em(?P<emname>\\S+) ";
-              replace = "{{emoji}}";
+              replace = "{{emoji}} ";
               vars = [
                 {
                   name = "emoji";
@@ -287,16 +284,6 @@
         };
         global_vars = {
           global_vars = [
-            {
-              name = "currentdate";
-              type = "date";
-              params = {format = "%Y-%m-%d";};
-            }
-            {
-              name = "currenttime";
-              type = "date";
-              params = {format = "%R";};
-            }
             {
               name = "pubip";
               type = "shell";
@@ -361,6 +348,7 @@
             "tray"
             "idle_inhibitor"
             "network"
+            "bluetooth"
             "pulseaudio"
             "battery"
             "sway/language"
@@ -388,12 +376,13 @@
           };
           "sway/language" = {
             format = "| {flag}";
+            tooltip-format = "{long}";
           };
           "clock" = {
             interval = 60;
             tooltip = true;
-            format = "| {:%Y-%m-%d %R}";
-            tooltip-format = "{:%A}";
+            format = "| {:%H:%M}";
+            tooltip-format = "{:%Y-%m-%d}";
           };
           "battery" = {
             interval = 60;
@@ -415,13 +404,20 @@
             format-ethernet = "| ⇄";
             format-linked = "| 🔗";
             format-disconnected = "| ⛓️‍💥";
-            format-alt = "| {essid}: {ipaddr}";
             interval = 15;
+            on-click = "${uwsm} ${term} -e nmtui";
+          };
+          "bluetooth" = {
+            format-connected = "| ᛒ";
+            format-disconnected = "| ᚧ";
+            interval = 15;
+            on-click = "${uwsm} ${term} -e bluetui";
           };
           "pulseaudio" = {
             format = "| 🔊{volume}%";
             format-muted = "| 🔈0%";
             format-bluetooth = "| 🎧{volume}%";
+            on-click = "${uwsm} pavucontrol";
           };
         }; # end mainbar
       }; # end settings
@@ -502,7 +498,6 @@
       };
     };
   };
-  
   systemd.user.sessionVariables = {
     # this right here offends me https://source.chromium.org/chromium/chromium/src/+/main:base/nix/xdg_util.cc;l=179-180
     # setting GNOME_DESKTOP_SESSION_ID will fool some legacy systems into thinking we're running gnome