5 files changed, 90 insertions, 10 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 803b3a0d..924d3843 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -245,7 +245,7 @@ in {
       Service = {
         Type = "simple";
         Sockets = [ "niri-workspace-history.socket" ];
-        ExecStart = pkgs.writers.writePython3 "niri-workspace-history" {} ''
+        ExecStart = pkgs.writers.writePython3 "niri-workspace-history" { flakeIgnore = ["E501"]; } ''
           import os
           import socket
           import json
@@ -274,7 +274,7 @@ in {
 
               def focus_workspace(output, workspace):
                   with history_lock:
-                      workspace_history[output] = [workspace] + [ws for ws in workspace_history[output] if ws != workspace]  # noqa: E501
+                      workspace_history[output] = [workspace] + [ws for ws in workspace_history[output] if ws != workspace]
                       # print(json.dumps(workspace_history), file=sys.stderr)
 
               sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -297,14 +297,14 @@ in {
 
           class RequestHandler(StreamRequestHandler):
               def handle(self):
-                  with detaching(TextIOWrapper(self.wfile, encoding='utf-8', write_through=True)) as out:  # noqa: E501
+                  with detaching(TextIOWrapper(self.wfile, encoding='utf-8', write_through=True)) as out:
                       with history_lock:
                           json.dump(workspace_history, out)
 
 
           class Server(ThreadingTCPServer):
               def __init__(self):
-                  ThreadingTCPServer.__init__(self, ("", 8000), RequestHandler, bind_and_activate=False)  # noqa: E501
+                  ThreadingTCPServer.__init__(self, ("", 8000), RequestHandler, bind_and_activate=False)
                   self.socket = socket.fromfd(3, self.address_family, self.socket_type)
 
 
@@ -330,6 +330,79 @@ in {
         '';
       };
     };
+    systemd.user.services.niri-workspace-sort = {
+      Unit = {
+        BindsTo = [ "niri.service" ];
+        After = [ "niri.service" ];
+      };
+      Install = {
+        WantedBy = [ "niri.service" ];
+      };
+      Service = {
+        Type = "simple";
+        ExecStart = pkgs.writers.writePython3 "niri-workspace-sort" { flakeIgnore = ["E501"]; } ''
+          import os
+          import sys
+          import socket
+          import json
+
+          outputs = None
+          only = {'HDMI-A-1': {'bmr'}, 'eDP-1': {'vid'}}
+
+
+          class Niri(socket.socket):
+              def __init__(self):
+                  super().__init__(socket.AF_UNIX, socket.SOCK_STREAM)
+                  super().connect(os.environ["NIRI_SOCKET"])
+                  self.fh = super().makefile(mode='rw', buffering=1, encoding='utf-8')
+
+              def cmd(self, obj):
+                  print(json.dumps(obj, separators=(',', ':')), flush=True, file=self.fh)
+
+              def event_stream(self):
+                  self.cmd("EventStream")
+                  return self.fh
+
+
+          with Niri() as niri, Niri().event_stream() as niri_stream:
+              for line in niri_stream:
+                  workspaces = None
+                  if line_json := json.loads(line):
+                      if "WorkspacesChanged" in line_json:
+                          workspaces = line_json["WorkspacesChanged"]["workspaces"]
+
+                  if workspaces is None:
+                      continue
+
+                  old_outputs = outputs
+                  outputs = {ws["output"] for ws in workspaces}
+                  if old_outputs is None:
+                      print("Initial outputs: {}".format(outputs), file=sys.stderr)
+                      continue
+
+                  new_outputs = outputs - old_outputs
+                  if not new_outputs:
+                      continue
+                  print("New outputs: {}".format(new_outputs), file=sys.stderr)
+
+                  relevant_workspaces = list(filter(lambda ws: (ws["name"] is not None) or (ws["active_window_id"] is not None), workspaces))
+                  target_output = next(iter(outputs - set(only.keys())))
+                  if not target_output:
+                      continue
+                  for ws in relevant_workspaces:
+                      ws_ident = ws["name"] if ws["name"] is not None else (ws["output"], ws["idx"])
+                      if ws["output"] not in set(only.keys()):
+                          continue
+                      if ws_ident in only[ws["output"]]:
+                          continue
+
+                      print("{} -> {}".format(ws_ident, target_output), file=sys.stderr)
+                      niri.cmd({"Action": {"MoveWorkspaceToMonitor": {"reference": {"Id": ws["id"]}, "output": target_output}}})
+        '';
+        Restart = "on-failure";
+        RestartSec = 10;
+      };
+    };
 
     programs.niri.scratchspaces = [
       { name = "pwctl";
@@ -415,6 +488,10 @@ in {
             ])
           ])
 
+          (plain "gestures" [
+            (plain "hot-corners" [(flag "off")])
+          ])
+
           (plain "environment" (lib.mapAttrsToList leaf {
             NIXOS_OZONE_WL = "1";
             QT_QPA_PLATFORM = "wayland";
@@ -422,6 +499,7 @@ in {
             GDK_BACKEND = "wayland";
             SDL_VIDEODRIVER = "wayland";
             DISPLAY = ":0";
+            ELECTRON_OZONE_PLATFORM_HINT = "auto";
           }))
 
           (node "output" "eDP-1" [
@@ -705,7 +783,7 @@ in {
                   }));
                   "Print".action = screenshot;
                   "Control+Print".action = screenshot-window;
-                  # "Shift+Print".action = screenshot-screen;
+                  "Shift+Print".action = kdl.magic-leaf "screenshot-screen";
                   "Mod+B".action = with-select-window-action ".workspace_id == ($active_workspace | tonumber)" "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}";
                   "Mod+Shift+B".action = with-select-window-action "true" "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}";
 
diff --git a/accounts/gkleen@sif/niri/mako.nix b/accounts/gkleen@sif/niri/mako.nix
index 9373dc21..274441ab 100644
--- a/accounts/gkleen@sif/niri/mako.nix
+++ b/accounts/gkleen@sif/niri/mako.nix
@@ -16,7 +16,7 @@
         max-icon-size = 48;
       };
       criteria = {
-        grouped.format = "<b>(%g)</b> <i>%s</i>\n%b";
+        grouped.format = "<b>(%g)</b> <i>%s</i>\\n%b";
         "urgency=low".text-color = "#999999ff";
         "urgency=critical".background-color = "#900000dd";
         "app-name=Element".group-by = "summary";
diff --git a/accounts/gkleen@sif/niri/swayosd.nix b/accounts/gkleen@sif/niri/swayosd.nix
index 984927c2..54ebb302 100644
--- a/accounts/gkleen@sif/niri/swayosd.nix
+++ b/accounts/gkleen@sif/niri/swayosd.nix
@@ -3,9 +3,10 @@
   config = {
     services.swayosd = {
       enable = true;
-      topMargin = 0.946154;
+      topMargin = 0.4769706078;
       stylePath = pkgs.runCommand "style.css" {
-        src = pkgs.writeText "style.scss" ''
+        passAsFile = [ "src" ];
+        src = ''
           window#osd {
             padding: 12px 20px;
             border-radius: 999px;
@@ -59,7 +60,7 @@
           }
         '';
         buildInputs = with pkgs; [sass];
-      } "scss -C --sourcemap=none --style=compact $src $out";
+      } "scss -C --sourcemap=none --style=compact $srcPath $out";
     };
   };
 }
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index 4666d1d6..845f6455 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -364,6 +364,7 @@ in {
       domains = [ "surtr.yggdrasil.li" ] ++ concatMap (domain: [".${domain}" domain]) emailDomains;
       separator = "+";
       extraConfig = ''
+        socketmap = unix:/run/postsrsd/postsrsd-socketmap.sock
         milter = unix:/run/postsrsd/postsrsd-milter.sock
       '';
     };
diff --git a/hosts/vidhar/prometheus/default.nix b/hosts/vidhar/prometheus/default.nix
index d368ad52..b1d90d47 100644
--- a/hosts/vidhar/prometheus/default.nix
+++ b/hosts/vidhar/prometheus/default.nix
@@ -26,7 +26,7 @@ in {
       enable = true;
 
       extraFlags = [
-        "--enable-feature=remote-write-receiver"
+        "--web.enable-remote-write-receiver"
       ];
 
       exporters = {