11 files changed, 478 insertions, 147 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index e07362fc..a1a694ea 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -71,6 +71,7 @@ in {
       imports = [
         ./libvirt
         ./niri
+        ./synadm
         flakeInputs.nix-index-database.hmModules.nix-index
         flakeInputs.impermanence.nixosModules.home-manager.impermanence
       ];
@@ -171,6 +172,7 @@ in {
             };
           };
         };
+        chromium.enable = true;
 
         zathura = {
           enable = true;
@@ -282,6 +284,16 @@ in {
           pro = "$HOME/projects/pro";
           media = "$HOME/media";
         };
+        jq.colors = {
+          arrays = "1;37";
+          "false" = "0;37";
+          "null" = "2;37";
+          numbers = "0;37";
+          objectKeys = "1;34";
+          objects = "1;37";
+          strings = "0;32";
+          "true" = "0;37";
+        };
 
         obs-studio = {
           enable = true;
@@ -317,8 +329,10 @@ in {
             # notify_on_cmd_finish = "invisible 120";
           };
           keybindings = {
-            "kitty_mod+n" = "detach_window";
+            "kitty_mod+n" = "new_os_window_with_cwd";
             "kitty_mod+m" = "detach_window ask";
+            "kitty_mod+enter" = "new_window_with_cwd";
+            "kitty_mod+t" = "new_tab_with_cwd";
           };
         };
         fuzzel = {
@@ -331,7 +345,7 @@ in {
               font = "Fira Sans";
             };
             colors = {
-              background = "000000aa";
+              background = "000000cc";
               text = "cdd6f4ff";
               match = "94e2d5ff";
               selection = "585b70ff";
@@ -352,6 +366,7 @@ in {
           enable = true;
           settings.show_banner = false;
         };
+        fd.enable = true;
       };
 
       services = {
@@ -477,6 +492,13 @@ in {
         };
       };
 
+      qt.kde.settings = {
+        kwalletrc = {
+          KSecretD.Enabled = false;
+          Wallet."Default Wallet" = "store";
+        };
+      };
+
       xsession.preferStatusNotifierItems = true;
 
       xresources.properties = import ./xresources.nix;
@@ -488,16 +510,15 @@ in {
           wrappedYTMDesktop libsForQt5.qt5ct playerctl evince papers
           thunderbird zoom-us xdg-desktop-portal steam steam-run
           wireshark virt-manager rclone cached-nix-shell worktime
-          fira-code-symbols libreoffice xournalpp google-chrome
+          fira-code-symbols libreoffice xournalpp
           nixos-shell virt-viewer freerdp gnome-icon-theme
           paper-icon-theme sshpassSecret weechat element-desktop
           sieve-connect gimp3 inkscape udiskie glab nitrokey-app
           pynitrokey gtklock wlrctl remmina openscad spice-record
           libguestfs-with-appliance nerd-fonts.fira-mono
           nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
-          swtpm (hunspellWithDicts (with hunspellDicts; [en_GB-large de_DE]))
-          libation
-          # synadm
+          swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE]))
+          libation libqalculate
         ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg {}) (customUtils.nixImport { dir = ./utils; });
 
         file = {
@@ -520,6 +541,7 @@ in {
           STACK_XDG = 1;
           EDITOR = lib.getExe' editor "emacsclient";
           RCLONE_PASSWORD_COMMAND = "${lib.getExe' pkgs.libsecret "secret-tool"} lookup service rclone";
+          SYSTEMD_TINT_BACKGROUND = "false";
         };
 
         extraProfileCommands = ''
@@ -556,9 +578,17 @@ in {
             General = {
               dot_as_separator = 0;
             };
+            Mode = {
+              calculate_as_you_type = 1;
+            };
           };
         };
-        "emacs/init.el".source = ./emacs.el;
+        "emacs/init.el".source = pkgs.substitute {
+          src = ./emacs.el;
+          substitutions = [
+            "--subst-var-by" "ksshaskpass" (lib.getExe pkgs.kdePackages.ksshaskpass)
+          ];
+        };
         "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = ''
           [Unit]
           After=graphical-session.target
@@ -576,6 +606,8 @@ in {
       xdg.dataFile = {
         "dbus-1/services/org.keepassxc.KeePassXC.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.keepassxc.KeePassXC.service";
         "dbus-1/services/org.freedesktop.secrets.service.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.freedesktop.secrets.service.service";
+        "dbus-1/services/org.kde.kwalletd6.service".source = "${pkgs.kdePackages.kwallet}/share/dbus-1/services/org.kde.kwalletd6.service";
+        "dbus-1/services/org.kde.kwalletd5.service".source = "${pkgs.kdePackages.kwallet}/share/dbus-1/services/org.kde.kwalletd5.service";
         "emoji-data/list.txt".source = pkgs.stdenv.mkDerivation {
           inherit (sources.emoji-data) pname src;
           version = lib.removePrefix "v" sources.emoji-data.version;
@@ -663,11 +695,11 @@ in {
             exec -- \
               ${lib.getExe' config.systemd.package "systemd-run"} --wait --user --slice-inherit \
               --property 'CPUAccounting=yes' --property 'CPUQuotaPeriodSec=50ms' \
-              --property 'Environment=DSCP=46' \
-              -- ${lib.getExe pkgs.dscp} ${lib.getExe' pkgs.google-chrome "google-chrome-stable"} \
+              -E DSCP=46 -E NIXOS_OZONE_WL \
+              -- ${lib.getExe pkgs.dscp} ${lib.getExe cfg.programs.chromium.package} \
               --class=Rainbow \
-              --kiosk "https://web.openrainbow.com" \
-              --user-data-dir=''${HOME}/.config/google-chrome-rainbow
+              --app="https://web.openrainbow.com" \
+              --user-data-dir=''${HOME}/.config/chromium-rainbow
           '');
           icon = pkgs.fetchurl {
             url = "https://web.openrainbow.com/rb/2.139.17/assets/skins/rainbow/images/homepage/logo__rainbow.svg";
@@ -677,6 +709,42 @@ in {
             StartupWMClass = "Rainbow";
           };
         };
+        kimai = {
+          name = "Kimai";
+          exec = toString (pkgs.writeShellScript "kimai" ''
+            exec -- \
+              ${lib.getExe cfg.programs.chromium.package} \
+              --class=Kimai \
+              --app="https://kimai.yggdrasil.li" \
+              --user-data-dir=''${HOME}/.config/chromium-kimai
+          '');
+          icon = pkgs.fetchurl {
+            url = "https://www.kimai.org/images/kimai_logo.png";
+            hash = "sha256-lnlOttzR2SwXA70R+egJUkeKr4U5V0avqTk8uX4bqfs=";
+          };
+          settings = {
+            StartupWMClass = "Kimai";
+            StartupNotify = "true";
+          };
+        };
+        audiobookshelf = {
+          name = "Audiobookshelf";
+          exec = toString (pkgs.writeShellScript "audiobookshelf" ''
+            exec -- \
+              ${lib.getExe cfg.programs.chromium.package} \
+              --class=Audiobookshelf \
+              --app="https://audiobookshelf.yggdrasil.li" \
+              --user-data-dir=''${HOME}/.config/chromium-audiobookshelf
+          '');
+          icon = pkgs.fetchurl {
+            url = "https://www.audiobookshelf.org/Logo.png";
+            hash = "sha256-JGPk+WNT1C4DC4lSMb0K0YmAMT5LvmSOeO0QRzkc7Lk=";
+          };
+          settings = {
+            StartupWMClass = "Audiobookshelf";
+            StartupNotify = "true";
+          };
+        };
         thunderbird-lmu = {
           name = "Thunderbird (LMU)";
           exec = "thunderbird --name thunderbird -P lmu %U";
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index 563c5d0b..3beefba6 100644
--- a/accounts/gkleen@sif/emacs.el
+++ b/accounts/gkleen@sif/emacs.el
@@ -254,3 +254,5 @@ necessarily running."
 (bind-key "C-x C-m" #'move-file)
 
 (let ((ssh_auth_sock (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))) (setenv "SSH_AUTH_SOCK" ssh_auth_sock))
+(setenv "SSH_ASKPASS_REQUIRE" "prefer")
+(setenv "SSH_ASKPASS" "@ksshaskpass@")
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 803b3a0d..35a3d799 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -3,6 +3,7 @@ let
   cfg = config.programs.niri;
 
   kdl = flakeInputs.niri-flake.lib.kdl;
+  sleaf = name: arg: kdl.node name [arg] [];
 
   niri = cfg.package;
   terminal = lib.getExe config.programs.kitty.package;
@@ -35,7 +36,11 @@ let
           if jq -e '.is_focused' <<<"$window_json" >/dev/null; then
             niri msg action focus-workspace-previous
           else
-            niri msg action focus-window --id "$(jq -r '.id' <<<"$window_json")"
+            if [[ $(jq -r --arg workspace_name "$workspace_name" 'map(select(.name == $workspace_name)) | .[0].is_focused' <<<"$workspaces_json") != "true" ]] && [[ $(jq -r --arg workspace_name "$workspace_name" 'map(select(.name == $workspace_name)) | .[0].id' <<<"$workspaces_json") = $(jq -r '.workspace_id' <<<"$window_json") ]]; then
+                niri msg action focus-workspace "$workspace_name"
+            else
+                niri msg action focus-window --id "$(jq -r '.id' <<<"$window_json")"
+            fi
           fi
           exit 0
         fi
@@ -45,7 +50,6 @@ let
     '';
   };
   focus-or-spawn-action = config.lib.niri.actions.spawn (lib.getExe focus_or_spawn);
-  focus-or-spawn-action-app_id = app_id: focus-or-spawn-action ''select(.app_id == "${app_id}")'';
 
   with_adjacent_workspace = pkgs.writeShellApplication {
     name = "with-adjacent-workspace";
@@ -84,7 +88,7 @@ let
   };
   with-adjacent-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_adjacent_workspace) "^${lib.concatMapStringsSep "|" ({ name, ...}: name) cfg.scratchspaces}$";
   focus-adjacent-workspace = direction: with-adjacent-workspace-action direction ''{"Action":{"FocusWorkspace":{"reference":{"Id": .id}}}}'';
-  move-column-to-adjacent-workspace = direction: with-adjacent-workspace-action direction ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}}}}'';
+  move-column-to-adjacent-workspace = direction: with-adjacent-workspace-action direction ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}, "focus": true}}}'';
 
   with_unnamed_workspace = pkgs.writeShellApplication {
     name = "with-unnamed-workspace";
@@ -131,7 +135,7 @@ let
 
       windows_json="$(niri msg -j windows)"
       active_workspace="$(jq -r '.[] | select(.is_focused) | .workspace_id' <<<"$windows_json")"
-      window_ix="$(gojq -r --arg active_workspace "$active_workspace" '.[] | select('"$window_select"') | "\(.title)\u0000icon\u001f\(.app_id)"' <<<"$windows_json" | fuzzel --log-level=warning --dmenu --index)"
+      window_ix="$(gojq -r --arg active_workspace "$active_workspace" '.[] | select('"$window_select"') | "\(.title)\u0000icon\u001f\(.app_id)"' <<<"$windows_json" | fuzzel --width=60 --log-level=warning --dmenu --index)"
       # shellcheck disable=SC2016
       window_json="$(gojq -rc --arg active_workspace "$active_workspace" --arg window_ix "$window_ix" 'map(select('"$window_select"')) | .[($window_ix | tonumber)]' <<<"$windows_json")"
 
@@ -141,6 +145,25 @@ let
     '';
   };
   with-select-window-action = config.lib.niri.actions.spawn (lib.getExe with_select_window);
+
+  with_predicate_window = pred: pkgs.writeShellApplication {
+    name = "with-predicate-window";
+    runtimeInputs = [ niri pkgs.gojq pkgs.socat ];
+    text = ''
+      action="$1"
+      shift
+
+      windows_json="$(niri msg -j windows)"
+      window_json="$(gojq -rc 'map(select(${pred})) | .[0]' <<<"$windows_json")"
+
+      [[ -z "$window_json" || $window_json = "null" ]] && exit 1
+
+      jq -c "$action" <<<"$window_json" | socat STDIO "$NIRI_SOCKET"
+    '';
+  };
+
+  with-urgent-window-action = config.lib.niri.actions.spawn (lib.getExe (with_predicate_window ".is_urgent"));
+  with-focused-window-action = config.lib.niri.actions.spawn (lib.getExe (with_predicate_window ".is_focused"));
 in {
   imports = [
     ./waybar.nix
@@ -171,6 +194,17 @@ in {
             type = lib.types.nullOr lib.types.str;
             default = null;
           };
+          moveKey = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = let
+              keys = lib.splitString "+" config.key;
+              defMoveKey = lib.concatStringsSep "+" (lib.flatten [
+                (lib.take (lib.length keys - 1) keys)
+                ["Shift"]
+                (lib.takeEnd 1 keys)
+              ]);
+            in if config.key == null then null else defMoveKey;
+          };
           spawn = lib.mkOption {
             type = lib.types.nullOr (lib.types.listOf lib.types.str);
             default = null;
@@ -245,7 +279,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 +308,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 +331,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 +364,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";
@@ -343,8 +450,8 @@ in {
           { title = "^Access Request.*"; }
           { title = ".*Passkey credentials$"; }
         ];
-        windowRuleExtra = [
-          (kdl.leaf "open-focused" false)
+        windowRuleExtra = with kdl; [
+          (sleaf "open-focused" false)
         ];
         key = "Mod+Control+P";
         app-id = "org.keepassxc.KeePassXC";
@@ -371,6 +478,20 @@ in {
         app-id = "com.github.wwmm.easyeffects";
         spawn = [ "easyeffects" ];
       }
+      { name = "time";
+        key = "Mod+Control+K";
+        app-id = "chrome-kimai.yggdrasil.li__-Default";
+        spawn = [ (toString (pkgs.resholve.writeScript "kimai" {
+          interpreter = pkgs.runtimeShell;
+          inputs = [ pkgs.dex ];
+          execer = [ "cannot:${lib.getExe pkgs.dex}" ];
+        } ''
+          exec dex $HOME/.local/state/nix/profile/share/applications/kimai.desktop
+        '')) ];
+        windowRuleExtra = with kdl; [
+          (sleaf "block-out-from" "screencast")
+        ];
+      }
     ];
     programs.niri.config =
       let
@@ -380,10 +501,12 @@ in {
           then v
           else null;
         opt-props = lib.filterAttrs (lib.const (value: value != null));
+        normalize-nodes = nodes: lib.remove null (lib.flatten nodes);
       in
-        [ (flag "prefer-no-csd")
+        normalize-nodes [
+          (flag "prefer-no-csd")
 
-          (leaf "screenshot-path" "~/screenshots/%Y-%m-%dT%H:%M:%S.png")
+          (sleaf "screenshot-path" "~/screenshots/%Y-%m-%dT%H:%M:%S.png")
 
           (plain "hotkey-overlay" [
             (flag "skip-at-startup")
@@ -391,80 +514,88 @@ in {
 
           (plain "input" [
             (plain "keyboard" [
-              (leaf "repeat-delay" 300)
-              (leaf "repeat-rate" 50)
+              (sleaf "repeat-delay" 300)
+              (sleaf "repeat-rate" 50)
 
               (plain "xkb" [
-                (leaf "layout" "us,us")
-                (leaf "variant" "dvp,")
-                (leaf "options" "compose:caps,grp:win_space_toggle")
+                (sleaf "layout" "us,us")
+                (sleaf "variant" "dvp,")
+                (sleaf "options" "compose:caps,grp:win_space_toggle")
               ])
             ])
 
             (flag "workspace-auto-back-and-forth")
-            # (leaf "focus-follows-mouse" {})
+            # (sleaf "focus-follows-mouse" {})
             # (flag "warp-mouse-to-focus")
 
             # (plain "touchpad" [ (flag "off") ])
             (plain "trackball" [
-              (leaf "scroll-method" "on-button-down")
-              (leaf "scroll-button" 278)
+              (sleaf "scroll-method" "on-button-down")
+              (sleaf "scroll-button" 278)
             ])
             (plain "touch" [
-              (leaf "map-to-output" "eDP-1")
+              (sleaf "map-to-output" "eDP-1")
             ])
           ])
 
-          (plain "environment" (lib.mapAttrsToList leaf {
+          (plain "gestures" [
+            (plain "hot-corners" [(flag "off")])
+          ])
+
+          (plain "environment" (lib.mapAttrsToList sleaf {
             NIXOS_OZONE_WL = "1";
             QT_QPA_PLATFORM = "wayland";
             QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
             GDK_BACKEND = "wayland";
             SDL_VIDEODRIVER = "wayland";
             DISPLAY = ":0";
+            ELECTRON_OZONE_PLATFORM_HINT = "auto";
+            SSH_ASKPASS_REQUIRE = "prefer";
+            SSH_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
+            SUDO_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
           }))
 
-          (node "output" "eDP-1" [
-            (leaf "scale" 1.5)
-            (leaf "position" { x = 0; y = 0; })
+          (node "output" ["eDP-1"] [
+            (sleaf "scale" 1.5)
+            (sleaf "position" { x = 0; y = 0; })
           ])
-          (node "output" "Ancor Communications Inc ASUS PB287Q 0x0000DD9B" [
-            (leaf "scale" 1.5)
-            (leaf "position" { x = 2560; y = 0; })
+          (node "output" ["Ancor Communications Inc ASUS PB287Q 0x0000DD9B"] [
+            (sleaf "scale" 1.5)
+            (sleaf "position" { x = 2560; y = 0; })
           ])
-          (node "output" "HP Inc. HP 727pu CN4417143K" [
-            (leaf "mode" "2560x1440@119.998")
-            (leaf "scale" 1)
-            (leaf "position" { x = 2560; y = 0; })
+          (node "output" ["HP Inc. HP 727pu CN4417143K"] [
+            (sleaf "mode" "2560x1440@119.998")
+            (sleaf "scale" 1)
+            (sleaf "position" { x = 2560; y = 0; })
             (flag "variable-refresh-rate")
           ])
 
           (plain "debug" [
-            (leaf "render-drm-device" "/dev/dri/by-path/pci-0000:00:02.0-render")
+            (sleaf "render-drm-device" "/dev/dri/by-path/pci-0000:00:02.0-render")
           ])
 
           (plain "animations" [
-            (leaf "slowdown" 0.5)
+            (sleaf "slowdown" 0.5)
             (plain "workspace-switch" [(flag "off")])
           ])
 
           (plain "layout" [
-            (leaf "gaps" 8)
+            (sleaf "gaps" 8)
             (plain "struts" [
-              (leaf "left" 26)
-              (leaf "right" 26)
-              (leaf "top" 0)
-              (leaf "bottom" 0)
+              (sleaf "left" 26)
+              (sleaf "right" 26)
+              (sleaf "top" 0)
+              (sleaf "bottom" 0)
             ])
             (plain "border" [
-              (leaf "width" 2)
-              (leaf "active-gradient" {
+              (sleaf "width" 2)
+              (sleaf "active-gradient" {
                 from = "hsla(195 100% 45% 1)";
                 to = "hsla(155 100% 37.5% 1)";
                 angle = 29;
                 relative-to = "workspace-view";
               })
-              (leaf "inactive-gradient" {
+              (sleaf "inactive-gradient" {
                 from = "hsla(0 0% 27.7% 1)";
                 to = "hsla(0 0% 23% 1)";
                 angle = 29;
@@ -475,29 +606,29 @@ in {
               (flag "off")
             ])
 
-            (plain "preset-column-widths" (map (prop: leaf "proportion" prop) [
+            (plain "preset-column-widths" (map (prop: sleaf "proportion" prop) [
               (1. / 4.) (1. / 3.) (1. / 2.) (2. / 3.) (3. / 4.) (1.)
             ]))
-            (plain "default-column-width" [ (leaf "proportion" (1. / 2.)) ])
-            (plain "preset-window-heights" (map (prop: leaf "proportion" prop) [
+            (plain "default-column-width" [ (sleaf "proportion" (1. / 2.)) ])
+            (plain "preset-window-heights" (map (prop: sleaf "proportion" prop) [
               (1. / 3.) (1. / 2.) (2. / 3.) (1.)
             ]))
 
             (flag "always-center-single-column")
 
             (plain "tab-indicator" [
-              (leaf "gap" 4)
-              (leaf "width" 8)
-              (leaf "gaps-between-tabs" 4)
+              (sleaf "gap" 4)
+              (sleaf "width" 8)
+              (sleaf "gaps-between-tabs" 4)
               (flag "place-within-column")
-              (leaf "length" { total-proportion = 1.; })
-              (leaf "active-gradient" {
+              (sleaf "length" { total-proportion = 1.; })
+              (sleaf "active-gradient" {
                 from = "hsla(195 100% 60% 0.75)";
                 to = "hsla(155 100% 50% 0.75)";
                 angle = 29;
                 relative-to = "workspace-view";
               })
-              (leaf "inactive-gradient" {
+              (sleaf "inactive-gradient" {
                 from = "hsla(0 0% 42% 0.66)";
                 to = "hsla(0 0% 35% 0.66)";
                 angle = 29;
@@ -511,129 +642,140 @@ in {
           ])
 
           (map (name:
-            (node "workspace" name [
-              (leaf "open-on-output" "eDP-1")
+            (node "workspace" [name] [
+              (sleaf "open-on-output" "eDP-1")
             ])
           ) (map ({name, ...}: name) cfg.scratchspaces))
           (map (name:
-            (leaf "workspace" name)
+            (sleaf "workspace" name)
           ) ["comm" "web" "vid" "bmr"])
 
           (plain "window-rule" [
-            (leaf "clip-to-geometry" true)
+            (sleaf "clip-to-geometry" true)
           ])
 
           (plain "window-rule" [
-            (leaf "match" { is-floating = true; })
-            (leaf "geometry-corner-radius" 8)
+            (sleaf "match" { is-floating = true; })
+            (sleaf "geometry-corner-radius" 8)
             (plain "shadow" [ (flag "on") ])
           ])
 
           (plain "window-rule" [
-            (leaf "match" { app-id = "^org\\.keepassxc\\.KeePassXC$"; })
-            (leaf "block-out-from" "screencast")
+            (sleaf "match" { app-id = "^org\\.keepassxc\\.KeePassXC$"; })
+            (sleaf "block-out-from" "screencast")
           ])
-          (plain "window-rule" [
+          (plain "window-rule" (normalize-nodes [
             (map (title:
-              (leaf "match" { app-id = "^org\\.keepassxc\\.KeePassXC$"; inherit title; })
-            ) ["^Unlock Database.*" "^Access Request.*" ".*Passkey credentials$"])
-            (leaf "open-focused" true)
-            (leaf "open-floating" true)
-          ])
+              (sleaf "match" { app-id = "^org\\.keepassxc\\.KeePassXC$"; inherit title; })
+            ) ["^Unlock Database.*" "^Access Request.*" ".*Passkey credentials$" "Browser Access Request$"])
+            (sleaf "open-focused" true)
+            (sleaf "open-floating" true)
+          ]))
 
           (map ({ name, match, exclude, windowRuleExtra, ... }:
-            (optional-node (match != []) (plain "window-rule" [
-              (map (leaf "match") match)
-              (map (leaf "exclude") exclude)
-              (leaf "open-on-workspace" name)
-              (leaf "open-maximized" true)
+            (optional-node (match != []) (plain "window-rule" (normalize-nodes [
+              (map (sleaf "match") match)
+              (map (sleaf "exclude") exclude)
+              (sleaf "open-on-workspace" name)
+              (sleaf "open-maximized" true)
               windowRuleExtra
-            ]))
+            ])))
           ) cfg.scratchspaces)
 
           (plain "window-rule" [
-            (leaf "match" { app-id = "^emacs$"; })
-            (leaf "match" { app-id = "^firefox$"; })
-            (plain "default-column-width" [(leaf "proportion" (2. / 3.))])
+            (sleaf "match" { app-id = "^emacs$"; })
+            (sleaf "match" { app-id = "^firefox$"; })
+            (plain "default-column-width" [(sleaf "proportion" (2. / 3.))])
           ])
           (plain "window-rule" [
-            (leaf "match" { app-id = "^kitty$"; })
-            (leaf "match" { app-id = "^kitty-play$"; })
-            (plain "default-column-width" [(leaf "proportion" (1. / 3.))])
+            (sleaf "match" { app-id = "^kitty$"; })
+            (sleaf "match" { app-id = "^kitty-play$"; })
+            (plain "default-column-width" [(sleaf "proportion" (1. / 3.))])
           ])
 
           (plain "window-rule" [
-            (leaf "match" { app-id = "^thunderbird$"; })
-            (leaf "match" { app-id = "^Element$"; })
-            (leaf "match" { app-id = "^Rainbow$"; })
-            (leaf "open-on-workspace" "comm")
+            (sleaf "match" { app-id = "^thunderbird$"; })
+            (sleaf "match" { app-id = "^Element$"; })
+            (sleaf "match" { app-id = "^chrome-web\.openrainbow\.com__-Default$"; })
+            (sleaf "open-on-workspace" "comm")
           ])
           (plain "window-rule" [
-            (leaf "match" { app-id = "^firefox$"; })
-            (leaf "open-on-workspace" "web")
-            (leaf "open-maximized" true)
+            (sleaf "match" { app-id = "^firefox$"; })
+            (sleaf "open-on-workspace" "web")
+            (sleaf "open-maximized" true)
           ])
           (plain "window-rule" [
-            (leaf "match" { app-id = "^mpv$"; })
-            (leaf "open-on-workspace" "vid")
-            (plain "default-column-width" [(leaf "proportion" 1.)])
+            (sleaf "match" { app-id = "^mpv$"; })
+            (sleaf "open-on-workspace" "vid")
+            (plain "default-column-width" [(sleaf "proportion" 1.)])
           ])
           (plain "window-rule" [
-            (leaf "match" { app-id = "^kitty-play$"; })
-            (leaf "open-on-workspace" "vid")
-            (leaf "open-focused" false)
+            (sleaf "match" { app-id = "^kitty-play$"; })
+            (sleaf "open-on-workspace" "vid")
+            (sleaf "open-focused" false)
           ])
           (plain "window-rule" [
-            (leaf "match" { app-id = "^pdfpc$"; })
-            (plain "default-column-width" [(leaf "proportion" 1.)])
+            (sleaf "match" { app-id = "^chrome-audiobookshelf\.yggdrasil\.li__-Default$"; })
+            (sleaf "match" { app-id = "^YouTube Music Desktop App$"; })
+            (sleaf "open-on-workspace" "vid")
           ])
           (plain "window-rule" [
-            (leaf "match" { app-id = "^pdfpc$"; title = "^.*presentation.*$"; })
-            (plain "default-column-width" [(leaf "proportion" 1.)])
-            (leaf "open-fullscreen" true)
-            (leaf "open-on-workspace" "bmr")
-            (leaf "open-focused" false)
+            (sleaf "match" { app-id = "^pdfpc$"; })
+            (plain "default-column-width" [(sleaf "proportion" 1.)])
           ])
           (plain "window-rule" [
-            (map (leaf "match") [
+            (sleaf "match" { app-id = "^pdfpc$"; title = "^.*presentation.*$"; })
+            (plain "default-column-width" [(sleaf "proportion" 1.)])
+            (sleaf "open-fullscreen" true)
+            (sleaf "open-on-workspace" "bmr")
+            (sleaf "open-focused" false)
+          ])
+          (plain "window-rule" (normalize-nodes [
+            (map (sleaf "match") [
               { app-id = "^Gimp-"; title = "^Quit GIMP$"; }
               { app-id = "^org\\.kde\\.polkit-kde-authentication-agent-1$"; }
               { app-id = "^xdg-desktop-portal-gtk$"; }
             ])
-            (leaf "open-floating" true)
-          ])
+            (sleaf "open-floating" true)
+          ]))
           (plain "window-rule" [
-            (leaf "match" { app-id = "^org\\.pwmt\\.zathura$"; })
-            (leaf "match" { app-id = "^evince$"; })
-            (leaf "match" { app-id = "^org\\.gnome\\.Papers$"; })
-            (leaf "default-column-display" "tabbed")
+            (sleaf "match" { app-id = "^org\\.pwmt\\.zathura$"; })
+            (sleaf "match" { app-id = "^evince$"; })
+            (sleaf "match" { app-id = "^org\\.gnome\\.Papers$"; })
+            (sleaf "default-column-display" "tabbed")
           ])
 
           (plain "layer-rule" [
-            (leaf "match" { namespace = "^notifications$"; })
-            (leaf "match" { namespace = "^waybar$"; })
-            (leaf "match" { namespace = "^launcher$"; })
-            (leaf "block-out-from" "screencast")
+            (sleaf "match" { namespace = "^notifications$"; })
+            (sleaf "match" { namespace = "^waybar$"; })
+            (sleaf "match" { namespace = "^launcher$"; })
+            (sleaf "block-out-from" "screencast")
           ])
 
           (plain "binds"
             (let
-              bind = name: cfg: node name (opt-props {
-                cooldown-ms = cfg.cooldown-ms or null;
-              }
-              // (lib.optionalAttrs (!(cfg.repeat or true)) {
-                repeat = false;
-              })
-              // (lib.optionalAttrs (cfg.allow-when-locked or false) {
-                allow-when-locked = true;
-              })) (lib.mapAttrsToList leaf (lib.removeAttrs cfg.action ["__functor"]));
+              bind = name: cfg: node name [(lib.removeAttrs cfg ["action"])] (lib.mapAttrsToList leaf (lib.removeAttrs cfg.action ["__functor"]));
             in
-              [
+              normalize-nodes [
                 (lib.mapAttrsToList bind (with config.lib.niri.actions; {
                   "Mod+Slash".action = show-hotkey-overlay;
 
                   "Mod+Return".action = spawn terminal;
-                  "Mod+Shift+Return".action = spawn terminal (lib.getExe config.programs.nushell.package);
+                  "Mod+Shift+Return".action =
+                    let
+                      nushellKitty = pkgs.symlinkJoin {
+                        name = "nushell-kitty";
+                        paths = [ config.programs.kitty.package ];
+                        buildInputs = [ pkgs.makeWrapper ];
+                        postBuild = ''
+                          wrapProgram $out/bin/kitty \
+                            --add-flags "--config ${pkgs.writeText "kitty.conf" ''
+                              include $HOME/${config.xdg.configFile."kitty/kitty.conf".target}
+                              shell ${lib.getExe config.programs.nushell.package}
+                            ''}"
+                        '';
+                      };
+                    in spawn (lib.getExe' nushellKitty "kitty");
                   "Mod+Q".action = close-window;
                   "Mod+O".action = spawn (lib.getExe config.programs.fuzzel.package);
                   "Mod+Shift+O".action = spawn (lib.getExe config.programs.fuzzel.package) "--list-executables-in-path";
@@ -669,12 +811,12 @@ in {
                         done < <(export LC_ALL=C.UTF-8; echo; find "$RESULTS_DIR" -type f -printf $'%T@ %p\n' | sort -n | cut -d' ' -f2- | xargs -r cat)
                         $FOUND || echo
                       }
-                      FUZZEL_RES=$(prev | fuzzel --dmenu --prompt "qalc> ") || exit $?
+                      FUZZEL_RES=$(prev | fuzzel --dmenu --prompt "qalc> " --width=60) || exit $?
                       if [[ "$FUZZEL_RES" =~ .*\ =\ .* ]]; then
                         QALC_RES="$FUZZEL_RES"
                         QALC_RET=0
                       else
-                        QALC_RES=$(qalc "$FUZZEL_RES" 2>&1)
+                        QALC_RES=$(qalc -set "autocalc off" "$FUZZEL_RES" 2>&1)
                         QALC_RET=$?
                       fi
                       [[ -n "$QALC_RES" ]] || exit 1
@@ -694,18 +836,33 @@ in {
                       notify-send "$QALC_RES"
                     '';
                   }));
+                  "Mod+Shift+U".action =
+                    let
+                      qalcKitty = pkgs.symlinkJoin {
+                        name = "qalc-kitty";
+                        paths = [ config.programs.kitty.package ];
+                        buildInputs = [ pkgs.makeWrapper ];
+                        postBuild = ''
+                          wrapProgram $out/bin/kitty \
+                            --add-flags "--config ${pkgs.writeText "kitty.conf" ''
+                              include $HOME/${config.xdg.configFile."kitty/kitty.conf".target}
+                              shell ${lib.getExe pkgs.libqalculate}
+                            ''}"
+                        '';
+                      };
+                    in spawn (lib.getExe' qalcKitty "kitty");
                   "Mod+E".action = spawn (lib.getExe (pkgs.writeShellApplication {
                     name = "emoji-fuzzel";
                     runtimeInputs = with pkgs; [ config.programs.fuzzel.package wtype wl-clipboard-rs ];
                     text = ''
-                      FUZZEL_RES=$(fuzzel --dmenu --prompt "emoji> " <"$HOME"/.local/share/emoji-data/list.txt) || exit $?
+                      FUZZEL_RES=$(fuzzel --dmenu --prompt "emoji> " --cache "$HOME"/.cache/fuzzel-emoji --width=60 <"$HOME"/.local/share/emoji-data/list.txt) || exit $?
                       [[ -n "$FUZZEL_RES" ]] || exit 1
                       wl-copy "$(cut -d ':' -f 1 <<<"$FUZZEL_RES" | tr -d '\n')" && wtype -k XF86Paste
                     '';
                   }));
                   "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}}}";
 
@@ -759,7 +916,7 @@ in {
                   "Mod+Shift+Asterisk".action = kdl.magic-leaf "move-column-to-workspace" "vid";
 
                   "Mod+Plus".action = with-unnamed-workspace-action ''{"Action":{"FocusWorkspace":{"reference":{"Id": .id}}}}'';
-                  "Mod+Shift+Plus".action = with-unnamed-workspace-action ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}}}}'';
+                  "Mod+Shift+Plus".action = with-unnamed-workspace-action ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}, "focus": true}}}'';
 
                   "Mod+M".action = consume-or-expel-window-left;
                   "Mod+W".action = consume-or-expel-window-right;
@@ -831,13 +988,20 @@ in {
                   "Mod+Comma".action = spawn makoctl "restore";
 
                   "Mod+Control+W".action = with-empty-unnamed-workspace-action "{\"Action\":{\"FocusWorkspace\":{\"reference\":{\"Id\": $workspace_id}}}}";
-                  "Mod+Control+Shift+W".action = with-empty-unnamed-workspace-action "{\"Action\":{\"MoveColumnToWorkspace\":{\"reference\":{\"Id\": $workspace_id}}}}";
+                  "Mod+Control+Shift+W".action = with-empty-unnamed-workspace-action "{\"Action\":{\"MoveColumnToWorkspace\":{\"reference\":{\"Id\": $workspace_id}, \"focus\": true}}}";
 
                   "Mod+X".action = set-dynamic-cast-window;
                   "Mod+Shift+X".action = set-dynamic-cast-monitor;
                   "Mod+Control+Shift+X".action = clear-dynamic-cast-target;
+
+                  "Mod+D".action = with-urgent-window-action "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}";
+                  "Mod+Shift+D".action = with-focused-window-action "{\"Action\":{\"UnsetUrgent\":{\"id\": .id}}}";
+
+                  "Mod+K".action = spawn (lib.getExe' pkgs.worktime "worktime-ui");
+                  "Mod+Shift+K".action = spawn (lib.getExe' pkgs.worktime "worktime-stop");
                 }))
                 (map ({ name, selector, spawn, key, ...}: if key != null && selector != null && spawn != null then bind key { action = focus-or-spawn-action selector name spawn; } else null) cfg.scratchspaces)
+                (map ({ name, moveKey, ...}: if moveKey != null then bind moveKey { action = kdl.magic-leaf "move-column-to-workspace" name; } else null) cfg.scratchspaces)
               ]
             ))
         ];
diff --git a/accounts/gkleen@sif/niri/mako.nix b/accounts/gkleen@sif/niri/mako.nix
index 9373dc21..eba26caa 100644
--- a/accounts/gkleen@sif/niri/mako.nix
+++ b/accounts/gkleen@sif/niri/mako.nix
@@ -16,14 +16,16 @@
         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";
         "app-name=poweralertd" = {
+          history = false;
           ignore-timeout = true;
           default-timeout = 2000;
         };
+        "app-name=worktime".history = false;
         "mode=silent".invisible = true;
       };
       package = pkgs.symlinkJoin {
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/accounts/gkleen@sif/niri/waybar.nix b/accounts/gkleen@sif/niri/waybar.nix
index cc131c08..c02a9a76 100644
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ b/accounts/gkleen@sif/niri/waybar.nix
@@ -27,8 +27,14 @@ in {
           modules-right = [ "custom/worktime" "custom/worktime-today"
             "custom/weather"
             "custom/keymap"
-            "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "custom/mako" "clock" ];
+            "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "custom/mako" "custom/lid_inhibitor" "clock" ];
 
+          "custom/lid_inhibitor" = {
+            format = "{}";
+            return-type = "json";
+            exec = lib.getExe pkgs.waybar-systemd-inhibit;
+            on-click = lib.getExe' pkgs.waybar-systemd-inhibit "waybar-systemd-inhibit-toggle";
+          };
           "custom/mako" = {
             format = "{}";
             return-type = "json";
@@ -211,7 +217,7 @@ in {
           layer = "top";
           position = "top";
           height = 14;
-          output = [ "!eDP-1" "!DP-2" "!DP-3" ];
+          output = [ "!eDP-1" "!DP-2" "!DP-3" "*" ];
           modules-left = [ "niri/workspaces" ];
           modules-center = [ "niri/window" ];
           modules-right = [ "clock" ];
@@ -293,7 +299,7 @@ in {
         #tray {
           margin: 0;
         }
-        #battery, #idle_inhibitor, #backlight, #wireplumber, #custom-mako {
+        #battery, #idle_inhibitor, #backlight, #wireplumber, #custom-mako, #custom-lid_inhibitor {
           color: @grey;
           margin: 0 5px 0 2px;
         }
@@ -302,7 +308,11 @@ in {
           margin-left: 6px;
         }
         #custom-mako {
-          margin-right: 2px;
+          margin-right: 4px;
+          margin-left: 3px;
+        }
+        #custom-lid_inhibitor {
+          margin-right: 3px;
           margin-left: 3px;
         }
         #battery {
@@ -330,7 +340,7 @@ in {
           color: @orange;
         }
 
-        #idle_inhibitor {
+        #idle_inhibitor, #custom-lid_inhibitor {
           padding-top: 1px;
         }
 
@@ -340,6 +350,7 @@ in {
         }
         #clock {
           /* margin-right: 5px; */
+          font-feature-settings: "tnum";
         }
       '';
     };
diff --git a/accounts/gkleen@sif/synadm/default.nix b/accounts/gkleen@sif/synadm/default.nix
new file mode 100644
index 00000000..0a8e0d4c
--- /dev/null
+++ b/accounts/gkleen@sif/synadm/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [ synadm ];
+  sops.secrets."synadm.yaml" = {
+    format = "binary";
+    sopsFile = ./synadm_yaml;
+    path = config.xdg.configHome + "/synadm.yaml";
+  };
+}
diff --git a/accounts/gkleen@sif/synadm/synadm_yaml b/accounts/gkleen@sif/synadm/synadm_yaml
new file mode 100644
index 00000000..8d951ccc
--- /dev/null
+++ b/accounts/gkleen@sif/synadm/synadm_yaml
@@ -0,0 +1,15 @@
+{
+        "data": "ENC[AES256_GCM,data:qJy4Pmbbxja4jmW7OaHsD0mQZ7anZwLhiVmAgkavb+CqwWGDnUBXdz22/MHCbxng5NshcFSpBoCBhgY6B9V2bUiES6bH9AtMlDcs9ebKGMArBTUTnQ2MjWQGfQTqraWdNgy+n327uj9swwCH8EZXdYH/Hlv0t/re470W+VOHeXhGghQ3Y9IGz2sgfvMGr8QxaJNydZz85rgs5QUP/PglCwWIOw2mY1EX2vYwnmiAo49LmIEaxWvRi++KHaeBveDt0nlkJwzUlipL2VOKWxkgpK3yGucQn2mz+FRe1btp+4KGm8H17eUI9FO9sBwq,iv:kgM921ovwCgDYHQj3c5Rupy/8JxHehxUD2jb1k9Ik2Y=,tag:3TLQkJbv679VWy8V2TMugw==,type:str]",
+        "sops": {
+                "age": [
+                        {
+                                "recipient": "age1rmmhetcmllq0ahl5qznlr0eya2zdxwl9h6y5wnl97d2wtyx5t99sm2u866",
+                                "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6bzVHUGNxZTF2WC9MYmZr\neGdVVzJXN3lGdEk3cTBER3J6UTFtcUJna2d3CjdNQmRXd2haZW1MYlJzNkk1dWVD\nVTFQc2gvS0JrejJ6SFh2MXpPWDZpRE0KLS0tIE0wTC85bEpvSnlGdGFkZVFhNjFZ\nbzRiZkxMWUg2ODNVUlBmNFlPNGRrZlkK1VXLJWcssv3ETyZSSM/Hhn5VIaI9iov9\nzShZA9Zx/FX6PYTuUMC29pJ57gKourcIxa/7HwSv/xYn1A6WcYfgSg==\n-----END AGE ENCRYPTED FILE-----\n"
+                        }
+                ],
+                "lastmodified": "2025-05-18T11:03:42Z",
+                "mac": "ENC[AES256_GCM,data:yonJC68PhilAgEHNNJQ8nO53Qo3rx/LnfiOWfuMm24bOUIH9QM3WZZxpigd7bHI4eC4TqRb4LvcSi0nEURTRAhwiTqGNrWbpw2Iv3n5dhLEN9aTcetG5ZuhaXqfVUoML45/ovdBZG/0l8+XIHqxN2M/g/h4JwKoR/6lqzcrVhgo=,iv:xvxBJwy+E5zUdjhGPdZPdy7tnBIEj50hfiDJFsS3wNg=,tag:L4Fas36ZOg4h0QQwC4gjNA==,type:str]",
+                "unencrypted_suffix": "_unencrypted",
+                "version": "3.10.2"
+        }
+}
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 90cccc58..18c2315f 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -385,6 +385,8 @@ in {
       };
       Service = {
         ExecStart = "${config.systemd.package}/lib/systemd/systemd-socket-proxyd --exit-idle-time=60s 127.0.0.1:${toString (port + 1)}";
+        Restart = "always";
+        RestartSec = "23s";
       };
   }) [{ host = "proxy.ssh.math.lmu.de"; port = 8118; } { host = "proxy.vidhar"; port = 8120; } { host = "proxy.mathw0h"; port = 8122; } { host = "proxy.mathw0e"; port = 8124; }]);
   sockets = listToAttrs (map (port: nameValuePair "proxy-to-autossh-socks@${toString port}" {
diff --git a/accounts/gkleen@sif/utils/async-yt-dlp.nix b/accounts/gkleen@sif/utils/async-yt-dlp.nix
new file mode 100644
index 00000000..c3b82ec5
--- /dev/null
+++ b/accounts/gkleen@sif/utils/async-yt-dlp.nix
@@ -0,0 +1,57 @@
+{ writers, python3Packages, ... }:
+
+writers.writePython3Bin "async-yt-dlp" {
+  libraries = with python3Packages; [ yt-dlp ];
+  flakeIgnore = ["E501"];
+} ''
+import sys
+import os
+
+import yt_dlp
+import yt_dlp.options
+from collections import namedtuple
+import socket
+from pathlib import Path
+import json
+
+create_parser = yt_dlp.options.create_parser
+
+
+def parse_patched_options(opts):
+    patched_parser = create_parser()
+    patched_parser.defaults.update({
+        'ignoreerrors': False,
+        'retries': 0,
+        'fragment_retries': 0,
+        'extract_flat': False,
+        'concat_playlist': 'never',
+    })
+    yt_dlp.options.create_parser = lambda: patched_parser
+    try:
+        return yt_dlp.parse_options(opts)
+    finally:
+        yt_dlp.options.create_parser = create_parser
+
+
+default_opts = parse_patched_options([]).ydl_opts
+
+
+def cli_to_api(opts):
+    opts = parse_patched_options(opts)
+    urls = opts.urls
+    opts = opts.ydl_opts
+
+    diff = {k: v for k, v in opts.items() if default_opts[k] != v}
+    if 'postprocessors' in diff:
+        diff['postprocessors'] = [pp for pp in diff['postprocessors']
+                                  if pp not in default_opts['postprocessors']]
+    return namedtuple('Options', ('params', 'urls'))(diff, urls)
+
+
+if __name__ == '__main__':
+    opts = cli_to_api(sys.argv[1:])
+    with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
+        sock.connect(str(Path(os.environ["XDG_RUNTIME_DIR"]) / "yt-dlp.sock").encode('utf-8'))
+        with sock.makefile(mode='w', buffering=1, encoding='utf-8') as fh:
+            json.dump(opts._asdict(), fh)
+''
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index abc200c6..b24ff257 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -93,7 +93,7 @@ dir() {
                 if [[ $curlArchive = "true" ]]; then
                     archiveFile=$(mktemp -t "archive.XXXXXXXXXX.${templateArchive:t}")
 
-                    curl -L -o ${archiveFile} ${templateArchive}
+                    curl -SfL -o ${archiveFile} ${templateArchive}
 
                     templateArchive=${archiveFile}
                 fi
@@ -231,7 +231,7 @@ clock() {
 }
 
 public-ip() {
-    curl -s -H 'Accept: application/json' $@ ifconfig.co | jq -r '.ip'
+    curl -sSf -H 'Accept: application/json' $@ ifconfig.co | jq -r '.ip'
 }
 
 swap() {