51 files changed, 1980 insertions, 2689 deletions

diff --git a/accounts/gkleen@eostre.nix b/accounts/gkleen@eostre.nix
index 72818d44..28daf3fd 100644
--- a/accounts/gkleen@eostre.nix
+++ b/accounts/gkleen@eostre.nix
@@ -1,16 +1,16 @@
 { flake, userName, pkgs, ... }:
 {
   imports = with flake.nixosModules.userProfiles.${userName}; [
-    zsh utils tmux
+    utils
   ];
 
   config = {
     home-manager.users.${userName} = {
       home.stateVersion = "20.09";
 
-      nixpkgs.config = {
-        allowUnfree = true;
-      };
+      # nixpkgs.config = {
+      #   allowUnfree = true;
+      # };
 
       home.packages = with pkgs; [
         thunderbird libreoffice element-desktop keepassxc vlc
diff --git a/accounts/gkleen@installer.nix b/accounts/gkleen@installer.nix
index c7a418f8..5fe1db38 100644
--- a/accounts/gkleen@installer.nix
+++ b/accounts/gkleen@installer.nix
@@ -1,7 +1,11 @@
-{ userName, ... }:
+{ flake, userName, ... }:
 
 {
-  home-manager.users.${userName} = { config, ... } : {
+  imports = with flake.nixosModules.userProfiles.${userName}; [
+    zsh tmux
+  ];
+
+  config.home-manager.users.${userName} = { config, ... } : {
     home.stateVersion = config.home.version.release;
   };
 }
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index bcfd1224..706eb241 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -4,33 +4,6 @@ with lib;
 
 let
   cfg = config.home-manager.users.${userName};
-  emacsScratch = pkgs.stdenv.mkDerivation (sources.emacs-scratch_el // rec {
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      mkdir -p $out/share/emacs/site-lisp
-      cp $src/scratch.el $out/share/emacs/site-lisp/default.el
-    '';
-  });
-  muteScript = pkgs.stdenv.mkDerivation {
-    name = "mute";
-    src = ./scripts/mute.zsh;
-
-    buildInputs = with pkgs; [ makeWrapper ];
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      mkdir -p $out/bin
-      install -m 0755 $src $out/bin/mute
-      wrapProgram $out/bin/mute \
-        --prefix PATH : ${pkgs.zsh}/bin \
-        --prefix PATH : ${pkgs.findutils}/bin \
-        --prefix PATH : ${pkgs.util-linux}/bin \
-        --prefix PATH : ${pkgs.coreutils}/bin \
-        --prefix PATH : ${pkgs.pulseaudio}/bin
-    '';
-  };
   wrapElectron = { package, bin ? package.meta.mainProgram or package.pname or (pkgs.lib.strings.nameFromURL package.name "-"), outBin ? bin, sandbox ? true }: pkgs.symlinkJoin {
     name = "${package.name}-wrapped";
     buildInputs = with pkgs; [ makeWrapper ];
@@ -47,10 +20,6 @@ let
     '';
   };
 
-  wrappedChrome = wrapElectron { package = pkgs.google-chrome; outBin = "google-chrome"; };
-  wrappedZulip = wrapElectron { package = pkgs.zulip; bin = "zulip"; outBin = "zulip"; };
-  wrappedElementDesktop = wrapElectron { package = pkgs.element-desktop; bin = "element-desktop"; };
-  wrappedRocketChatDesktop = wrapElectron { package = pkgs.rocketchat-desktop; bin = "rocketchat-desktop"; outBin = "rocketchat"; };
   wrappedYTMDesktop = wrapElectron { package = pkgs.ytmdesktop; sandbox = false; };
 
   wrappedKeepassxc = pkgs.symlinkJoin {
@@ -63,7 +32,7 @@ let
         text = ''
           [D-BUS Service]
           Name=org.keepassxc.KeePassXC.MainWindow
-          Exec=${pkgs.coreutils}/bin/false
+          Exec=${lib.getExe' pkgs.coreutils "false"}
           SystemdService=keepassxc.service
         '';
       })
@@ -73,36 +42,46 @@ let
         text = ''
           [D-BUS Service]
           Name=org.freedesktop.secrets
-          Exec=${pkgs.coreutils}/bin/false
+          Exec=${lib.getExe' pkgs.coreutils "false"}
           SystemdService=keepassxc.service
         '';
       })
     ];
   };
 
-  lockCommand = "${config.systemd.package}/bin/systemctl --user start gtklock.service";
+  lockCommand = "${lib.getExe' config.systemd.package "systemctl"} --user start gtklock.service";
+
+  editor = pkgs.symlinkJoin {
+    inherit (cfg.services.emacs.package) name;
+    buildInputs = with pkgs; [ makeWrapper ];
+    paths = [ cfg.services.emacs.package ];
+    postBuild = ''
+      wrapProgram $out/bin/emacsclient \
+        --inherit-argv0 \
+        --add-flags ${lib.escapeShellArg (lib.escapeShellArgs cfg.services.emacs.client.arguments)}
+    '';
+  };
 in {
   imports = with flake.nixosModules.userProfiles.${userName}; [
-    mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
+    zsh tmux mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
   ];
 
   config = {
-    services.displayManager.defaultSession = "Hyprland"; # "none+xmonad";
-
     home-manager.users.${userName} = {
       imports = [
         ./libvirt
         ./niri
+        ./synadm
         flakeInputs.nix-index-database.hmModules.nix-index
         flakeInputs.impermanence.nixosModules.home-manager.impermanence
       ];
 
       home.stateVersion = "20.09";
 
-      nixpkgs.config = {
-        allowUnfree = true;
-        zathura.useMupdf = false;
-      };
+      # nixpkgs.config = {
+      #   allowUnfree = true;
+      #   zathura.useMupdf = false;
+      # };
 
       nix.registry = {
         "flk" = {
@@ -112,14 +91,14 @@ in {
           };
           to = {
             type = "git";
-            url = "file:///home/gkleen/config/nixos-flakes";
+            url = "file:///home/gkleen/projects/machines";
           };
         };
       };
 
       programs = {
         ssh = {
-          matchBlocks = import ./ssh-hosts.nix { inherit pkgs; }; # customUtils.nixImport { dir = ./ssh-hosts; };
+          matchBlocks = import ./ssh-hosts.nix inputs; # customUtils.nixImport { dir = ./ssh-hosts; };
           extraConfig = ''
             Match host uniworx3.ifi.lmu.de,uniworx4.ifi.lmu.de,uniworx5.ifi.lmu.de,uni2workgw.ifi.lmu.de,blackbeard.tcs.ifi.lmu.de,gitlab2.rz.ifi.lmu.de,oregon.tcs.ifi.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null"
               ProxyJump remote.cip.ifi.lmu.de
@@ -137,8 +116,8 @@ in {
               ''}
 
             Match host *.mathinst.loc,*.math.lmu.de !host ssh.math.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null"
-              # ProxyCommand ${pkgs.socat}/bin/socat - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
-              ProxyJump ssh.math.lmu.de
+              ProxyCommand ${lib.getExe pkgs.socat} - SOCKS4A:127.0.0.1:%h:%p,socksport=8118
+              # ProxyJump ssh.math.lmu.de
 
             Match host *.cipmath.loc !host cip04.cipmath.loc,mgmt-cls01.cipmath.loc !exec "nc -z -w 1 %h %p &>/dev/null"
               ProxyJump cip04
@@ -155,22 +134,31 @@ in {
 
         emacs = {
           enable = true;
-                package = pkgs.emacs29-pgtk;
+                package = pkgs.emacs-pgtk;
           extraPackages = epkgs: with epkgs; [
             evil evil-dvorak undo-tree magit haskell-tng-mode nix-mode
             yaml-mode json-mode shakespeare-mode smart-mode-line
-            highlight-parentheses highlight-symbol ag sass-mode lua-mode
-            fira-code-mode use-package wanderlust # notmuch
-            git-gutter emacsScratch
-            edit-server mediawiki editorconfig typescript-mode
-            markdown-mode nftables-mode rustic lsp-mode lsp-ui
-            direnv company projectile tomorrow-night-paradise-theme
+            highlight-parentheses highlight-symbol ag sass-mode
+            lua-mode fira-code-mode use-package wanderlust # notmuch
+            git-gutter scratch edit-server mediawiki editorconfig
+            typescript-mode markdown-mode nftables-mode rustic
+            lsp-mode lsp-ui direnv company projectile
+            tomorrow-night-paradise-theme
             treesit-grammars.with-all-grammars magit-delta scad-mode
           ];
           overrides = self: super: {
             tomorrow-night-paradise-theme = super.trivialBuild {
               inherit (sources.tomorrow-night-paradise-theme) pname version src;
             };
+            scratch = pkgs.stdenv.mkDerivation {
+              inherit (sources.emacs-scratch_el) pname version src;
+
+              phases = [ "unpackPhase" "installPhase" ];
+
+              installPhase = ''
+                install -Dt $out/share/emacs/site-lisp scratch.el
+              '';
+            };
           };
         };
         firefox = {
@@ -185,7 +173,12 @@ in {
           };
         };
 
-        zathura.enable = true;
+        zathura = {
+          enable = true;
+          options = {
+            scroll-page-aware = true;
+          };
+        };
         imv.enable = true;
 
         mpv.config = {
@@ -194,13 +187,91 @@ in {
           gpu-api = "vulkan";
         };
 
-        zsh.initExtra = ''
-          source ${./zshrc}
+        zsh.initContent = let
+          zshrc = pkgs.resholve.mkDerivation {
+            pname = "zshrc";
+            version = "0.0.0";
+
+            src = ./zshrc;
+
+            dontUnpack = true;
+            dontConfigure = true;
+            dontBuild = true;
+
+            installPhase = ''
+              mkdir -p $out/share
+              install "$src" $out/share/zshrc
+            '';
+
+            solutions = {
+              default = {
+                scripts = [ "share/zshrc" ];
+                interpreter = "none";
+                inputs = with pkgs; [
+                  coreutils
+                  rpm
+                  binutils
+                  squashfsTools
+                  unzip
+                  cfg.programs.git.package
+                  magickWrapped
+                  curl
+                  file
+                  gnutar
+                  cpio
+                  magic-wormhole
+                  cfg.programs.zsh.package
+                  fuse
+                  util-linux
+                  findutils
+                  qrencode
+                  tty-clock
+                  cfg.programs.jq.package
+                  eza
+                  less
+                  config.systemd.package
+                  config.programs.ssh.package
+                  gnused
+                  miniserve
+                ];
+                execer = with pkgs; [
+                  "cannot:${lib.getExe' rpm "rpm2cpio"}"
+                  "cannot:${lib.getExe' squashfsTools "unsquashfs"}"
+                  "cannot:${lib.getExe' unzip "unzip"}"
+                  "cannot:${lib.getExe cfg.programs.git.package}"
+                  "cannot:${lib.getExe cpio}"
+                  "cannot:${lib.getExe' magic-wormhole "wormhole"}"
+                  "cannot:${lib.getExe' fuse "fusermount"}"
+                  "cannot:${lib.getExe less}"
+                  "cannot:${lib.getExe' config.systemd.package "systemctl"}"
+                  "cannot:${lib.getExe config.programs.ssh.package}"
+                ];
+                wrapper = with pkgs; [
+                  "${lib.getExe' magickWrapped "magick"}:${lib.getExe' imagemagick "magick"}"
+                ];
+                fake = {
+                  builtin = ["print"];
+                  external = ["sudo" "umount"];
+                };
+              };
+            };
+          };
+          magickWrapped = pkgs.symlinkJoin {
+            inherit (pkgs.imagemagick) name;
+            paths = [ pkgs.imagemagick ];
+
+            buildInputs = with pkgs; [ makeWrapper ];
+            postBuild = ''
+              wrapProgram $out/bin/magick \
+                --prefix PATH : ${lib.makeBinPath (with pkgs; [ ghostscript ])}
+            '';
+          };
+        in ''
+          source ${zshrc}/share/zshrc
         '';
         zsh.dirHashes = let
           flakeHashes = mapAttrs' (n: v: nameValuePair (inputNames.${n} or n) (toString v)) flakeInputs;
           inputNames = {
-            "nixpkgs" = "nixos";
           };
         in flakeHashes // {
           u2w = "$HOME/projects/uni2work";
@@ -212,6 +283,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;
@@ -221,7 +302,7 @@ in {
         gh = {
           enable = true;
           settings = {
-            editor = "${config.home-manager.users.${userName}.programs.emacs.package}/bin/emacsclient";
+            editor = lib.getExe' editor "emacsclient";
             gitProtocol = "ssh";
           };
         };
@@ -247,16 +328,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";
-          };
-        };
-        wpaperd = {
-          enable = true;
-          settings.default = {
-            path = "~/.wallpapers";
-            duration = "8h";
-            mode = "center";
+            "kitty_mod+enter" = "new_window_with_cwd";
+            "kitty_mod+t" = "new_tab_with_cwd";
           };
         };
         fuzzel = {
@@ -269,7 +344,7 @@ in {
               font = "Fira Sans";
             };
             colors = {
-              background = "000000aa";
+              background = "000000cc";
               text = "cdd6f4ff";
               match = "94e2d5ff";
               selection = "585b70ff";
@@ -282,34 +357,46 @@ in {
             };
           };
         };
+        pandoc = {
+          enable = true;
+          extraAbbreviations = ["i.A." "d.h." "D.h." "gdw."];
+        };
+        nushell = {
+          enable = true;
+          settings.show_banner = false;
+        };
+        fd.enable = true;
       };
 
       services = {
-        dunst = {
-          settings = import ./dunst-settings.nix inputs;
-          iconTheme = {
-            package = pkgs.paper-icon-theme;
-            name = "Paper";
-          };
+        wpaperd = {
           enable = true;
+          settings.default = {
+            path = "~/.wallpapers";
+            duration = "15m";
+            mode = "center";
+          };
         };
         emacs = {
           enable = true;
           socketActivation.enable = true;
           client = {
             enable = true;
-            arguments = mkForce ["--reuse-frame" "--alternate-editor" "\"\""];
+            arguments = mkForce ["--create-frame" "--alternate-editor" (lib.getExe cfg.services.emacs.package)];
           };
         };
         gpg-agent = {
           enable = true;
           enableSshSupport = true;
           extraConfig = ''
-            pinentry-program ${pkgs.pinentry-gtk2}/bin/pinentry
+            pinentry-program ${lib.getExe' pkgs.pinentry-gtk2 "pinentry"}
             grab
           '';
         };
-        xembed-sni-proxy.enable = true;
+        xembed-sni-proxy = {
+          enable = true;
+          package = pkgs.kdePackages.plasma-workspace;
+        };
         udiskie = {
           enable = true;
           automount = false;
@@ -321,8 +408,11 @@ in {
               device_mounted = [];
             };
             device_config = [
-              { mount_path = "/run/etc-metadata"; ignore = true; }
+              { loop_file = "/nix/store/*-etc-metadata.erofs"; is_mounted = false; ignore = true; }
+              { mount_path = "/run/nixos-etc-metadata"; ignore = true; }
+              { mount_path = "/run/nixos-etc-metadata.*"; ignore = true; }
             ];
+            icon_names.media = ["drive-removable-media-symbolic"];
           };
         };
         network-manager-applet.enable = true;
@@ -339,7 +429,7 @@ in {
                 batch = "true";
                 log = "false";
                 repeat = "watch";
-                sshcmd = "${pkgs.openssh}/bin/ssh";
+                sshcmd = lib.getExe' pkgs.openssh "ssh";
                 ui = "text";
               };
             };
@@ -359,31 +449,17 @@ in {
           enable = true;
           events = [
             { event = "before-sleep"; command = lockCommand; }
-            # { event = "after-resume"; command = "${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on"; }
             { event = "lock"; command = lockCommand; }
           ];
           timeouts = [
-            # { timeout = 300;
-            #   command = "${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off";
-            # }
-            { timeout = 330; command = lockCommand; }
+            { timeout = 600; command = lockCommand; }
           ];
           extraArgs = [
+            "-w"
             "idlehint" "30"
           ];
         };
         poweralertd.enable = true;
-        avizo = {
-          enable = true;
-          settings.default = {
-            time = "1.0";
-            background = "rgba(0, 0, 0, 0.8)";
-            border-color = "rgba(0, 0, 0, 1)";
-            bar-fg-color = "rgba(160, 160, 160, 1)";
-            bar-bg-color = "rgba(32, 32, 32, 0.96)";
-            # y-offset = "0.25";
-          };
-        };
       };
 
       home.pointerCursor = {
@@ -415,6 +491,13 @@ in {
         };
       };
 
+      qt.kde.settings = {
+        kwalletrc = {
+          KSecretD.Enabled = false;
+          Wallet."Default Wallet" = "store";
+        };
+      };
+
       xsession.preferStatusNotifierItems = true;
 
       xresources.properties = import ./xresources.nix;
@@ -423,18 +506,19 @@ in {
         packages = with pkgs; [
           fira fira-code pwvucontrol wrappedKeepassxc wl-clipboard-rs
           mumble pulseaudio-ctl pamixer libnotify screen-message
-          wrappedYTMDesktop libsForQt5.qt5ct playerctl evince
-          thunderbird zoom-us steam steam-run wireshark virt-manager
-          rclone cached-nix-shell worktime fira-code-symbols
-          libreoffice xournalpp google-chrome nixos-shell virt-viewer
-          freerdp gnome-icon-theme paper-icon-theme sshpassSecret
-          weechat element-desktop matrix-synapse-tools.synadm
-          flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
-          sieve-connect gimp inkscape udiskie glab nitrokey-app
+          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
+          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 libqalculate
+        ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg {}) (customUtils.nixImport { dir = ./utils; });
 
         file = {
           ".backup-munin".source = ./backup-patterns;
@@ -454,12 +538,9 @@ in {
           QT_QPA_PLATFORMTHEME = "qt5ct";
           LIBVIRT_DEFAULT_URI = "qemu:///system";
           STACK_XDG = 1;
-          EDITOR = pkgs.writeShellScript "editor" ''
-            args=("--reuse-frame" "--alternate-editor" "")
-            args+=("$@")
-            exec -a emacsclient ${cfg.services.emacs.package}/bin/emacsclient "''${args[@]}"
-          '';
-          RCLONE_PASSWORD_COMMAND = "${pkgs.libsecret}/bin/secret-tool lookup service rclone";
+          EDITOR = lib.getExe' editor "emacsclient";
+          RCLONE_PASSWORD_COMMAND = "${lib.getExe' pkgs.libsecret "secret-tool"} lookup service rclone";
+          SYSTEMD_TINT_BACKGROUND = "false";
         };
 
         extraProfileCommands = ''
@@ -468,18 +549,11 @@ in {
       };
 
       xdg.configFile = {
-        "dunst/dunstrc.d" = {
-          source = ./dunstrc.d;
-          recursive = true;
-          onChange = ''
-            ${pkgs.systemd}/bin/systemctl --user try-restart dunst
-          '';
-        };
         "wireplumber" = {
           source = ./wireplumber;
           recursive = true;
           onChange = ''
-            ${pkgs.systemd}/bin/systemctl --user try-restart wireplumber
+            ${lib.getExe' config.systemd.package "systemctl"} --user try-restart wireplumber
           '';
         };
         "stack/config.yaml" = {
@@ -503,37 +577,36 @@ 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
+        '';
+        "systemd/user/home-manager.service.d/before-graphical-session.conf".text = ''
+          [Unit]
+          Before=graphical-session-pre.target
+        '';
+        "pdfpc/pdfpcrc".text = ''
+          mouse 8 prev
+          mouse 9 next
+        '';
       };
 
       xdg.dataFile = {
-        "pandoc/abbreviations" = {
-          source = pkgs.runCommand "pandoc-abbreviations" {
-            buildInputs = [ pkgs.pandoc pkgs.coreutils ];
-          } (let
-            germanAbbrevs = pkgs.fetchFromGitHub {
-              owner = "jfilter";
-              repo = "german-abbreviations";
-              rev = "8eb9dae93b6f05d7c53374cd217ab2dc89558e0c";
-              sha256 = "SaD3tSqzen6Y3SPICe6/9vhe4iMHlArZ3kFQaEk7Hps=";
-            };
-          in ''
-            cat \
-              <(pandoc --print-default-data-file=abbreviations) \
-              <(grep -E '^[^ ]+\.$' ${germanAbbrevs}/german_abbreviations.txt) \
-              ${pkgs.writeText "abbrevs.txt" ''
-                i.A.
-                d.h.
-                D.h.
-                gdw.
-              ''} \
-              | sort | uniq >$out
-          '');
-        };
         "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;
@@ -619,19 +692,68 @@ in {
           name = "Rainbow";
           exec = toString (pkgs.writeShellScript "rainbow" ''
             exec -- \
-              ${config.systemd.package}/bin/systemd-run --wait --user --slice-inherit \
+              ${lib.getExe' config.systemd.package "systemd-run"} --wait --user --slice-inherit \
               --property 'CPUAccounting=yes' --property 'CPUQuotaPeriodSec=50ms' \
-              --property 'Environment=DSCP=46' \
-              -- ${pkgs.dscp}/bin/dscp ${pkgs.google-chrome}/bin/google-chrome-stable \
-              --force-device-scale-factor=1.5 \
+              -E DSCP=46 -E NIXOS_OZONE_WL \
+              -- ${lib.getExe pkgs.dscp} ${lib.getExe' pkgs.google-chrome "google-chrome-stable"} \
               --class=Rainbow \
-              --kiosk "https://web.openrainbow.com" \
+              --app="https://web.openrainbow.com" \
               --user-data-dir=''${HOME}/.config/google-chrome-rainbow
           '');
           icon = pkgs.fetchurl {
             url = "https://web.openrainbow.com/rb/2.139.17/assets/skins/rainbow/images/homepage/logo__rainbow.svg";
             hash = "sha256-5fmo8rDqVDpzkGaPjk4Y+SsSZpAsY7VUQSFW6WdHwuU=";
           };
+          settings = {
+            StartupWMClass = "Rainbow";
+          };
+        };
+        kimai = {
+          name = "Kimai";
+          exec = toString (pkgs.writeShellScript "kimai" ''
+            exec -- \
+              ${lib.getExe' pkgs.google-chrome "google-chrome-stable"} \
+              --class=Kimai \
+              --app="https://kimai.yggdrasil.li" \
+              --user-data-dir=''${HOME}/.config/google-chrome-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' pkgs.google-chrome "google-chrome-stable"} \
+              --class=Audiobookshelf \
+              --app="https://audiobookshelf.yggdrasil.li" \
+              --user-data-dir=''${HOME}/.config/google-chrome-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";
+          icon = "thunderbird";
+          genericName = "Email Client";
+          categories = [ "Network" "Chat" "Email" "Feed" "GTK" "News" ];
+          settings = {
+            StartupWMClass = "thunderbird";
+            StartupNotify = "true";
+          };
         };
       };
 
diff --git a/accounts/gkleen@sif/dunst-settings.nix b/accounts/gkleen@sif/dunst-settings.nix
deleted file mode 100644
index 72687aea..00000000
--- a/accounts/gkleen@sif/dunst-settings.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pkgs, ... }:
-{
-  global = {
-    font = "Fira Sans 12";
-    markup = "full";
-    format = "<i>%s</i> %p\\n%b";
-    alignment = "left";
-    # geometry = "1216x10-32+64";
-    width = 500;
-    height = 100;
-    offset = "4x4";
-    origin = "top-right";
-    shrink = true;
-    monitor = 0;
-    follow = "none";
-    padding = 6;
-    horizontal_padding = 6;
-    separator_height = 1;
-    separator_color = "frame";
-    idle_threshold = 0;
-
-    transparency = 10;
-
-    frame_width = 1;
-    frame_color = "#999999";
-
-    word_wrap = true;
-    show_age_threshold = 15;
-    show_indicators = false;
-    icon_position = "right";
-    min_icon_size = 25;
-    max_icon_size = 25;
-    sort = false;
-    sticky_history = false;
-
-    dmenu = "fuzzel --dmenu";
-    browser = "${pkgs.xdg-utils}/bin/xdg-open";
-  };
-  # shortcuts = {
-  #   close = "ctrl+space";
-  #   close_all = "ctrl+shift+space";
-  #   history = "ctrl+comma";
-  #   context = "ctrl+period";
-  # };
-}
diff --git a/accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf b/accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf
deleted file mode 100644
index 98c94b64..00000000
--- a/accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[urgency_low]
-background="#000000aa"
-foreground="#999999"
-timeout=5
\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf b/accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf
deleted file mode 100644
index f8fa8e2d..00000000
--- a/accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[urgency_normal]
-background="#000000aa"
-foreground="#ffffff"
-timeout=15
\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf b/accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf
deleted file mode 100644
index a08bf4b1..00000000
--- a/accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[urgency_critical]
-background="#900000aa"
-foreground="#ffffff"
-timeout=0
diff --git a/accounts/gkleen@sif/dunstrc.d/10-brightness.conf b/accounts/gkleen@sif/dunstrc.d/10-brightness.conf
deleted file mode 100644
index c54595ab..00000000
--- a/accounts/gkleen@sif/dunstrc.d/10-brightness.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[brightness]
-appname="brightness"
-set_stack_tag="brightness"
-set_transient=yes
-history_ignore=yes
diff --git a/accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf b/accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf
deleted file mode 100644
index 074f4535..00000000
--- a/accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[pulseaudio-ctl]
-body="Current is *"
-history_ignore=yes
-set_stack_tag="volume"
-summary="Volume *"
diff --git a/accounts/gkleen@sif/dunstrc.d/20-element.conf b/accounts/gkleen@sif/dunstrc.d/20-element.conf
deleted file mode 100644
index 5ff6031e..00000000
--- a/accounts/gkleen@sif/dunstrc.d/20-element.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[element-im]
-appname=Element
-timeout=0
\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/20-kitty.conf b/accounts/gkleen@sif/dunstrc.d/20-kitty.conf
deleted file mode 100644
index b27ee27e..00000000
--- a/accounts/gkleen@sif/dunstrc.d/20-kitty.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[kitty]
-appname=kitty
-urgency=low
diff --git a/accounts/gkleen@sif/dunstrc.d/20-mail.conf b/accounts/gkleen@sif/dunstrc.d/20-mail.conf
deleted file mode 100644
index cb568e01..00000000
--- a/accounts/gkleen@sif/dunstrc.d/20-mail.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[element]
-appname="notmuch"
-timeout=0
\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/20-zulip.conf b/accounts/gkleen@sif/dunstrc.d/20-zulip.conf
deleted file mode 100644
index d7fbd32c..00000000
--- a/accounts/gkleen@sif/dunstrc.d/20-zulip.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[zulip]
-appname="Zulip"
-timeout=0
\ No newline at end of file
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index 183cb322..3beefba6 100644
--- a/accounts/gkleen@sif/emacs.el
+++ b/accounts/gkleen@sif/emacs.el
@@ -51,7 +51,7 @@
 
 ;; (require 'scratch)
 (global-set-key (kbd "C-x B") 'scratch-create)
-(setq initial-major-mode 'scratch-mode)
+;; (setq initial-major-mode 'scratch-mode)
 (setq initial-scratch-message "")
 
 (global-set-key (kbd "C-x K") 'kill-current-buffer)
@@ -228,6 +228,7 @@ necessarily running."
   (global-set-key (kbd "C-x k") 'kill-buffer-with-special-emacsclient-handling))
 
 (add-hook 'server-switch-hook 'install-emacsclient-wrapped-kill-buffer)
+(add-hook 'server-switch-hook #'raise-frame)
 
 (defun move-file (new-location)
   "Write this file to NEW-LOCATION, and delete the old one."
@@ -253,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/firefox-chrome.css b/accounts/gkleen@sif/firefox-chrome.css
index 8900e2b9..726f1e4b 100644
--- a/accounts/gkleen@sif/firefox-chrome.css
+++ b/accounts/gkleen@sif/firefox-chrome.css
@@ -4,6 +4,21 @@
     font-size:12px;
 }
 
+#sidebar-main:has([expanded]) {
+    min-width:20em !important;
+    max-width:20em !important;
+}
+
+#sidebar, #sidebar-box {
+    min-width:35em !important;
+    max-width:35em !important;
+}
+
+#sidebar-box {
+    margin-right: var(--space-small);
+}
+
+/*
 #sidebar {
     min-width:20em !important;
     max-width:20em !important;
@@ -19,8 +34,21 @@
 }
 
 #toolbar-menubar[inactive="true"] + #TabsToolbar {
-  visibility: collapse !important;
+    visibility: collapse !important;
 }
 
 #sidebar-box[sidebarcommand="tabcenter-reborn_ariasuni-sidebar-action"] #sidebar-header { visibility: collapse !important; }
 #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar-header { visibility: collapse !important; }
+*/
+
+.titlebar-buttonbox-container{ display: none; }
+#vertical-spacer { display: none; }
+#tabbrowser-tabs[orient="vertical"] .tab-background {
+    border-radius: var(--border-radius-small) !important;
+}
+hbox:has(> #tabs-newtab-button) {
+    display: none;
+}
+#sidebar-main .tools-and-extensions {
+    justify-content: space-around !important;
+}
diff --git a/accounts/gkleen@sif/libvirt/default.nix b/accounts/gkleen@sif/libvirt/default.nix
index 70ac22b9..4e5a9b90 100644
--- a/accounts/gkleen@sif/libvirt/default.nix
+++ b/accounts/gkleen@sif/libvirt/default.nix
@@ -7,6 +7,7 @@ with flakeInputs.nixVirt.lib;
   config = {
     virtualisation.libvirt = {
       enable = true;
+      swtpm.enable = true;
       connections."qemu:///session" = {
         domains = [
           { definition = domain.writeXML (updateManyAttrsByPath [
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 6a8d10a0..8752f3e3 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -1,15 +1,234 @@
-{ config, pkgs, lib, ... }:
+{ config, hostConfig, pkgs, lib, flakeInputs, ... }:
 let
-  niri = config.programs.niri.package;
+  cfg = config.programs.niri;
+
+  kdl = flakeInputs.niri-flake.lib.kdl;
+
+  niri = cfg.package;
   terminal = lib.getExe config.programs.kitty.package;
-  lightctl = lib.getExe' config.services.avizo.package "lightctl";
-  volumectl = lib.getExe' config.services.avizo.package "volumectl";
-  dunstctl = lib.getExe' config.services.dunst.package "dunstctl";
+  makoctl = lib.getExe' config.services.mako.package "makoctl";
+  loginctl = lib.getExe' hostConfig.systemd.package "loginctl";
+  systemctl = lib.getExe' hostConfig.systemd.package "systemctl";
+  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
+
+  focus_or_spawn = pkgs.writeShellApplication {
+    name = "focus-or-spawn";
+    runtimeInputs = [ niri pkgs.gojq pkgs.gnugrep pkgs.socat ];
+    text = ''
+      window_select="$1"
+      shift
+      workspace_name="$1"
+      shift
+
+      workspaces_json="$(niri msg -j workspaces)"
+      workspace_output="$(jq -r --arg workspace_name "$workspace_name" '.[] | select(.name == $workspace_name) | .output' <<<"$workspaces_json")"
+      # active_workspace="$(jq -r --arg workspace_output "$workspace_output" '.[] | select(.output == $workspace_output and .is_active) | .id' <<<"$workspaces_json")"
+      active_output="$(jq -r '.[] | select(.is_focused) | .output' <<<"$workspaces_json")"
+      if [[ $workspace_output != "$active_output" ]]; then
+        niri msg action move-workspace-to-monitor --reference "$workspace_name" "$active_output"
+        # socat STDIO "$NIRI_SOCKET" <<<'{"Action":{"FocusWorkspace":{"reference":{"Id":'"''${active_workspace}"'}}}}'
+        # niri msg action move-workspace-to-index --reference "$workspace_name" 1
+      fi
+
+      while IFS=$'\n' read -r window_json; do
+        if [[ -n $(jq -c "$window_select" <<<"$window_json") ]]; then
+          if jq -e '.is_focused' <<<"$window_json" >/dev/null; then
+            niri msg action focus-workspace-previous
+          else
+            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
+      done < <(niri msg -j windows | jq -c '.[]')
+
+      exec "$@"
+    '';
+  };
+  focus-or-spawn-action = config.lib.niri.actions.spawn (lib.getExe focus_or_spawn);
+
+  with_adjacent_workspace = pkgs.writeShellApplication {
+    name = "with-adjacent-workspace";
+    runtimeInputs = [ niri pkgs.gojq pkgs.socat ];
+    text = ''
+      blacklist="$1"
+      shift
+      direction="$1"
+      shift
+      action="$1"
+      shift
+
+      workspaces_json="$(niri msg -j workspaces)"
+      active_workspace="$(jq -r '.[] | select(.is_focused) | .id' <<<"$workspaces_json")"
+      workspace_output="$(jq -r --arg active_workspace "$active_workspace" '.[] | select(.id == ($active_workspace | tonumber)) | .output' <<<"$workspaces_json")"
+      workspace_idx="$(jq -r '.[] | select(.is_focused) | .idx' <<<"$workspaces_json")"
+
+      jq_script='map(select('
+      case "$direction" in
+        down)
+          # shellcheck disable=SC2016
+          jq_script=''${jq_script}'.idx > ($workspace_idx | tonumber)';;
+        up)
+          # shellcheck disable=SC2016
+          jq_script=''${jq_script}'.idx < ($workspace_idx | tonumber)';;
+      esac
+      # shellcheck disable=SC2016
+      jq_script=''${jq_script}' and .output == $workspace_output and ((.name == null) or (.name | test($blacklist) | not)))) | sort_by(.idx)'
+      [[ $direction == "up" ]] && jq_script=''${jq_script}' | reverse'
+      jq_script=''${jq_script}' | .[0]'
+
+      workspace_json=$(jq -c --arg blacklist "$blacklist" --arg workspace_output "$workspace_output" --arg workspace_idx "$workspace_idx" "$jq_script" <<<"$workspaces_json")
+      [[ -n $workspace_json && $workspace_json != null  ]] || exit 0
+      jq --arg active_workspace "$active_workspace" -c "$action" <<<"$workspace_json" | tee /dev/stderr | socat STDIO "$NIRI_SOCKET"
+    '';
+  };
+  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}, "focus": true}}}'';
+
+  with_unnamed_workspace = pkgs.writeShellApplication {
+    name = "with-unnamed-workspace";
+    runtimeInputs = [ niri pkgs.gojq pkgs.socat ];
+    text = ''
+      action="$1"
+      shift
+
+      workspaces_json="$(niri msg -j workspaces)"
+      active_output="$(jq -r '.[] | select(.is_focused) | .output' <<<"$workspaces_json")"
+      active_workspace="$(jq -r '.[] | select(.is_focused) | .id' <<<"$workspaces_json")"
+
+      history_json="$(socat STDIO UNIX-CONNECT:"$XDG_RUNTIME_DIR"/niri-workspace-history.sock)"
+      workspace_json="$(jq -c --arg active_output "$active_output" --argjson history "$history_json" 'map(select(.output == $active_output and .name == null)) | map({"value": ., "history_idx": ((. as $workspace | ($history[$active_output] | index($workspace | .id))) as $active_idx | if $active_idx then $active_idx else ($history[$active_output] | length) + 1 end)}) | sort_by(.history_idx, .value.idx) | map(.value) | .[0]' <<<"$workspaces_json")"
+      [[ -n $workspace_json && $workspace_json != null ]] || exit 0
+      jq --arg active_workspace "$active_workspace" -c "$action" <<<"$workspace_json" | tee /dev/stderr | socat STDIO "$NIRI_SOCKET"
+    '';
+  };
+  with-unnamed-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_unnamed_workspace);
+
+  with_empty_unnamed_workspace = pkgs.writeShellApplication {
+    name = "with-empty-unnamed-workspace";
+    runtimeInputs = [ niri pkgs.gojq pkgs.socat ];
+    text = ''
+      action="$1"
+      shift
+
+      workspaces_json="$(niri msg -j workspaces)"
+      active_output="$(jq '.[] | select(.is_focused) | .output' <<<"$workspaces_json")"
+      target_workspace_id="$(jq --argjson active_output "$active_output" 'map(select(.active_window_id == null and .name == null and .output == $active_output)) | sort_by(.idx) | .[0].id' <<<"$workspaces_json")"
+      jq --argjson workspace_id "$target_workspace_id" -nc "$action" | tee /dev/stderr | socat STDIO "$NIRI_SOCKET"
+    '';
+  };
+  with-empty-unnamed-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_empty_unnamed_workspace);
+
+  with_select_window = pkgs.writeShellApplication {
+    name = "with-select-window";
+    runtimeInputs = [ niri pkgs.gojq pkgs.socat config.programs.fuzzel.package pkgs.gawk ];
+    text = ''
+      window_select="$1"
+      shift
+      action="$1"
+      shift
+
+      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 --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")"
+
+      [[ -z "$window_json" ]] && exit 1
+
+      jq -c "$action" <<<"$window_json" | socat STDIO "$NIRI_SOCKET"
+    '';
+  };
+  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
+    ./mako.nix
+    ./swayosd.nix
   ];
 
+  options = {
+    programs.niri.scratchspaces = lib.mkOption {
+      type = lib.types.listOf (lib.types.submodule ({ config, ... }: {
+        options = {
+          name = lib.mkOption {
+            type = lib.types.str;
+          };
+          match = lib.mkOption {
+            type = lib.types.listOf (lib.types.attrsOf kdl.types.kdl-args);
+            default = [];
+          };
+          exclude = lib.mkOption {
+            type = lib.types.listOf (lib.types.attrsOf kdl.types.kdl-args);
+            default = [];
+          };
+          windowRuleExtra = lib.mkOption {
+            type = kdl.types.kdl-nodes;
+            default = [];
+          };
+          key = lib.mkOption {
+            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;
+          };
+          app-id = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+          };
+          selector = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+          };
+        };
+
+        config = lib.mkMerge [
+          (lib.mkIf (config.app-id != null) {
+            match = lib.mkDefault [ { app-id = "^${lib.escapeRegex config.app-id}$"; } ];
+            selector = lib.mkDefault "select(.app_id == \"${config.app-id}\")";
+          })
+        ];
+      }));
+      default = [];
+    };
+  };
+
   config = {
     systemd.user.services.xwayland-satellite = {
       Unit = {
@@ -21,7 +240,9 @@ in {
       Service = {
         Type = "notify";
         NotifyAccess = "all";
-        ExecStart = lib.getExe pkgs.xwayland-satellite-unstable;
+        Environment = [ "DISPLAY=:0" ];
+        ExecStart = ''${lib.getExe pkgs.xwayland-satellite-unstable} ''${DISPLAY}'';
+        ExecStartPre = "${systemctl} --user import-environment DISPLAY";
         StandardOutput = "journal";
       };
       Install = {
@@ -29,111 +250,765 @@ in {
       };
     };
 
-    programs.niri.settings = {
-      prefer-no-csd = true;
-      screenshot-path = "${config.home.homeDirectory}/screenshots";
+    services.swayidle = {
+      events = [
+        { event = "after-resume"; command = "${lib.getExe niri} msg action power-on-monitors"; }
+      ];
+      timeouts = [
+        { timeout = 540;
+          command = "${lib.getExe niri} msg action power-off-monitors";
+        }
+      ];
+    };
 
-      input = {
-        keyboard.xkb = {
-          layout = "us,";
-          variant = "dvp,";
-          options = "compose:caps,grp:win_space_toggle";
-        };
+    systemd.user.sockets.niri-workspace-history = {
+      Socket = {
+        ListenStream = "%t/niri-workspace-history.sock";
+        SocketMode = "0600";
       };
-
-      environment = {
-        NIXOS_OZONE_WL = "1";
-        QT_QPA_PLATFORM = "wayland";
-        GDK_BACKEND = "wayland";
-        SDL_VIDEODRIVER = "wayland";
+    };
+    systemd.user.services.niri-workspace-history = {
+      Unit = {
+        BindsTo = [ "niri.service" ];
+        After = [ "niri.service" ];
       };
+      Install = {
+        WantedBy = [ "niri.service" ];
+      };
+      Service = {
+        Type = "simple";
+        Sockets = [ "niri-workspace-history.socket" ];
+        ExecStart = pkgs.writers.writePython3 "niri-workspace-history" { flakeIgnore = ["E501"]; } ''
+          import os
+          import socket
+          import json
+          # import sys
+          from collections import defaultdict
+          from threading import Thread, Lock
+          from socketserver import StreamRequestHandler, ThreadingTCPServer
+          from contextlib import contextmanager
+          from io import TextIOWrapper
 
-      cursor.hide-when-typing = true;
 
-      binds = with config.lib.niri.actions; {
-        "Mod+Return".action = spawn terminal;
-        "Mod+Q".action = close-window;
-        "Mod+D".action = spawn (lib.getExe config.programs.fuzzel.package);
-        "Mod+Shift+D".action = spawn (lib.getExe config.programs.fuzzel.package) "--list-executables-in-path";
+          @contextmanager
+          def detaching(thing):
+              try:
+                  yield thing
+              finally:
+                  thing.detach()
 
-        "Mod+H".action = focus-column-left;
-        "Mod+T".action = focus-window-down;
-        "Mod+N".action = focus-window-up;
-        "Mod+S".action = focus-column-right;
 
-        "Mod+Shift+H".action = move-column-left;
-        "Mod+Shift+T".action = move-window-down;
-        "Mod+Shift+N".action = move-window-up;
-        "Mod+Shift+S".action = move-column-right;
+          workspace_history = defaultdict(list)
+          history_lock = Lock()
 
-        "Mod+Control+H".action = focus-monitor-left;
-        "Mod+Control+T".action = focus-monitor-down;
-        "Mod+Control+N".action = focus-monitor-up;
-        "Mod+Control+S".action = focus-monitor-right;
 
-        "Mod+Shift+Control+H".action = move-workspace-to-monitor-left;
-        "Mod+Shift+Control+T".action = move-workspace-to-monitor-down;
-        "Mod+Shift+Control+N".action = move-workspace-to-monitor-up;
-        "Mod+Shift+Control+S".action = move-workspace-to-monitor-right;
+          def monitor_niri():
+              workspaces = list()
 
-        "Mod+G".action = focus-workspace-down;
-        "Mod+C".action = focus-workspace-up;
+              def focus_workspace(output, workspace):
+                  with history_lock:
+                      workspace_history[output] = [workspace] + [ws for ws in workspace_history[output] if ws != workspace]
+                      # print(json.dumps(workspace_history), file=sys.stderr)
 
-        "Mod+Control+G".action = move-column-to-workspace-down;
-        "Mod+Control+C".action = move-column-to-workspace-up;
+              sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+              sock.connect(os.environ["NIRI_SOCKET"])
+              sock.send(b"\"EventStream\"\n")
+              for line in sock.makefile(buffering=1, encoding='utf-8'):
+                  if line_json := json.loads(line):
+                      if "WorkspacesChanged" in line_json:
+                          workspaces = line_json["WorkspacesChanged"]["workspaces"]
+                          for ws in workspaces:
+                              if ws["is_focused"]:
+                                  focus_workspace(ws["output"], ws["id"])
+                      if "WorkspaceActivated" in line_json:
+                          for ws in workspaces:
+                              if ws["id"] != line_json["WorkspaceActivated"]["id"]:
+                                  continue
+                              focus_workspace(ws["output"], ws["id"])
+                              break
 
-        "Mod+Shift+G".action = move-workspace-down;
-        "Mod+Shift+C".action = move-workspace-up;
 
-        "Mod+M".action = consume-window-into-column;
-        "Mod+W".action = expel-window-from-column;
+          class RequestHandler(StreamRequestHandler):
+              def handle(self):
+                  with detaching(TextIOWrapper(self.wfile, encoding='utf-8', write_through=True)) as out:
+                      with history_lock:
+                          json.dump(workspace_history, out)
 
-        "Mod+F".action = maximize-column;
-        "Mod+Shift+F".action = fullscreen-window;
 
-        "Mod+Space".action = switch-focus-between-floating-and-tiling;
-        "Mod+Shift+Space".action = toggle-window-floating;
+          class Server(ThreadingTCPServer):
+              def __init__(self):
+                  ThreadingTCPServer.__init__(self, ("", 8000), RequestHandler, bind_and_activate=False)
+                  self.socket = socket.fromfd(3, self.address_family, self.socket_type)
 
-        "Mod+Left".action = set-column-width "-10%";
-        "Mod+Down".action = set-window-height "-10%";
-        "Mod+Up".action = set-window-height "+10%";
-        "Mod+Right".action = set-column-width "+10%";
 
-        "Mod+Shift+Z" = {
-          action = spawn (lib.getExe niri) "msg" "action" "power-off-monitors";
-          allow-when-locked = true;
-        };
+          def run_server():
+              with Server() as server:
+                  server.serve_forever()
 
-        "XF86MonBrightnessUp" = {
-          action = spawn lightctl "-d" "-e4" "-n1" "up";
-          allow-when-locked = true;
-        };
-        "XF86MonBrightnessDown" = {
-          action = spawn lightctl "-d" "-e4" "-n1" "down";
-          allow-when-locked = true;
-        };
-        "XF86AudioRaiseVolume" = {
-          action = spawn volumectl "-d" "-u" "up";
-          allow-when-locked = true;
-        };
-        "XF86AudioLowerVolume" = {
-          action = spawn volumectl "-d" "-u" "down";
-          allow-when-locked = true;
-        };
-        "XF86AudioMute" = {
-          action = spawn volumectl "-d" "toggle-mute";
-          allow-when-locked = true;
-        };
-        "XF86AudioMicMute" = {
-          action = spawn volumectl "-d" "-m" "toggle-mute";
-          allow-when-locked = true;
-        };
 
-        "Mod+Semicolon".action = spawn dunstctl "close";
-        "Mod+Shift+Semicolon".action = spawn dunstctl "close-all";
-        "Mod+Period".action = spawn dunstctl "context";
-        "Mod+Comma".action = spawn dunstctl "history-pop";
+          niri = Thread(target=monitor_niri)
+          niri.daemon = True
+          niri.start()
+
+          server_thread = Thread(target=run_server)
+          server_thread.daemon = True
+          server_thread.start()
+
+          while True:
+              server_thread.join(timeout=0.5)
+              niri.join(timeout=0.5)
+
+              if not (niri.is_alive() and server_thread.is_alive()):
+                  break
+        '';
       };
     };
+    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";
+        key = "Mod+Control+A";
+        spawn = ["pwvucontrol"];
+        app-id = "com.saivert.pwvucontrol";
+      }
+      { name = "kpxc";
+        exclude = [
+          { title = "^Unlock Database.*"; }
+          { title = "^Access Request.*"; }
+          { title = ".*Passkey credentials$"; }
+        ];
+        windowRuleExtra = with kdl; [
+          (kdl.leaf "open-focused" false)
+        ];
+        key = "Mod+Control+P";
+        app-id = "org.keepassxc.KeePassXC";
+        spawn = [ "keepassxc" ];
+      }
+      { name = "bmgr";
+        key = "Mod+Control+B";
+        app-id = ".blueman-manager-wrapped";
+        spawn = [ "blueman-manager" ];
+      }
+      { name = "term";
+        key = "Mod+Control+Return";
+        app-id = "kitty-scratch";
+        spawn = [ "kitty" "--app-id" "kitty-scratch" ];
+      }
+      { name = "edit";
+        match = [ { title = "^scratch$"; app-id = "^emacs$"; } ];
+        key = "Mod+Control+E";
+        selector = "select(.app_id == \"emacs\" and .title == \"scratch\")";
+        spawn = [ "emacsclient" "-c" "--frame-parameters=(quote (name . \"scratch\"))" ];
+      }
+      { name = "eff";
+        key = "Mod+Control+O";
+        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; [
+          (leaf "block-out-from" "screencast")
+        ];
+      }
+    ];
+    programs.niri.config =
+      let
+        inherit (kdl) node plain leaf flag;
+        optional-node = cond: v:
+          if cond
+          then v
+          else null;
+        opt-props = lib.filterAttrs (lib.const (value: value != null));
+      in
+        [ (flag "prefer-no-csd")
+
+          (leaf "screenshot-path" "~/screenshots/%Y-%m-%dT%H:%M:%S.png")
+
+          (plain "hotkey-overlay" [
+            (flag "skip-at-startup")
+          ])
+
+          (plain "input" [
+            (plain "keyboard" [
+              (leaf "repeat-delay" 300)
+              (leaf "repeat-rate" 50)
+
+              (plain "xkb" [
+                (leaf "layout" "us,us")
+                (leaf "variant" "dvp,")
+                (leaf "options" "compose:caps,grp:win_space_toggle")
+              ])
+            ])
+
+            (flag "workspace-auto-back-and-forth")
+            # (leaf "focus-follows-mouse" {})
+            # (flag "warp-mouse-to-focus")
+
+            # (plain "touchpad" [ (flag "off") ])
+            (plain "trackball" [
+              (leaf "scroll-method" "on-button-down")
+              (leaf "scroll-button" 278)
+            ])
+            (plain "touch" [
+              (leaf "map-to-output" "eDP-1")
+            ])
+          ])
+
+          (plain "gestures" [
+            (plain "hot-corners" [(flag "off")])
+          ])
+
+          (plain "environment" (lib.mapAttrsToList leaf {
+            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" "Ancor Communications Inc ASUS PB287Q 0x0000DD9B" [
+            (leaf "scale" 1.5)
+            (leaf "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; })
+            (flag "variable-refresh-rate")
+          ])
+
+          (plain "debug" [
+            (leaf "render-drm-device" "/dev/dri/by-path/pci-0000:00:02.0-render")
+          ])
+
+          (plain "animations" [
+            (leaf "slowdown" 0.5)
+            (plain "workspace-switch" [(flag "off")])
+          ])
+
+          (plain "layout" [
+            (leaf "gaps" 8)
+            (plain "struts" [
+              (leaf "left" 26)
+              (leaf "right" 26)
+              (leaf "top" 0)
+              (leaf "bottom" 0)
+            ])
+            (plain "border" [
+              (leaf "width" 2)
+              (leaf "active-gradient" {
+                from = "hsla(195 100% 45% 1)";
+                to = "hsla(155 100% 37.5% 1)";
+                angle = 29;
+                relative-to = "workspace-view";
+              })
+              (leaf "inactive-gradient" {
+                from = "hsla(0 0% 27.7% 1)";
+                to = "hsla(0 0% 23% 1)";
+                angle = 29;
+                relative-to = "workspace-view";
+              })
+            ])
+            (plain "focus-ring" [
+              (flag "off")
+            ])
+
+            (plain "preset-column-widths" (map (prop: leaf "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) [
+              (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)
+              (flag "place-within-column")
+              (leaf "length" { total-proportion = 1.; })
+              (leaf "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" {
+                from = "hsla(0 0% 42% 0.66)";
+                to = "hsla(0 0% 35% 0.66)";
+                angle = 29;
+                relative-to = "workspace-view";
+              })
+            ])
+          ])
+
+          (plain "cursor" [
+            (flag "hide-when-typing")
+          ])
+
+          (map (name:
+            (node "workspace" name [
+              (leaf "open-on-output" "eDP-1")
+            ])
+          ) (map ({name, ...}: name) cfg.scratchspaces))
+          (map (name:
+            (leaf "workspace" name)
+          ) ["comm" "web" "vid" "bmr"])
+
+          (plain "window-rule" [
+            (leaf "clip-to-geometry" true)
+          ])
+
+          (plain "window-rule" [
+            (leaf "match" { is-floating = true; })
+            (leaf "geometry-corner-radius" 8)
+            (plain "shadow" [ (flag "on") ])
+          ])
+
+          (plain "window-rule" [
+            (leaf "match" { app-id = "^org\\.keepassxc\\.KeePassXC$"; })
+            (leaf "block-out-from" "screencast")
+          ])
+          (plain "window-rule" [
+            (map (title:
+              (leaf "match" { app-id = "^org\\.keepassxc\\.KeePassXC$"; inherit title; })
+            ) ["^Unlock Database.*" "^Access Request.*" ".*Passkey credentials$" "Browser Access Request$"])
+            (leaf "open-focused" true)
+            (leaf "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)
+              windowRuleExtra
+            ]))
+          ) cfg.scratchspaces)
+
+          (plain "window-rule" [
+            (leaf "match" { app-id = "^emacs$"; })
+            (leaf "match" { app-id = "^firefox$"; })
+            (plain "default-column-width" [(leaf "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.))])
+          ])
+
+          (plain "window-rule" [
+            (leaf "match" { app-id = "^thunderbird$"; })
+            (leaf "match" { app-id = "^Element$"; })
+            (leaf "match" { app-id = "^chrome-web\.openrainbow\.com__-Default$"; })
+            (leaf "open-on-workspace" "comm")
+          ])
+          (plain "window-rule" [
+            (leaf "match" { app-id = "^firefox$"; })
+            (leaf "open-on-workspace" "web")
+            (leaf "open-maximized" true)
+          ])
+          (plain "window-rule" [
+            (leaf "match" { app-id = "^mpv$"; })
+            (leaf "open-on-workspace" "vid")
+            (plain "default-column-width" [(leaf "proportion" 1.)])
+          ])
+          (plain "window-rule" [
+            (leaf "match" { app-id = "^kitty-play$"; })
+            (leaf "open-on-workspace" "vid")
+            (leaf "open-focused" false)
+          ])
+          (plain "window-rule" [
+            (leaf "match" { app-id = "^chrome-audiobookshelf\.yggdrasil\.li__-Default$"; })
+            (leaf "match" { app-id = "^YouTube Music Desktop App$"; })
+            (leaf "open-on-workspace" "vid")
+          ])
+          (plain "window-rule" [
+            (leaf "match" { app-id = "^pdfpc$"; })
+            (plain "default-column-width" [(leaf "proportion" 1.)])
+          ])
+          (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)
+          ])
+          (plain "window-rule" [
+            (map (leaf "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)
+          ])
+          (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")
+          ])
+
+          (plain "layer-rule" [
+            (leaf "match" { namespace = "^notifications$"; })
+            (leaf "match" { namespace = "^waybar$"; })
+            (leaf "match" { namespace = "^launcher$"; })
+            (leaf "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"]));
+            in
+              [
+                (lib.mapAttrsToList bind (with config.lib.niri.actions; {
+                  "Mod+Slash".action = show-hotkey-overlay;
+
+                  "Mod+Return".action = spawn terminal;
+                  "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";
+
+                  "Mod+Alt+E".action = spawn (lib.getExe' config.services.emacs.package "emacsclient") "-c";
+                  "Mod+Alt+Y".action = spawn (lib.getExe (pkgs.writeShellApplication {
+                    name = "queue-yt-dlp";
+                    runtimeInputs = with pkgs; [ wl-clipboard-rs socat ];
+                    text = ''
+                      socat STDIO UNIX-CONNECT:"$XDG_RUNTIME_DIR"/yt-dlp.sock <<<$'{ "urls": ["'"$(wl-paste)"$'"] }'
+                    '';
+                  }));
+                  "Mod+Alt+L".action = spawn (lib.getExe (pkgs.writeShellApplication {
+                    name = "queue-yt-dlp";
+                    runtimeInputs = with pkgs; [ wl-clipboard-rs config.programs.kitty.package ];
+                    text = ''
+                      exec -- kitty --app-id kitty-play --directory "$HOME"/media mpv "$(wl-paste)"
+                    '';
+                  }));
+                  "Mod+Alt+M".action = spawn (lib.getExe' pkgs.screen-message "sm") "-n" "Fira Mono" "-a" "1" "-f" "#fff" "-b" "#000";
+
+                  "Mod+U".action = spawn (lib.getExe (pkgs.writeShellApplication {
+                    name = "qalc-fuzzel";
+                    runtimeInputs = with pkgs; [ wl-clipboard-rs libqalculate config.programs.fuzzel.package coreutils findutils libnotify gnugrep ];
+                    text = ''
+                      RESULTS_DIR="$HOME/.cache/qalc-fuzzel"
+                      prev() {
+                        FOUND=false
+                        while IFS= read -r line; do
+                          [[ -n "$line" ]] || continue
+                          FOUND=true
+                          echo "$line"
+                        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> " --width=60) || exit $?
+                      if [[ "$FUZZEL_RES" =~ .*\ =\ .* ]]; then
+                        QALC_RES="$FUZZEL_RES"
+                        QALC_RET=0
+                      else
+                        QALC_RES=$(qalc -set "autocalc off" "$FUZZEL_RES" 2>&1)
+                        QALC_RET=$?
+                      fi
+                      [[ -n "$QALC_RES" ]] || exit 1
+                      EXISTING=false
+                      set +o pipefail
+                      grep -Fxrl "$QALC_RES" "$RESULTS_DIR" | xargs -r touch
+                      [[ ''${PIPESTATUS[0]} -eq 0 ]] && EXISTING=true
+                      set -o pipefail
+                      if [[ $QALC_RET -eq 0 ]] && ! $EXISTING; then
+                        set +o pipefail
+                        RES_FILE="$RESULTS_DIR"/$(date -uIs).$(tr -Cd 'a-zA-Z0-9' </dev/random | head -c 10)
+                        set -o pipefail
+                        cat >"$RES_FILE" <<<"$QALC_RES"
+                      fi
+                      [[ "$QALC_RES" =~ .*\ =\ (.*) ]] && QALC_RES="''${BASH_REMATCH[1]}"
+                      [[ $QALC_RET -eq 0 ]] && wl-copy "$QALC_RES"
+                      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> " --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 = 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}}}";
+
+                  "Mod+Escape" = {
+                    allow-inhibiting = false;
+                    action = toggle-keyboard-shortcuts-inhibit;
+                  };
+
+                  "Mod+H".action = focus-column-left;
+                  "Mod+T".action = focus-window-down;
+                  "Mod+N".action = focus-window-up;
+                  "Mod+S".action = focus-column-right;
+
+                  "Mod+Shift+H".action = move-column-left;
+                  "Mod+Shift+T".action = move-window-down;
+                  "Mod+Shift+N".action = move-window-up;
+                  "Mod+Shift+S".action = move-column-right;
+
+                  "Mod+Control+H".action = focus-monitor-left;
+                  "Mod+Control+T".action = focus-monitor-down;
+                  "Mod+Control+N".action = focus-monitor-up;
+                  "Mod+Control+S".action = focus-monitor-right;
+
+                  "Mod+Shift+Control+H".action = move-workspace-to-monitor-left;
+                  "Mod+Shift+Control+T".action = move-workspace-to-monitor-down;
+                  "Mod+Shift+Control+N".action = move-workspace-to-monitor-up;
+                  "Mod+Shift+Control+S".action = move-workspace-to-monitor-right;
+
+                  "Mod+G".action = focus-adjacent-workspace "down";
+                  "Mod+C".action = focus-adjacent-workspace "up";
+
+                  "Mod+Shift+G".action = move-column-to-adjacent-workspace "down";
+                  "Mod+Shift+C".action = move-column-to-adjacent-workspace "up";
+
+                  "Mod+Shift+Control+G".action = move-workspace-down;
+                  "Mod+Shift+Control+C".action = move-workspace-up;
+
+                  "Mod+ParenLeft".action = focus-workspace "comm";
+                  "Mod+Shift+ParenLeft".action = kdl.magic-leaf "move-column-to-workspace" "comm";
+
+                  "Mod+ParenRight".action = focus-workspace "web";
+                  "Mod+Shift+ParenRight".action = kdl.magic-leaf "move-column-to-workspace" "web";
+
+                  "Mod+BraceRight".action = focus-workspace "read";
+                  "Mod+Shift+BraceRight".action = kdl.magic-leaf "move-column-to-workspace" "read";
+
+                  "Mod+BraceLeft".action = focus-workspace "mon";
+                  "Mod+Shift+BraceLeft".action = kdl.magic-leaf "move-column-to-workspace" "mon";
+
+                  "Mod+Asterisk".action = focus-workspace "vid";
+                  "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}, "focus": true}}}'';
+
+                  "Mod+M".action = consume-or-expel-window-left;
+                  "Mod+W".action = consume-or-expel-window-right;
+
+                  "Mod+Shift+M".action = toggle-column-tabbed-display;
+
+                  "Mod+R".action = switch-preset-column-width;
+                  "Mod+Shift+R".action = maximize-column;
+                  "Mod+Shift+Ctrl+R".action = switch-preset-window-height;
+                  "Mod+F".action = center-column;
+                  "Mod+Shift+F".action = toggle-windowed-fullscreen;
+                  "Mod+Ctrl+Shift+F".action = fullscreen-window;
+
+                  "Mod+V".action = switch-focus-between-floating-and-tiling;
+                  "Mod+Shift+V".action = toggle-window-floating;
+
+                  "Mod+Left".action = set-column-width "-10%";
+                  "Mod+Down".action = set-window-height "-10%";
+                  "Mod+Up".action = set-window-height "+10%";
+                  "Mod+Right".action = set-column-width "+10%";
+
+                  "Mod+Shift+Z" = {
+                    action = spawn (lib.getExe niri) "msg" "action" "power-off-monitors";
+                    allow-when-locked = true;
+                  };
+                  "Mod+Shift+L".action = spawn loginctl "lock-session";
+                  "Mod+Shift+E".action = quit;
+                  "Mod+Shift+Minus" = {
+                    action = spawn systemctl "suspend";
+                    allow-when-locked = true;
+                  };
+                  "Mod+Shift+Control+Minus" = {
+                    action = spawn systemctl "hibernate";
+                    allow-when-locked = true;
+                  };
+                  "Mod+Shift+P" = {
+                    action = spawn (lib.getExe pkgs.playerctl) "-a" "pause";
+                    allow-when-locked = true;
+                  };
+
+                  "XF86MonBrightnessUp" = {
+                    action = spawn swayosd-client "--brightness" "raise";
+                    allow-when-locked = true;
+                  };
+                  "XF86MonBrightnessDown" = {
+                    action = spawn swayosd-client "--brightness" "lower";
+                    allow-when-locked = true;
+                  };
+                  "XF86AudioRaiseVolume" = {
+                    action = spawn swayosd-client "--output-volume" "raise";
+                    allow-when-locked = true;
+                  };
+                  "XF86AudioLowerVolume" = {
+                    action = spawn swayosd-client "--output-volume" "lower";
+                    allow-when-locked = true;
+                  };
+                  "XF86AudioMute" = {
+                    action = spawn swayosd-client "--output-volume" "mute-toggle";
+                    allow-when-locked = true;
+                  };
+                  "XF86AudioMicMute" = {
+                    action = spawn swayosd-client "--input-volume" "mute-toggle";
+                    allow-when-locked = true;
+                  };
+
+                  "Mod+Semicolon".action = spawn makoctl "dismiss" "--group";
+                  "Mod+Shift+Semicolon".action = spawn makoctl "dismiss" "--all";
+                  "Mod+Period".action = spawn makoctl "menu" "--" (lib.getExe config.programs.fuzzel.package) "--dmenu";
+                  "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}, \"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
new file mode 100644
index 00000000..eba26caa
--- /dev/null
+++ b/accounts/gkleen@sif/niri/mako.nix
@@ -0,0 +1,113 @@
+{ config, lib, pkgs, ... }:
+{
+  config = {
+    services.mako = {
+      enable = true;
+      settings = {
+        font = "Fira Sans 10";
+        format = "<i>%s</i>\\n%b";
+        margin = "2";
+        max-visible = -1;
+        background-color = "#000000dd";
+        progress-color = "source #223544ff";
+        width = 384;
+        outer-margin = 1;
+        max-history = 100;
+        max-icon-size = 48;
+      };
+      criteria = {
+        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 {
+        name = "${pkgs.mako.name}-wrapped";
+        paths = with pkgs; [ mako ];
+        inherit (pkgs.mako) meta;
+        postBuild = ''
+          rm -r $out/share/dbus-1
+        '';
+      };
+    };
+    systemd.user.services.mako = {
+      Unit = {
+        Description = "Mako notification daemon";
+        PartOf = [ "graphical-session.target" ];
+      };
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+      Service = {
+        Type = "dbus";
+        BusName = "org.freedesktop.Notifications";
+        ExecStart = lib.getExe config.services.mako.package;
+        RestartSec = 5;
+        Restart = "always";
+      };
+    };
+
+    systemd.user.services.mako-follows-focus = {
+      Unit = {
+        BindsTo = [ "niri.service" "mako.service" ];
+        After = [ "niri.service" "mako.service" ];
+      };
+      Service = {
+        Type = "simple";
+        Restart = "always";
+        ExecStart = pkgs.writers.writePython3 "mako-follows-focus" {
+          libraries = with pkgs.python3Packages; [];
+        } ''
+          import os
+          import socket
+          import json
+          import subprocess
+
+
+          current_output = None
+          workspaces = []
+
+
+          def output_changed(new_output):
+              global current_output
+
+              if current_output == new_output:
+                  return
+
+              current_output = new_output
+              subprocess.run(["makoctl", "reload"])
+
+
+          sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+          sock.connect(os.environ["NIRI_SOCKET"])
+          sock.send(b"\"EventStream\"\n")
+          for line in sock.makefile(buffering=1, encoding='utf-8'):
+              if line_json := json.loads(line):
+                  if "WorkspacesChanged" in line_json:
+                      workspaces = line_json["WorkspacesChanged"]["workspaces"]
+                      for workspace in workspaces:
+                          if not workspace["is_focused"]:
+                              continue
+                          output_changed(workspace["output"])
+                          break
+                  if "WorkspaceActivated" in line_json and line_json["WorkspaceActivated"]["focused"]:  # noqa: E501
+                      for workspace in workspaces:
+                          if not workspace["id"] == line_json["WorkspaceActivated"]["id"]:  # noqa: E501
+                              continue
+                          output_changed(workspace["output"])
+                          break
+        '';
+      };
+      Install = {
+        WantedBy = [ "mako.service" ];
+      };
+    };
+  };
+}
diff --git a/accounts/gkleen@sif/niri/swayosd.nix b/accounts/gkleen@sif/niri/swayosd.nix
new file mode 100644
index 00000000..54ebb302
--- /dev/null
+++ b/accounts/gkleen@sif/niri/swayosd.nix
@@ -0,0 +1,66 @@
+{ pkgs, ... }:
+{
+  config = {
+    services.swayosd = {
+      enable = true;
+      topMargin = 0.4769706078;
+      stylePath = pkgs.runCommand "style.css" {
+        passAsFile = [ "src" ];
+        src = ''
+          window#osd {
+            padding: 12px 20px;
+            border-radius: 999px;
+            border: none;
+            background: rgba(0, 0, 0, 0.87);
+
+            #container {
+              margin: 16px;
+            }
+
+            image,
+            label {
+              color: rgb(255, 255, 255);
+
+              &:disabled {
+                opacity: 1;
+                color: rgb(84, 84, 84);
+              }
+            }
+
+            progressbar {
+              min-height: 6px;
+              border-radius: 999px;
+              background: transparent;
+              border: none;
+
+              trough, progress {
+                min-height: inherit;
+                border-radius: inherit;
+                border: none;
+              }
+
+              trough {
+                background: rgb(127, 127, 127);
+              }
+              progress {
+                background: rgb(255, 255, 255);
+              }
+
+              &:disabled {
+                opacity: 1;
+
+                trough {
+                  background: rgb(19, 19, 19);
+                }
+                progress {
+                  background: rgb(38, 38, 38);
+                }
+              }
+            }
+          }
+        '';
+        buildInputs = with pkgs; [sass];
+      } "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 1a25b581..c02a9a76 100644
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ b/accounts/gkleen@sif/niri/waybar.nix
@@ -1,5 +1,7 @@
-{ lib, pkgs, ... }:
-{
+{ lib, config, pkgs, ... }:
+let
+  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
+in {
   config = {
     programs.waybar = {
       enable = true;
@@ -18,20 +20,76 @@
         {
           layer = "top";
           position = "top";
-          height = 14;
+          height = 21;
           output = [ "eDP-1" "DP-2" "DP-3" ];
           modules-left = [ "niri/workspaces" ];
           modules-center = [ "niri/window" ];
-          modules-right = [ # "custom/worktime" "custom/worktime-today"
+          modules-right = [ "custom/worktime" "custom/worktime-today"
             "custom/weather"
-            # "custom/keymap"
-            "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
+            "custom/keymap"
+            "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";
+            exec = pkgs.writers.writePython3 "mako-silent" { libraries = [ pkgs.python3Packages.dbus-next ]; } ''
+              from dbus_next.aio import MessageBus
+
+              import asyncio
+
+              import json
+
+
+              loop = asyncio.new_event_loop()
+              asyncio.set_event_loop(loop)
+
+
+              async def main():
+                  bus = await MessageBus().connect()
+                  # the introspection xml would normally be included in your project, but
+                  # this is convenient for development
+                  introspection = await bus.introspect('org.freedesktop.Notifications', '/fr/emersion/Mako')  # noqa: E501
+
+                  obj = bus.get_proxy_object('org.freedesktop.Notifications', '/fr/emersion/Mako', introspection)  # noqa: E501
+                  mako = obj.get_interface('fr.emersion.Mako')
+                  properties = obj.get_interface('org.freedesktop.DBus.Properties')
+
+                  async def print_mode():
+                      modes = await mako.get_modes()
+                      is_silent = "silent" in modes
+                      icon = "&#xf009b;" if is_silent else "&#xf009a;"
+                      text = f"<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>"  # noqa: E501
+                      if is_silent:
+                          text = f"<span color=\"#ffffff\">{text}</span>"
+                      print(json.dumps({'text': text, 'tooltip': ', '.join(modes)}, separators=(',', ':')), flush=True)  # noqa: E501
+
+                  async def on_properties_changed(interface_name, changed_properties, invalidated_properties):  # noqa: E501
+                      if "Modes" not in invalidated_properties:
+                          return
+
+                      await print_mode()
+
+                  properties.on_properties_changed(on_properties_changed)
+                  await print_mode()
 
+                  await loop.create_future()
+
+
+              loop.run_until_complete(main())
+            '';
+            on-click = "makoctl mode -t silent";
+          };
           "custom/weather" = {
             format = "{}";
             tooltip = true;
             interval = 3600;
-            exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"120%\\\">{ICON}</span> {FeelsLikeC}°\"";
+            exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"100%\\\">{ICON}</span> {FeelsLikeC}°\"";
             return-type = "json";
           };
           "custom/keymap" = {
@@ -41,8 +99,6 @@
             exec = pkgs.writers.writePython3 "keymap" {} ''
               import os
               import socket
-              import re
-              import subprocess
               import json
 
 
@@ -55,33 +111,33 @@
                   print(json.dumps({'text': short, 'tooltip': keymap}, separators=(',', ':')), flush=True)  # noqa: E501
 
 
-              r = subprocess.run(["hyprctl", "devices", "-j"], check=True, stdout=subprocess.PIPE, text=True)  # noqa: E501
-              for keyboard in json.loads(r.stdout)['keyboards']:
-                  if keyboard['name'] != "at-translated-set-2-keyboard":
-                      continue
-                  output(keyboard['active_keymap'])
+              keyboard_layouts = []
 
               sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-              sock.connect(os.environ["XDG_RUNTIME_DIR"] + "/hypr/" + os.environ["HYPRLAND_INSTANCE_SIGNATURE"] + "/.socket2.sock")  # noqa: E501
-              expected = re.compile(r'^activelayout>>at-translated-set-2-keyboard,(?P<keymap>.+)$')  # noqa: E501
+              sock.connect(os.environ["NIRI_SOCKET"])
+              sock.send(b"\"EventStream\"\n")
               for line in sock.makefile(buffering=1, encoding='utf-8'):
-                  if match := expected.match(line):
-                      output(match.group("keymap"))
+                  if line_json := json.loads(line):
+                      if "KeyboardLayoutsChanged" in line_json:
+                          keyboard_layouts = line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["names"]  # noqa: E501
+                          output(keyboard_layouts[line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["current_idx"]])  # noqa: E501
+                      if "KeyboardLayoutSwitched" in line_json:
+                          output(keyboard_layouts[line_json["KeyboardLayoutSwitched"]["idx"]])  # noqa: E501
             '';
-            on-click = "hyprctl switchxkblayout at-translated-set-2-keyboard next";
+            on-click = "niri msg action switch-layout next";
           };
           "custom/worktime" = {
             interval = 60;
-            exec = lib.getExe pkgs.worktime;
-            tooltip = false;
+            exec = "${lib.getExe pkgs.worktime} time --waybar";
+            return-type = "json";
           };
           "custom/worktime-today" = {
             interval = 60;
-            exec = "${lib.getExe pkgs.worktime} today";
-            tooltip = false;
+            exec = "${lib.getExe pkgs.worktime} today --waybar";
+            return-type = "json";
           };
           "niri/workspaces" = {
-            all-outputs = true;
+            ignore = map ({ name, ... }: name) config.programs.niri.scratchspaces;
           };
           "niri/window" = {
             separate-outputs = true;
@@ -142,8 +198,8 @@
             icon-size = iconSize;
             tooltip-format = "{percent}%";
             format-icons = ["&#xf00da;" "&#xf00db;" "&#xf00dc;" "&#xf00dd;" "&#xf00de;" "&#xf00df;" "&#xf00e0;"];
-            on-scroll-up = "lightctl -d -e4 -n1 up";
-            on-scroll-down = "lightctl -d -e4 -n1 down";
+            on-scroll-up = "${swayosd-client} --brightness raise";
+            on-scroll-down = "${swayosd-client} --brightness lower";
           };
           wireplumber = {
             format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
@@ -152,22 +208,22 @@
             format-icons = ["&#xf057f;" "&#xf0580;" "&#xf057e;"];
             format-muted = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">&#xf075f;</span>";
             # ignored-sinks = ["Easy Effects Sink"];
-            on-scroll-up = "volumectl -d -u up";
-            on-scroll-down = "volumectl -d -u down";
-            on-click = "volumectl -d toggle-mute";
+            on-scroll-up = "${swayosd-client} --output-volume raise";
+            on-scroll-down = "${swayosd-client} --output-volume lower";
+            on-click = "${swayosd-client} --output-volume mute-toggle";
           };
         }
         {
           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" ];
 
           "niri/workspaces" = {
-            all-outputs = false;
+            ignore = map ({ name, ... }: name) config.programs.niri.scratchspaces;
           };
           "niri/window" = {
             separate-outputs = true;
@@ -193,7 +249,7 @@
 
         * {
           border: none;
-          font-family: "Fira Sans Nerd Font";
+          font-family: "Fira Sans";
           font-size: 10pt;
           min-height: 0;
         }
@@ -204,10 +260,10 @@
         }
 
         .modules-left {
-          margin-left: 9px;
+          margin-left: 38px;
         }
         .modules-right {
-          margin-right: 9px;
+          margin-right: 38px;
         }
 
         .module {
@@ -215,13 +271,11 @@
         }
 
         #workspaces button {
-          color: @grey;
-        }
-        #workspaces button.hosting-monitor {
           color: @white;
+          padding: 2px 5px;
         }
-        #workspaces button.visible {
-          color: @blue;
+        #workspaces button.empty {
+          color: @grey;
         }
         #workspaces button.active {
           color: @green;
@@ -234,22 +288,31 @@
           color: @grey;
           margin: 0 5px;
         }
-        #custom-weather, #custom-worktime-today {
+        #custom-weather {
           margin-right: 3px;
         }
-        #custom-keymap, #custom-weather {
+        #custom-keymap {
           margin-left: 3px;
+          margin-right: 3px;
         }
 
         #tray {
           margin: 0;
         }
-        #battery, #idle_inhibitor, #backlight, #wireplumber {
+        #battery, #idle_inhibitor, #backlight, #wireplumber, #custom-mako, #custom-lid_inhibitor {
           color: @grey;
           margin: 0 5px 0 2px;
         }
         #idle_inhibitor {
-          margin-right: 2px;
+          margin-right: 4px;
+          margin-left: 6px;
+        }
+        #custom-mako {
+          margin-right: 4px;
+          margin-left: 3px;
+        }
+        #custom-lid_inhibitor {
+          margin-right: 3px;
           margin-left: 3px;
         }
         #battery {
@@ -270,17 +333,24 @@
         #idle_inhibitor.activated {
           color: @white;
         }
+        #custom-worktime.running, #custom-worktime-today.running {
+          color: @white;
+        }
+        #custom-worktime.over, #custom-worktime-today.over {
+          color: @orange;
+        }
 
-        #idle_inhibitor {
+        #idle_inhibitor, #custom-lid_inhibitor {
           padding-top: 1px;
         }
 
         #privacy {
           color: @red;
-          margin: -1px 2px 0px 5px;
+          margin: -1px 4px 0px 3px;
         }
         #clock {
           /* margin-right: 5px; */
+          font-feature-settings: "tnum";
         }
       '';
     };
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 107f1e76..a250509b 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -1,5 +1,12 @@
-{ pkgs, ... }:
-{
+{ lib, pkgs, ... }:
+let
+  autosshProxyPorts = {
+    "ssh.math.lmu.de" = 8118;
+    "mathw0h" = 8122;
+    "mathw0e" = 8124;
+  };
+  autosshProxy = host: "${lib.getExe pkgs.socat} - SOCKS4A:127.0.0.1:%h:%p,socksport=${toString autosshProxyPorts.${host}}";
+in {
   "git.ymir" =
     { hostname = "ymir.yggdrasil.li";
       user = "gitolite";
@@ -290,15 +297,15 @@
     };
   "mathw0d" =
     { hostname = "mathw0d.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mathw0e" =
     { hostname = "mathw0e.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mathw0f" =
     { hostname = "mathw0f.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mathw0g" =
     { hostname = "mathw0g.mathinst.loc";
@@ -306,8 +313,8 @@
   "mathw0h" =
     { hostname = "mathw0h.mathinst.loc";
     };
-  "proxy.mathw0g" =
-    { hostname = "mathw0g.mathinst.loc";
+  "proxy.ssh.math.lmu.de" =
+    { hostname = "ssh.math.lmu.de";
       extraOptions = {
         ControlPath = "none";
         ExitOnForwardFailure = "yes";
@@ -317,7 +324,17 @@
     };
   "proxy.mathw0h" =
     { hostname = "mathw0h.mathinst.loc";
-      proxyJump = "proxy.mathw0g";
+      proxyCommand = autosshProxy "ssh.math.lmu.de";
+      extraOptions = {
+        ControlPath = "none";
+        ExitOnForwardFailure = "yes";
+        ServerAliveCountMax = "15";
+        ServerAliveInterval = "2";
+      };
+    };
+  "proxy.mathw0e" =
+    { hostname = "mathw0e.mathinst.loc";
+      proxyCommand = autosshProxy "mathw0h";
       extraOptions = {
         ControlPath = "none";
         ExitOnForwardFailure = "yes";
@@ -327,7 +344,7 @@
     };
   "vrt-kvm06" =
     { hostname = "vrt-kvm06";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -336,7 +353,7 @@
     };
   "vrt-kvm05" =
     { hostname = "vrt-kvm05";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -345,7 +362,7 @@
     };
   "vrt-kvm04" =
     { hostname = "vrt-kvm04";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -354,7 +371,7 @@
     };
   "vrt-kvm02" =
     { hostname = "vrt-kvm02";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -363,7 +380,7 @@
     };
   "vrt-kvm03" =
     { hostname = "vrt-kvm03";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -372,7 +389,7 @@
     };
   "vrt-kvm01" =
     { hostname = "vrt-kvm01";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -381,39 +398,44 @@
     };
   "tts-www01" =
     { hostname = "tts-www01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "vpn-wg01" =
     { hostname = "vpn-wg01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "repo-apt01" =
     { hostname = "repo-apt01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "ldap-lmumr01" =
     { hostname = "ldap-lmumr01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "mail-mi01" =
     { hostname = "mail-mi01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mail-www02" =
     { hostname = "mail-www02.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "dpl-fai01" =
     { hostname = "dpl-fai01.mathinst.loc";
       user = "root";
     };
+  "dpl-fai02" =
+    { hostname = "dpl-fai02.mathinst.loc";
+      user = "root";
+      proxyJump = "mgmt01";
+    };
   "math05" =
     { hostname = "math05.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       extraOptions.KexAlgorithms = "+diffie-hellman-group1-sha1";
     };
   "switch01" =
@@ -439,20 +461,20 @@
     };
   "www-mi01" =
     { hostname = "www-mi01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "cip04" =
     { hostname = "cip04.cipmath.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "mgmt-cls01" =
     { user = "root";
       hostname = "mgmt-cls01.cipmath.loc";
-      proxyJump = "ssh.math.lmu.de";
+      proxyCommand = autosshProxy "ssh.math.lmu.de";
     };
   "mgmt01" =
     { hostname = "mgmt01.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
       user = "root";
     };
   "ssh-lb01" =
@@ -471,17 +493,17 @@
   "rdlx02" = { hostname = "rdlx02.mathinst.loc"; proxyJump = "mgmt01"; };
   "math0d" =
     { hostname = "math0d.mathinst.loc";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "dhcp01" =
     { hostname = "dhcp01.mathinst.loc";
       user = "root";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "dhcp02" =
     { hostname = "dhcp02.mathinst.loc";
       user = "root";
-      proxyJump = "mathw0h";
+      proxyCommand = autosshProxy "mathw0h";
     };
   "cc-gpu-l01" =
     { hostname = "cc-gpu-l01.mathinst.loc";
@@ -546,7 +568,7 @@
       user = "root";
     };
   "nas*" =
-    { proxyJump = "mathw0e";
+    { proxyCommand = autosshProxy "mathw0e";
       user = "admin";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -554,9 +576,4 @@
         HostKeyAlgorithms = "+ecdsa-sha2-nistp256";
       };
     };
-  "game01" =
-    { hostname = "game01.yggdrasil.li";
-      user = "factorio";
-      identityFile = "~/.ssh/gkleen@sif.midgard.yggdrasil";
-    };
 }
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 c8400c28..90cccc58 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -6,7 +6,7 @@ let
   cfg = config.home-manager.users.${userName};
 
   autossh-socks-script = pkgs.writeScript "autossh" ''
-    #!${pkgs.zsh}/bin/zsh -xe
+    #!${lib.getExe pkgs.zsh} -xe
 
     host="''${1%:*}"
     port="''${1#*:}"
@@ -15,31 +15,29 @@ let
     cmd=()
 
     if [[ -n "''${SSHPASS_SECRET}" ]]; then
-      cmd+=(${pkgs.sshpassSecret}/bin/sshpass-secret)
+      cmd+=(${lib.getExe' pkgs.sshpassSecret "sshpass-secret"})
       cmd+=("''${(@s/:/)SSHPASS_SECRET}")
       cmd+=(--)
     fi
 
-    cmd+=(${pkgs.openssh}/bin/ssh -vN -D localhost:''${port} "''${host}")
+    cmd+=(${lib.getExe' pkgs.openssh "ssh"} -vN -D 127.0.0.1:''${port} "''${host}")
 
     ( exec -a "''${cmd[1]}" -- ''${cmd} ) &
     pid=$!
 
     newpid=""
     i=200
-    while ! newpid=$(${pkgs.lsof}/bin/lsof -Pi @localhost:"''${port}" -sTCP:LISTEN -t); do
+    while ! newpid=$(${lib.getExe pkgs.lsof} -Pi @localhost:"''${port}" -sTCP:LISTEN -t); do
       if ! kill -0 "''${pid}"; then
         wait "''${pid}"
         exit $?
       fi
       [[ "''${i}" -gt 0 ]] || exit 1
       i=$((''${i} - 1))
-      ${pkgs.coreutils}/bin/sleep 0.1
+      ${lib.getExe' pkgs.coreutils "sleep"} 0.1
     done
 
-    ${config.systemd.package}/bin/systemd-notify --ready
-
-    wait "''${pid}" "''${newpid}"
+    ${lib.getExe' config.systemd.package "systemd-notify"} --pid=''${newpid} --ready
   '';
 in {
   tmpfiles.rules = [
@@ -48,11 +46,11 @@ in {
   ];
 
   services = {
-    sync-keepass = {
+    "sync-keepass@" = {
       Service = {
         Type = "oneshot";
         WorkingDirectory = "~";
-        ExecStart = toString (pkgs.writers.writePython3 "sync-keepass" {
+        ExecStart = "${pkgs.writers.writePython3 "sync-keepass" {
           libraries = with pkgs.python3Packages; [ python-dateutil ];
         } ''
           import json
@@ -61,13 +59,13 @@ in {
           from datetime import datetime
           from dateutil.tz import tzlocal
           from dateutil.parser import isoparse
-          from sys import stderr
+          from sys import stderr, argv
 
 
-          remote_fs = 'surtr'
-          remote_file = 'store.kdbx'
-          target_file = expanduser('~/store.kdbx')
-          meta_file = expanduser('~/.store.kdbx.json')
+          remote_fs = 'surtr' if argv[1] == 'store.kdbx' else 'mathcloud'
+          remote_file = argv[1]
+          target_file = expanduser(f'~/{argv[1]}')
+          meta_file = expanduser(f'~/.{argv[1]}.json')
 
           upload_time = None
           our_last_upload_time = None
@@ -117,22 +115,14 @@ in {
               do_upload()
           elif upload_time is not None and (mod_time is None or upload_time > mod_time) and (our_last_upload_time is None or upload_time > our_last_upload_time):  # noqa: E501
               do_download()
-        '');
+        ''} \"%I\"";
         Environment = [ "RCLONE_PASSWORD_COMMAND=\"${pkgs.coreutils}/bin/cat ${config.sops.secrets.gkleen-rclone.path}\"" "PATH=${pkgs.rclone}/bin" ];
       };
     };
     emacs = {
       Unit = {
-        After = ["graphical-session-pre.target"];
-      };
-    };
-    dunst = {
-      Service = {
-        ExecStart = lib.mkForce "${cfg.services.dunst.package}/bin/dunst";
-        Restart = "always";
-      };
-      Install = {
-        WantedBy = ["graphical-session.target"];
+        After = [ "graphical-session.target" ];
+        BindsTo = [ "graphical-session.target" ];
       };
     };
     keepassxc = {
@@ -144,8 +134,8 @@ in {
         Environment = [ "QT_QPA_PLATFORM=wayland" ];
       };
       Unit = {
-        Requires = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
+        After = [ "graphical-session.target" ];
+        BindsTo = [ "graphical-session.target" ];
       };
     };
     mpris-proxy = {
@@ -154,7 +144,7 @@ in {
       Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
       Install.WantedBy = [ "default.target" ];
     };
-    "autossh-socks@proxy.mathw0h:8119" = {
+    "autossh-socks@proxy.ssh.math.lmu.de:8119" = {
       Service = {
         Type = "notify";
         NotifyAccess = "all";
@@ -162,7 +152,7 @@ in {
         Restart = "always";
         RestartSec = "23s";
         ExecStart = "${autossh-socks-script} \"%I\"";
-        Environment = [ "SSHPASS_SECRET=gkleen@mathw0g.math.lmu.de" ];
+        Environment = [ "SSHPASS_SECRET=gkleen@ssh.math.lmu.de" ];
       };
       Unit = {
         StopWhenUnneeded = true;
@@ -183,6 +173,38 @@ in {
         StopWhenUnneeded = true;
       };
     };
+    "autossh-socks@proxy.mathw0h:8123" = {
+      Service = {
+        Type = "notify";
+        NotifyAccess = "all";
+        WorkingDirectory = "~";
+        Restart = "always";
+        RestartSec = "23s";
+        ExecStart = "${autossh-socks-script} \"%I\"";
+        Environment = [ "SSHPASS_SECRET=gkleen@mathw0h.mathinst.loc" ];
+      };
+      Unit = {
+        StopWhenUnneeded = true;
+        StartLimitInterval = "180s";
+        StartLimitBurst = 7;
+      };
+    };
+    "autossh-socks@proxy.mathw0e:8125" = {
+      Service = {
+        Type = "notify";
+        NotifyAccess = "all";
+        WorkingDirectory = "~";
+        Restart = "always";
+        RestartSec = "23s";
+        ExecStart = "${autossh-socks-script} \"%I\"";
+        Environment = [ "SSHPASS_SECRET=gkleen@mathw0e.mathinst.loc" ];
+      };
+      Unit = {
+        StopWhenUnneeded = true;
+        StartLimitInterval = "180s";
+        StartLimitBurst = 7;
+      };
+    };
     swayidle = {
       Service = {
         RuntimeDirectory = "swayidle";
@@ -193,8 +215,8 @@ in {
         WantedBy = ["graphical-session.target"];
       };
       Unit = {
-        Requires = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
       };
       Service = {
         ExecStart = lib.getExe pkgs.psi-notify;
@@ -204,23 +226,10 @@ in {
         WatchdogSec = "2s";
       };
     };
-    polkit-gnome-authentication-agent-1 = {
-      Install = {
-        WantedBy = ["graphical-session.target"];
-      };
-      Unit = {
-        PartOf = ["graphical-session.target"];
-        Requires = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
-      };
-      Service = {
-        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-        Restart = "on-failure";
-      };
-    };
     gtklock = {
       Unit = {
         Requisite = ["graphical-session.target"];
+        After = [ "graphical-session.target" ];
         PartOf = ["graphical-session.target"];
       };
       Service = {
@@ -228,53 +237,55 @@ in {
         RuntimeDirectory = "gtklock";
         CacheDirectory = "gtklock";
         ExecStartPre = [
-          "${pkgs.libsForQt5.qt5.qttools.bin}/bin/qdbus org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow.lockAllDatabases"
-          "${config.systemd.package}/bin/systemctl --user stop gpg-agent.service"
-          (pkgs.writeShellScript "generate-css" ''
-            set -x
-            export PATH="${lib.makeBinPath [cfg.programs.wpaperd.package pkgs.jq pkgs.coreutils pkgs.imagemagick pkgs.findutils]}:$PATH"
-
-            declare -A monitors
-            monitors=()
-            while IFS= read -r entry; do
-                path=$(jq -r ".path" <<<"$entry")
-                [[ -z "$path" || ! -f "$path" ]] && continue
-                blurred_path="$CACHE_DIRECTORY"/"$(b2sum -l 128 <<<"$path" | cut -d' ' -f1)"."''${path##*.}"
-                monitor=$(jq -r ".display" <<<"$entry")
-                if [[ ! -f "$blurred_path" ]]; then
-                    mkdir -p "$(dirname "$blurred_path")"
-                    magick "$path" -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$blurred_path" &
-                fi
-                monitors+=([$monitor]="$blurred_path")
-            done < <(wpaperctl all-wallpapers -j | jq -c ".[]")
-            wait
+          "-${lib.getExe' pkgs.libsForQt5.qt5.qttools.bin "qdbus"} org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow.lockAllDatabases"
+          "-${lib.getExe' config.systemd.package "systemctl"} --user stop gpg-agent.service"
+          "-${lib.getExe pkgs.playerctl} -a pause"
+          "-${lib.getExe (pkgs.writeShellApplication {
+            name = "generate-css";
+            runtimeInputs = with pkgs; [cfg.services.wpaperd.package jq coreutils imagemagick findutils];
+            text = ''
+              declare -A monitors
+              monitors=()
+              while IFS= read -r entry; do
+                  path=$(jq -r ".path" <<<"$entry")
+                  [[ -z "$path" || ! -f "$path" ]] && continue
+                  blurred_path="$CACHE_DIRECTORY"/"$(b2sum -l 128 <<<"$path" | cut -d' ' -f1)"."''${path##*.}"
+                  monitor=$(jq -r ".display" <<<"$entry")
+                  if [[ ! -f "$blurred_path" ]]; then
+                      mkdir -p "$(dirname "$blurred_path")"
+                      magick "$path" -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$blurred_path" &
+                  fi
+                  monitors+=([$monitor]="$blurred_path")
+              done < <(wpaperctl all-wallpapers -j | jq -c ".[]")
+              # wait
 
-            cp --no-preserve=mode ${pkgs.writeText "gtklock.css" ''
-              #window-box {
-                padding: 64px;
-                /* border: 1px solid black; */
-                border-radius: 4px;
-                box-shadow: rgba(0, 0, 0, 0.8) 0px 4px 12px;
-                /* background-color: white; */
-                background-color: rgba(0, 0, 0, 0.5);
+              cp --no-preserve=mode ${pkgs.writeText "gtklock.css" ''
+                #window-box {
+                  padding: 64px;
+                  /* border: 1px solid black; */
+                  border-radius: 4px;
+                  box-shadow: rgba(0, 0, 0, 0.8) 0px 4px 12px;
+                  /* background-color: white; */
+                  background-color: rgba(0, 0, 0, 0.5);
+                }
+              ''} "$RUNTIME_DIRECTORY"/style.css
+              for monitor in "''${!monitors[@]}"; do
+              cat >>"$RUNTIME_DIRECTORY"/style.css <<EOF
+              window#''${monitor} {
+                background-image: url("''${monitors[$monitor]}");
+                background-repeat: no-repeat;
+                background-size: 100% 100%;
+                background-origin: content-box;
               }
-            ''} "$RUNTIME_DIRECTORY"/style.css
-            for monitor in "''${!monitors[@]}"; do
-            cat >>"$RUNTIME_DIRECTORY"/style.css <<EOF
-            window#''${monitor} {
-              background-image: url("''${monitors[$monitor]}");
-              background-repeat: no-repeat;
-              background-size: 100% 100%;
-              background-origin: content-box;
-            }
-            EOF
-            done
-          '')
+              EOF
+              done
+            '';
+          })}"
         ];
         NotifyAccess = "all";
         ExecStart = ''${lib.getExe pkgs.gtklock} -s "''${RUNTIME_DIRECTORY}/style.css" -L ${pkgs.writeShellScript "after-lock" ''
-          ${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off
-          ${config.systemd.package}/bin/systemd-notify --ready
+          ${lib.getExe cfg.programs.niri.package} msg action power-off-monitors
+          ${lib.getExe' config.systemd.package "systemd-notify"} --ready
         ''}'';
       };
     };
@@ -322,30 +333,60 @@ in {
         ExecStopPost = "${pkgs.coreutils}/bin/rm -rfv \"$CACHE_DIRECTORY\"";
       };
     };
-    wpaperd = {
-      Install = {
-        WantedBy = ["graphical-session.target"];
+    # wpaperd = {
+    #   Install = {
+    #     WantedBy = ["graphical-session.target"];
+    #   };
+    #   Unit = {
+    #     After = [ "graphical-session.target" ];
+    #     PartOf = [ "graphical-session.target" ];
+    #   };
+    #   Service = {
+    #     ExecStart = lib.getExe cfg.services.wpaperd.package;
+    #     Type = "simple";
+    #     Restart = "always";
+    #     RestartSec = "2s";
+    #   };
+    # };
+    xembed-sni-proxy = {
+      Unit = {
+        PartOf = lib.mkForce ["tray.target"];
+        BindsTo = ["xwayland-satellite.service"];
+        After = ["xwayland-satellite.service"];
       };
+    };
+    poweralertd = {
       Unit = {
-        BindsTo = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
+        After = ["graphical-session.target"];
       };
-      Service = {
-        ExecStart = lib.getExe cfg.programs.wpaperd.package;
-        Type = "simple";
-        Restart = "always";
-        RestartSec = "2s";
+    };
+    network-manager-applet = {
+      Unit = {
+        PartOf = lib.mkForce ["tray.target"];
+      };
+    };
+    udiskie = {
+      Unit = {
+        PartOf = lib.mkForce ["tray.target"];
+      };
+    };
+    blueman-applet = {
+      Unit = {
+        PartOf = lib.mkForce ["tray.target"];
+      };
+      Install = {
+        WantedBy = lib.mkForce ["tray.target"];
       };
     };
   } // listToAttrs (map ({host, port}: nameValuePair "proxy-to-autossh-socks@${toString port}" {
       Unit = {
-        Requires = ["autossh-socks@${host}:${toString (port + 1)}.service" "proxy-to-autossh-socks@${toString port}.socket"];
+        BindsTo = ["autossh-socks@${host}:${toString (port + 1)}.service" "proxy-to-autossh-socks@${toString port}.socket"];
         After = ["autossh-socks@${host}:${toString (port + 1)}.service" "proxy-to-autossh-socks@${toString port}.socket"];
       };
       Service = {
-        ExecStart = "${config.systemd.package}/lib/systemd/systemd-socket-proxyd --exit-idle-time=10s localhost:${toString (port + 1)}";
+        ExecStart = "${config.systemd.package}/lib/systemd/systemd-socket-proxyd --exit-idle-time=60s 127.0.0.1:${toString (port + 1)}";
       };
-  }) [{ host = "proxy.mathw0h"; port = 8118; } { host = "proxy.vidhar"; port = 8120; }]);
+  }) [{ 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}" {
     Socket = {
       ListenStream = "%I";
@@ -353,7 +394,7 @@ in {
     Install = {
       WantedBy = ["default.target"];
     };
-  }) [8118 8120]) // {
+  }) [8118 8120 8122 8124]) // {
     "yt-dlp" = {
       Socket = {
         SocketMode = "0600";
@@ -367,7 +408,7 @@ in {
     };
   };
   timers = {
-    sync-keepass = {
+    "sync-keepass@store.kdbx" = {
       Timer = {
         OnActiveSec = "1m";
         OnUnitActiveSec = "1m";
@@ -377,6 +418,16 @@ in {
         WantedBy = ["default.target"];
       };
     };
+    "sync-keepass@rz.kdbx" = {
+      Timer = {
+        OnActiveSec = "1d";
+        OnUnitActiveSec = "1d";
+      };
+
+      Install = {
+        WantedBy = ["default.target"];
+      };
+    };
   };
   targets = {
     graphical-session = {
@@ -387,6 +438,9 @@ in {
     };
     tray = {
       Unit = {
+        PartOf = [ "graphical-session.target" ];
+        Requires = [ "waybar.service" ];
+        After = [ "graphical-session.target" "waybar.service" ];
         Wants = ["blueman-applet.service" "udiskie.service" "network-manager-applet.service"];
       };
     };
diff --git a/accounts/gkleen@sif/taffybar/default.nix b/accounts/gkleen@sif/taffybar/default.nix
deleted file mode 100644
index 98366d8f..00000000
--- a/accounts/gkleen@sif/taffybar/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{ haskellPackages ? (import <nixpkgs> {}).haskellPackages }:
-haskellPackages.callCabal2nix "gkleen-sif-taffybar" ./. {}
diff --git a/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal b/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal
deleted file mode 100644
index e32cb473..00000000
--- a/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal
+++ /dev/null
@@ -1,32 +0,0 @@
-name:                gkleen-sif-taffybar
-version:             0.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-
-data-files:          taffybar.css
-
-executable taffybar
-  hs-source-dirs:      src
-  main-is:             taffybar.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N -O2 -Wall
-  build-depends:       base
-                     , containers
-                     , directory
-                     , filepath
-                     , gtk3
-                     , taffybar
-                     , X11>=1.8
-                     , transformers
-                     , gi-gtk
-                     , time, time-locale-compat
-                     , text
-                     , HStringTemplate
-                     , gtk-sni-tray
-                     , hslogger
-  other-modules:       Paths_gkleen_sif_taffybar
-                     , System.Taffybar.Widget.Clock
-                     , System.Taffybar.Widget.TooltipBattery
-  default-language:    Haskell2010
-  default-extensions:  ScopedTypeVariables
-                     , LambdaCase
-                     , NamedFieldPuns
\ No newline at end of file
diff --git a/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/Clock.hs b/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/Clock.hs
deleted file mode 100644
index e8dc480f..00000000
--- a/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/Clock.hs
+++ /dev/null
@@ -1,111 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-module System.Taffybar.Widget.Clock
-  ( textClockNew
-  , textClockNewWith
-  , defaultClockConfig
-  , ClockConfig(..)
-  , ClockUpdateStrategy(..)
-  ) where
-
-import           Control.Monad.IO.Class
-import           Data.Maybe
-import qualified Data.Text as T
-import qualified Data.Time.Clock as Clock
-import           Data.Time.Format
-import           Data.Time.LocalTime
-import qualified Data.Time.Locale.Compat as L
-import           GI.Gtk
-import           System.Taffybar.Widget.Generic.PollingLabel
-
-type ClockFormat = L.TimeLocale -> ZonedTime -> T.Text
-
--- | Create the widget. I recommend passing @Nothing@ for the TimeLocale
--- parameter. The format string can include Pango markup
--- (<http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>).
-textClockNew ::
-  MonadIO m => Maybe L.TimeLocale -> ClockFormat -> Double -> m GI.Gtk.Widget
-textClockNew userLocale format interval =
-  textClockNewWith cfg
-  where
-    cfg = defaultClockConfig { clockTimeLocale = userLocale
-                             , clockFormat = format
-                             , clockUpdateStrategy = ConstantInterval interval
-                             }
-
-data ClockUpdateStrategy
-  = ConstantInterval Double
-  | RoundedTargetInterval Int Double
-  deriving (Eq, Ord, Show)
-
-data ClockConfig = ClockConfig
-  { clockTimeZone :: Maybe TimeZone
-  , clockTimeLocale :: Maybe L.TimeLocale
-  , clockFormat :: ClockFormat
-  , clockUpdateStrategy :: ClockUpdateStrategy
-  }
-
--- | A clock configuration that defaults to the current locale
-defaultClockConfig :: ClockConfig
-defaultClockConfig = ClockConfig
-  { clockTimeZone = Nothing
-  , clockTimeLocale = Nothing
-  , clockFormat = \locale zonedTime -> T.pack $ formatTime locale "%a %b %_d %r" zonedTime
-  , clockUpdateStrategy = RoundedTargetInterval 5 0.0
-  }
-
-systemGetTZ :: IO TimeZone
-systemGetTZ = getCurrentTimeZone
-
--- | A configurable text-based clock widget.  It currently allows for
--- a configurable time zone through the 'ClockConfig'.
---
--- See also 'textClockNew'.
-textClockNewWith :: MonadIO m => ClockConfig -> m Widget
-textClockNewWith ClockConfig
-                   { clockTimeZone = userZone
-                   , clockTimeLocale = userLocale
-                   , clockFormat = format
-                   , clockUpdateStrategy = updateStrategy
-                   } = liftIO $ do
-  let getTZ = maybe systemGetTZ return userZone
-      locale = fromMaybe L.defaultTimeLocale userLocale
-
-  let getUserZonedTime =
-        utcToZonedTime <$> getTZ <*> Clock.getCurrentTime
-
-      doTimeFormat = format locale
-
-      getRoundedTimeAndNextTarget = do
-        zonedTime <- getUserZonedTime
-        return $ case updateStrategy of
-          ConstantInterval interval ->
-            (doTimeFormat zonedTime, Nothing, interval)
-          RoundedTargetInterval roundSeconds offset ->
-            let roundSecondsDiffTime = fromIntegral roundSeconds
-                addTheRound = addLocalTime roundSecondsDiffTime
-                localTime = zonedTimeToLocalTime zonedTime
-                ourLocalTimeOfDay = localTimeOfDay localTime
-                seconds = round $ todSec ourLocalTimeOfDay
-                secondsFactor = seconds `div` roundSeconds
-                displaySeconds = secondsFactor * roundSeconds
-                baseLocalTimeOfDay =
-                  ourLocalTimeOfDay { todSec = fromIntegral displaySeconds }
-                ourLocalTime =
-                  localTime { localTimeOfDay = baseLocalTimeOfDay }
-                roundedLocalTime =
-                  if seconds `mod` roundSeconds > roundSeconds `div` 2
-                  then addTheRound ourLocalTime
-                  else ourLocalTime
-                roundedZonedTime =
-                  zonedTime { zonedTimeToLocalTime = roundedLocalTime }
-                nextTarget = addTheRound ourLocalTime
-                amountToWait = realToFrac $ diffLocalTime nextTarget localTime
-            in (doTimeFormat roundedZonedTime, Nothing, amountToWait - offset)
-
-  label <- pollingLabelWithVariableDelay getRoundedTimeAndNextTarget
-  ebox <- eventBoxNew
-  containerAdd ebox label
-  eventBoxSetVisibleWindow ebox False
-  widgetShowAll ebox
-  toWidget ebox
-
diff --git a/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/TooltipBattery.hs b/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/TooltipBattery.hs
deleted file mode 100644
index 9dc52774..00000000
--- a/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/TooltipBattery.hs
+++ /dev/null
@@ -1,101 +0,0 @@
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-module System.Taffybar.Widget.TooltipBattery ( batteryIconTooltipNew ) where
-
-import           Control.Applicative
-import           Control.Monad
-import           Control.Monad.IO.Class
-import           Control.Monad.Trans.Reader
-import           Data.Int (Int64)
-import qualified Data.Text as T
-import           GI.Gtk
-import           Prelude
-import           StatusNotifier.Tray (scalePixbufToSize)
-import           System.Taffybar.Context
-import           System.Taffybar.Information.Battery
-import           System.Taffybar.Util
-import           System.Taffybar.Widget.Generic.AutoSizeImage
-import           System.Taffybar.Widget.Generic.ChannelWidget
-import           Text.Printf
-import           Text.StringTemplate
-import           Data.Function ((&))
-
--- | Just the battery info that will be used for display (this makes combining
--- several easier).
-data BatteryWidgetInfo = BWI
-  { seconds :: Maybe Int64
-  , percent :: Double
-  , status :: String
-  , rate :: Maybe Double
-  } deriving (Eq, Show)
-
--- | Format a duration expressed as seconds to hours and minutes
-formatDuration :: Int64 -> String
-formatDuration secs = let minutes, hours, minutes' :: Int64
-                          minutes = secs `div` 60
-                          (hours, minutes') = minutes `divMod` 60
-                       in printf "%02d:%02d" hours minutes'
-
-getBatteryWidgetInfo :: BatteryInfo -> BatteryWidgetInfo
-getBatteryWidgetInfo info =
-  let battPctNum :: Double
-      battPctNum = batteryPercentage info
-      battTime :: Maybe Int64
-      battTime =
-        case batteryState info of
-          BatteryStateCharging -> Just $ batteryTimeToFull info
-          BatteryStateDischarging -> Just $ batteryTimeToEmpty info
-          _ -> Nothing
-      battStatus :: String
-      battStatus =
-        case batteryState info of
-          BatteryStateCharging -> "↑"
-          BatteryStateDischarging -> "↓"
-          BatteryStateEmpty -> "⤓"
-          BatteryStateFullyCharged -> "⤒"
-          _ -> "?"
-      battRate :: Maybe Double
-      battRate | rawRate < 0.1 = Nothing
-               | otherwise = Just rawRate
-        where rawRate = batteryEnergyRate info
-  in BWI{ seconds = battTime, percent = battPctNum, status = battStatus, rate = battRate }
-
--- | Given (maybe summarized) battery info and format: provides the string to display
-formatBattInfo :: BatteryWidgetInfo -> String -> T.Text
-formatBattInfo info fmt =
-  let tpl = newSTMP fmt
-      tpl' = tpl
-        & setManyAttrib [ ("percentage", printf "%.0f" $ percent info)
-                        , ("status", status info)
-                        ]
-        & setManyAttrib [ ("time", formatDuration <$> seconds info)
-                        , ("rate", printf "%.0f" <$> rate info)
-                        ]
-  in render tpl'
-
-themeLoadFlags :: [IconLookupFlags]
-themeLoadFlags = [IconLookupFlagsGenericFallback, IconLookupFlagsUseBuiltin]
-
-batteryIconTooltipNew :: String -> TaffyIO Widget
-batteryIconTooltipNew format = do
-  DisplayBatteryChanVar (chan, _) <- setupDisplayBatteryChanVar ["IconName", "State", "Percentage", "TimeToFull", "TimeToEmpty", "EnergyRate"]
-  ctx <- ask
-  liftIO $ do
-    image <- imageNew
-    styleCtx <- widgetGetStyleContext =<< toWidget image
-    defaultTheme <- iconThemeGetDefault
-    let getCurrentBatteryIconNameStringTooltip = do
-          info <- runReaderT getDisplayBatteryInfo ctx
-          let iconNameString = T.pack $ batteryIconName info
-              tooltip = formatBattInfo (getBatteryWidgetInfo info) format
-          return (iconNameString, tooltip)
-        extractPixbuf info =
-          fst <$> iconInfoLoadSymbolicForContext info styleCtx
-        setIconForSize size = do
-          (name, tooltip) <- getCurrentBatteryIconNameStringTooltip
-          widgetSetTooltipMarkup image $ Just tooltip
-          iconThemeLookupIcon defaultTheme name size themeLoadFlags >>=
-            traverse extractPixbuf >>=
-              traverse (scalePixbufToSize size OrientationHorizontal)
-    updateImage <- autoSizeImage image setIconForSize OrientationHorizontal
-    toWidget =<< channelWidgetNew image chan (const $ postGUIASync updateImage)
diff --git a/accounts/gkleen@sif/taffybar/src/taffybar.hs b/accounts/gkleen@sif/taffybar/src/taffybar.hs
deleted file mode 100644
index 67ee942d..00000000
--- a/accounts/gkleen@sif/taffybar/src/taffybar.hs
+++ /dev/null
@@ -1,89 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-
-module Main where
-
-import System.Taffybar (startTaffybar)
-import System.Taffybar.Context (TaffybarConfig(..))
-import System.Taffybar.Hooks
-import System.Taffybar.SimpleConfig hiding (SimpleTaffyConfig(cssPaths))
-import System.Taffybar.Widget
-import qualified System.Taffybar.Widget.Clock as MyClock
-import System.Taffybar.Widget.TooltipBattery
-
-import Data.Time.Format
-import Data.Time.LocalTime
-import Data.Time.Calendar.WeekDate
-
-import qualified Data.Text as T
-
-import Control.Exception (SomeException, try)
-import Control.Monad.Trans.Reader (mapReaderT)
-
-import Paths_gkleen_sif_taffybar
-
-import System.Log.Logger
-
-
-main :: IO ()
-main = do
-  logger <- getLogger "System.Taffybar"
-  saveGlobalLogger $ setLevel INFO logger
-
-  myCssPath <- getDataFileName "taffybar.css"
-  startTaffybar taffybarConfig{ cssPaths = pure myCssPath }
-
-
-taffybarConfig :: TaffybarConfig
-taffybarConfig =
-  let myWorkspacesConfig =
-        defaultWorkspacesConfig
-        { maxIcons = Just 0
-        , widgetGap = 7
-        , showWorkspaceFn = \case
-            -- Workspace{ workspaceState = Empty } -> False
-            Workspace{ workspaceName } | workspaceName == "NSP" -> False
-            _other -> True
-        , getWindowIconPixbuf = \i d -> either (\(_ :: SomeException) -> Nothing) id <$> mapReaderT try (defaultGetWindowIconPixbuf i d)
-        , urgentWorkspaceState = True
-        }
-      workspaces = workspacesNew myWorkspacesConfig
-      clock = MyClock.textClockNewWith MyClock.defaultClockConfig
-        { MyClock.clockUpdateStrategy = MyClock.RoundedTargetInterval 1 0.0
-        , MyClock.clockFormat = \tl zt@ZonedTime{ zonedTimeToLocalTime = LocalTime{ localDay } }
-                                -> let date = formatTime tl "%Y-%m-%d" localDay
-                                       weekdate = "W" <> show2 woy <> "-" <> show dow
-                                         where (_, woy, dow) = toWeekDate localDay
-                                               show2 :: Int -> String
-                                               show2 x = replicate (2 - length s) '0' ++ s
-                                                 where s = show x
-                                       time = formatTime tl "%H:%M:%S%Ez" zt
-                                    in T.intercalate " " $ map T.pack [weekdate, date, time]
-        }
-      layout = layoutNew defaultLayoutConfig
-      windowsW = windowsNew defaultWindowsConfig
-        { getMenuLabel = truncatedGetMenuLabel 80
-        , getActiveLabel = truncatedGetActiveLabel 80
-        }
-      worktime = commandRunnerNew 60 "worktime" [] "worktime"
-      worktimeToday = commandRunnerNew 60 "worktime" ["today"] "worktime today"
-      -- See https://github.com/taffybar/gtk-sni-tray#statusnotifierwatcher
-      -- for a better way to set up the sni tray
-      -- tray = sniTrayThatStartsWatcherEvenThoughThisIsABadWayToDoIt
-      tray = sniTrayNew
-      myConfig = defaultSimpleTaffyConfig
-        { startWidgets =
-            workspaces : map (>>= buildContentsBox) [ layout, windowsW ]
-        , endWidgets = map (>>= buildContentsBox) $ reverse
-          -- , mpris2New
-          [ worktime, worktimeToday
-          , clock
-          , tray
-          , batteryIconTooltipNew "$status$ $percentage$%$if(time)$$if(rate)$ ($rate$W $time$)$else$ ($time$)$endif$$elseif(rate)$ ($rate$W)$endif$"
-          ]
-        , barPosition = Top
-        , barPadding = 2
-        , barHeight = ExactSize 28
-        , widgetSpacing = 10
-        }
-  in withBatteryRefresh $ withLogServer $
-     withToggleServer $ toTaffyConfig myConfig
diff --git a/accounts/gkleen@sif/taffybar/taffybar.css b/accounts/gkleen@sif/taffybar/taffybar.css
deleted file mode 100644
index 7a297465..00000000
--- a/accounts/gkleen@sif/taffybar/taffybar.css
+++ /dev/null
@@ -1,146 +0,0 @@
-@define-color transparent rgba(0.0, 0.0, 0.0, 0.0);
-@define-color white #808080;
-@define-color gray #202020;
-@define-color green #008000;
-@define-color yellow #808000;
-@define-color blue #000080;
-@define-color red #800000;
-@define-color black #000000;
-/* @define-color taffy-blue #0c7cd5; */
-@define-color taffy-blue @blue;
-
-@define-color active-window-color @white;
-@define-color urgent-window-color @taffy-blue;
-@define-color font-color @white;
-@define-color menu-background-color @black;
-@define-color menu-font-color @white;
-
-/* Top level styling */
-
-.taffy-window * {
-        /*
-                This removes any existing styling from UI elements. Taffybar will not
-                cohere with your gtk theme.
-        */
-        all: unset;
-
-        font-family: "Fira Sans", sans-serif;
-        font-size: 21px;
-        color: @font-color;
-}
-
-.taffy-box {
-        /* border-radius: 10px; */
-        background-color: @black;
-}
-
-.inner-pad {
-        /* padding-bottom: 5px; */
-        /* padding-top: 5px; */
-        padding-left: 2px;
-        padding-right: 2px;
-}
-
-.contents {
-        /* padding-bottom: 4px; */
-        /* padding-top: 4px; */
-        padding-right: 2px;
-        padding-left: 2px;
-        transition: background-color .5s;
-        border-radius: 5px;
-}
-
-/* Workspaces styling */
-
-.workspace-label {
-        padding-right: 3px;
-        padding-left: 2px;
-        font-size: 21px;
-}
-
-.workspace-label.active {
-        color: @green;
-}
-.workspace-label.visible {
-        color: @yellow;
-}
-.workspace-label.empty {
-        color: @gray;
-}
-.workspace-label.urgent {
-        color: @red;
-}
-
-.active .contents {
-        background-color: rgba(0.0, 0.0, 0.0, 0.5);
-}
-
-.visible .contents {
-        background-color: rgba(0.0, 0.0, 0.0, 0.2);
-}
-
-.window-icon-container {
-        transition: opacity .5s, box-shadow .5s;
-        opacity: 1;
-}
-
-/* This gives space for the box-shadow (they look like underlines) that follow.
-   This will actually affect all widgets, (not just the workspace icons), but
-   that is what we want since we want the icons to look the same. */
-.auto-size-image, .sni-tray {
-        padding-top: 3px;
-        padding-bottom: 3px;
-}
-
-.window-icon-container.active {
-        box-shadow: inset 0 -3px @white;
-}
-
-.window-icon-container.urgent {
-        box-shadow: inset 0 -3px @urgent-window-color;
-}
-
-.window-icon-container.inactive .window-icon {
-        padding: 0px;
-}
-
-.window-icon-container.minimized .window-icon {
-        opacity: .3;
-}
-
-.window-icon {
-        opacity: 1;
-        transition: opacity .5s;
-}
-
-/* Button styling */
-
-button {
-        background-color: @transparent;
-        border-width: 0px;
-        border-radius: 0px;
-}
-
-button:checked, button:hover .Contents:hover {
-        box-shadow: inset 0 -3px @taffy-blue;
-}
-
-/* Menu styling */
-
-/* The ".taffy-window" prefixed selectors are needed because if they aren't present,
-   the top level .Taffybar selector takes precedence */
-.taffy-window menuitem *,  menuitem * {
-        color: @menu-font-color;
-}
-
-.taffy-window menuitem, menuitem {
-        background-color: @menu-background-color;
-}
-
-.taffy-window menuitem:hover, menuitem:hover {
-        background-color: @taffy-blue;
-}
-
-.taffy-window menuitem:hover > label, menuitem:hover > label {
-        color: @white;
-}
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/utils/sieve-edit.nix b/accounts/gkleen@sif/utils/sieve-edit.nix
new file mode 100644
index 00000000..f985a3f6
--- /dev/null
+++ b/accounts/gkleen@sif/utils/sieve-edit.nix
@@ -0,0 +1,24 @@
+pkgs@{ lib, resholve, zsh, sieve-connect, sops, ... }:
+
+resholve.writeScriptBin "sieve-edit" {
+  inputs = with pkgs; [sieve-connect sops];
+  interpreter = lib.getExe zsh;
+  execer = with pkgs; [
+    "cannot:${lib.getExe sieve-connect}"
+    "cannot:${lib.getExe sops}"
+  ];
+} ''
+  host=$1; shift
+  case "$host" in
+    surtr)
+      sieve-connect -s surtr.yggdrasil.li -m EXTERNAL --clientkey <(sops decrypt $HOME/projects/machines/hosts/surtr/email/ca/gkleen@sif.key) --clientcert $HOME/projects/machines/hosts/surtr/email/ca/gkleen@sif.crt --edit --remotesieve sieve
+      ;;
+    ymir)
+      sieve-connect -s ymir.yggdrasil.li -u gkleen --edit --remotesieve sieve
+      ;;
+    *)
+      echo "Unknown host: ‘$host’" >&2
+      return 2
+      ;;
+  esac
+''
diff --git a/accounts/gkleen@sif/xmonad/.gitignore b/accounts/gkleen@sif/xmonad/.gitignore
deleted file mode 100644
index c11891cd..00000000
--- a/accounts/gkleen@sif/xmonad/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-**/#*#
-**/.stack-work/
-/stack.yaml.lock
-/*.cabal
diff --git a/accounts/gkleen@sif/xmonad/default.nix b/accounts/gkleen@sif/xmonad/default.nix
deleted file mode 100644
index 8790c12f..00000000
--- a/accounts/gkleen@sif/xmonad/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-argumentPackages@{ ... }:
-
-let
-  # defaultPackages = (import ./stackage.nix {});
-  # haskellPackages = defaultPackages // argumentPackages;
-  haskellPackages = argumentPackages;
-in haskellPackages.callPackage ./xmonad-yggdrasil.nix {}
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Mpv.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Mpv.hs
deleted file mode 100644
index e6accdcc..00000000
--- a/accounts/gkleen@sif/xmonad/lib/XMonad/Mpv.hs
+++ /dev/null
@@ -1,127 +0,0 @@
-{-# LANGUAGE DeriveGeneric, OverloadedLists, OverloadedStrings, ViewPatterns, ExistentialQuantification, MultiWayIf #-}
-
-module XMonad.Mpv
-  ( MpvCommand(..), MpvResponse(..), MpvException(..)
-  , mpv
-  , mpvDir
-  , mpvAll, mpvOne
-  , mpvResponse
-  ) where
-
-import Data.Aeson
-
-import Data.Monoid
-
-import Network.Socket hiding (recv)
-import Network.Socket.ByteString
-
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Char8 as CBS
-import qualified Data.ByteString.Lazy as LBS
-
-import GHC.Generics (Generic)
-import Data.Typeable (Typeable)
-import Data.String (IsString(..))
-
-import Control.Exception
-
-import System.IO.Temp (getCanonicalTemporaryDirectory)
-
-import Control.Monad
-import Control.Exception (bracket)
-import Control.Monad.IO.Class (MonadIO(..))
-
-import System.FilePath
-import System.Directory (getDirectoryContents)
-
-import Data.List
-import Data.Either
-import Data.Maybe
-
-import Debug.Trace
-
-
-data MpvCommand
-  = forall a. ToJSON a => MpvSetProperty String a
-  | MpvGetProperty String
-data MpvResponse
-  = MpvError String
-  | MpvSuccess (Maybe Value)
-  deriving (Read, Show, Generic, Eq)
-data MpvException = MpvException String
-                  | MpvNoValue
-                  | MpvNoParse String
-  deriving (Generic, Typeable, Read, Show)
-instance Exception MpvException
-
-
-instance ToJSON MpvCommand where
-  toJSON (MpvSetProperty name val) = Array ["set_property", fromString name, toJSON val]
-  toJSON (MpvGetProperty name)     = Array ["get_property", fromString name]
-
-instance FromJSON MpvResponse where
-  parseJSON = withObject "response object" $ \obj -> do
-    mval <- obj .:? "data"
-    err <- obj .: "error"
-
-    let ret
-          | err == "success" = MpvSuccess mval
-          | otherwise        = MpvError err
-
-    return ret
-
-mpvSocket :: FilePath -> (Socket -> IO a) -> IO a
-mpvSocket sockPath = withSocketsDo . bracket mkSock close
-  where
-    mkSock = do
-      sock <- socket AF_UNIX Stream defaultProtocol
-      connect sock $ SockAddrUnix (traceId sockPath)
-      return sock
-
-mpvResponse :: FromJSON v => MpvResponse -> IO v
-mpvResponse (MpvError str) = throwIO $ MpvException str
-mpvResponse (MpvSuccess Nothing) = throwIO MpvNoValue
-mpvResponse (MpvSuccess (Just v)) = case fromJSON v of
-  Success v' -> return v'
-  Error str  -> throwIO $ MpvNoParse str
-
-mpv :: FilePath -> MpvCommand -> IO MpvResponse
-mpv sockPath cmd = mpvSocket sockPath $ \sock -> do
-  let message = (`BS.append` "\n") . LBS.toStrict . encode $ Object [("command", toJSON cmd)]
-  traceIO $ show message
-  sendAll sock message
-  let recvAll = do
-        prefix <- recv sock 4096
-        if
-          | (prefix', rest) <- CBS.break (== '\n') prefix
-          , not (BS.null rest) -> return prefix'
-          | BS.null prefix     -> return prefix
-          | otherwise          -> BS.append prefix <$> recvAll
-  response <- recvAll
-  traceIO  $ show response
-  either (ioError . userError) return . traceShowId $ eitherDecodeStrict' response
-
-mpvDir :: Exception e => FilePath -> (FilePath -> [(FilePath, Either e MpvResponse)] -> Maybe MpvCommand) -> IO [(FilePath, Either e MpvResponse)]
-mpvDir dir step = do
-  socks <- filter (".sock" `isSuffixOf`) <$> getDirectoryContents dir
-  go [] socks
-  where
-    go acc [] = return acc
-    go acc (sock:socks)
-      | Just cmd <- step sock acc = do
-          res <- try $ mpv (dir </> sock) cmd
-          go ((sock, res) : acc) socks
-      | otherwise =
-          go acc socks
-
-mpvAll :: FilePath -> MpvCommand -> IO [MpvResponse]
-mpvAll dir cmd = do
-  results <- map snd <$> (mpvDir dir (\_ _ -> Just cmd) :: IO [(FilePath, Either SomeException MpvResponse)])
-  mapM (either throwIO return) results
-
-mpvOne :: FilePath -> MpvCommand -> IO (Maybe MpvResponse)
-mpvOne dir cmd = listToMaybe . snd . partitionEithers . map snd <$> (mpvDir dir step :: IO [(FilePath, Either SomeException MpvResponse)])
-  where
-    step _ results
-      | any (isRight . snd) results = Nothing
-      | otherwise = Just cmd
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyPass.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyPass.hs
deleted file mode 100644
index 1caefae5..00000000
--- a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyPass.hs
+++ /dev/null
@@ -1,94 +0,0 @@
-module XMonad.Prompt.MyPass
-  (
-    -- * Usages
-    -- $usages
-    mkPassPrompt
-  ) where
-
-import Control.Monad (liftM)
-import XMonad.Core
-import XMonad.Prompt ( XPrompt
-                     , showXPrompt
-                     , commandToComplete
-                     , nextCompletion
-                     , getNextCompletion
-                     , XPConfig
-                     , mkXPrompt
-                     , searchPredicate)
-import System.Directory (getHomeDirectory)
-import System.FilePath (takeExtension, dropExtension, combine)
-import System.Posix.Env (getEnv)
-import XMonad.Util.Run (runProcessWithInput)
-
--- $usages
--- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:
---
--- > import XMonad.Prompt.Pass
---
--- Then add a keybinding for 'passPrompt', 'passGeneratePrompt' or 'passRemovePrompt':
---
--- >   , ((modMask x , xK_p)                              , passPrompt xpconfig)
--- >   , ((modMask x .|. controlMask, xK_p)               , passGeneratePrompt xpconfig)
--- >   , ((modMask x .|. controlMask  .|. shiftMask, xK_p), passRemovePrompt xpconfig)
---
--- For detailed instructions on:
---
--- - editing your key bindings, see "XMonad.Doc.Extending#Editing_key_bindings".
---
--- - how to setup the password storage, see <http://git.zx2c4.com/password-store/about/>
---
-
-type Predicate = String -> String -> Bool
-
-getPassCompl :: [String] -> Predicate -> String -> IO [String]
-getPassCompl compls p s
-  | length s <= minL
-  , all ((> minL) . length) compls = return []
-  | otherwise = do return $ filter (p s) compls
-  where
-    minL = 3
-
-type PromptLabel = String
-
-data Pass = Pass PromptLabel
-
-instance XPrompt Pass where
-  showXPrompt       (Pass prompt) = prompt ++ ": "
-  commandToComplete _ c           = c
-  nextCompletion      _           = getNextCompletion
-
--- | Default password store folder in $HOME/.password-store
---
-passwordStoreFolderDefault :: String -> String
-passwordStoreFolderDefault home = combine home ".password-store"
-
--- | Compute the password store's location.
--- Use the PASSWORD_STORE_DIR environment variable to set the password store.
--- If empty, return the password store located in user's home.
---
-passwordStoreFolder :: IO String
-passwordStoreFolder =
-  getEnv "PASSWORD_STORE_DIR" >>= computePasswordStoreDir
-  where computePasswordStoreDir Nothing         = liftM passwordStoreFolderDefault getHomeDirectory
-        computePasswordStoreDir (Just storeDir) = return storeDir
-
--- | A pass prompt factory
---
-mkPassPrompt :: PromptLabel -> (String -> X ()) -> XPConfig -> X ()
-mkPassPrompt promptLabel passwordFunction xpconfig = do
-  passwords <- io (passwordStoreFolder >>= getPasswords)
-  mkXPrompt (Pass promptLabel) xpconfig (getPassCompl passwords $ searchPredicate xpconfig) passwordFunction
-
--- | Retrieve the list of passwords from the password storage 'passwordStoreDir
-getPasswords :: FilePath -> IO [String]
-getPasswords passwordStoreDir = do
-  files <- runProcessWithInput "find" [
-    passwordStoreDir,
-    "-type", "f",
-    "-name", "*.gpg",
-    "-printf", "%P\n"] []
-  return $ map removeGpgExtension $ lines files
-
-removeGpgExtension :: String -> String
-removeGpgExtension file | takeExtension file == ".gpg" = dropExtension file
-                        | otherwise                    = file
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyShell.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyShell.hs
deleted file mode 100644
index c268f87d..00000000
--- a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyShell.hs
+++ /dev/null
@@ -1,105 +0,0 @@
-module XMonad.Prompt.MyShell
-       ( Shell (..)
-       , shellPrompt
-       , prompt
-       , safePrompt
-       , unsafePrompt
-       , getCommands
-       , getShellCompl
-       , split
-       ) where
-
-import Codec.Binary.UTF8.String (encodeString)
-import Control.Exception as E
-import Control.Monad (forM)
-import Data.List (isPrefixOf)
-import System.Directory (doesDirectoryExist, getDirectoryContents)
-import System.Environment (getEnv)
-import System.Posix.Files (getFileStatus, isDirectory)
-
-import XMonad hiding (config)
-import XMonad.Prompt
-import XMonad.Util.Run
-
-econst :: Monad m => a -> IOException -> m a
-econst = const . return
-
-data Shell = Shell String
-
-instance XPrompt Shell where
-    showXPrompt (Shell q)     = q
-    completionToCommand _ = escape
-
-shellPrompt :: String -> XPConfig -> X ()
-shellPrompt q c = do
-    cmds <- io getCommands
-    mkXPrompt (Shell q) c (getShellCompl cmds) spawn
-
-{- $spawns
-    See safe and unsafeSpawn in "XMonad.Util.Run".
-    prompt is an alias for safePrompt;
-    safePrompt and unsafePrompt work on the same principles, but will use
-    XPrompt to interactively query the user for input; the appearance is
-    set by passing an XPConfig as the second argument. The first argument
-    is the program to be run with the interactive input.
-    You would use these like this:
-
-    >     , ((modm,               xK_b), safePrompt "firefox" greenXPConfig)
-    >     , ((modm .|. shiftMask, xK_c), prompt ("xterm" ++ " -e") greenXPConfig)
-
-    Note that you want to use safePrompt for Firefox input, as Firefox
-    wants URLs, and unsafePrompt for the XTerm example because this allows
-    you to easily start a terminal executing an arbitrary command, like
-    'top'. -}
-
-prompt, unsafePrompt, safePrompt :: String -> FilePath -> XPConfig -> X ()
-prompt = unsafePrompt
-safePrompt q c config = mkXPrompt (Shell q) config (getShellCompl [c]) run
-    where run = safeSpawn c . return
-unsafePrompt q c config = mkXPrompt (Shell q) config (getShellCompl [c]) run
-    where run a = unsafeSpawn $ c ++ " " ++ a
-
-getShellCompl :: [String] -> String -> IO [String]
-getShellCompl cmds s | s == "" || last s == ' ' = return []
-                     | otherwise                = do
-    f     <- fmap lines $ runProcessWithInput "bash" [] ("compgen -A file -- "
-                                                        ++ s ++ "\n")
-    files <- case f of
-               [x] -> do fs <- getFileStatus (encodeString x)
-                         if isDirectory fs then return [x ++ "/"]
-                                           else return [x]
-               _   -> return f
-    return . uniqSort $ files ++ commandCompletionFunction cmds s
-
-commandCompletionFunction :: [String] -> String -> [String]
-commandCompletionFunction cmds str | '/' `elem` str = []
-                                   | otherwise      = filter (isPrefixOf str) cmds
-
-getCommands :: IO [String]
-getCommands = do
-    p  <- getEnv "PATH" `E.catch` econst []
-    let ds = filter (/= "") $ split ':' p
-    es <- forM ds $ \d -> do
-        exists <- doesDirectoryExist d
-        if exists
-            then getDirectoryContents d
-            else return []
-    return . uniqSort . filter ((/= '.') . head) . concat $ es
-
-split :: Eq a => a -> [a] -> [[a]]
-split _ [] = []
-split e l =
-    f : split e (rest ls)
-        where
-          (f,ls) = span (/=e) l
-          rest s | s == []   = []
-                 | otherwise = tail s
-
-escape :: String -> String
-escape []       = ""
-escape (x:xs)
-    | isSpecialChar x = '\\' : x : escape xs
-    | otherwise       = x : escape xs
-
-isSpecialChar :: Char -> Bool
-isSpecialChar =  flip elem " &\\@\"'#?$*()[]{};"
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs
deleted file mode 100644
index 998c533e..00000000
--- a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs
+++ /dev/null
@@ -1,246 +0,0 @@
-module XMonad.Prompt.MySsh
-    ( -- * Usage
-      -- $usage
-      sshPrompt,
-      Ssh,
-      Override (..),
-      mkOverride,
-      Conn (..),
-      moshCmd,
-      moshCmd',
-      sshCmd,
-      inTmux,
-      withEnv
-    ) where
-
-import XMonad
-import XMonad.Util.Run
-import XMonad.Prompt
-
-import System.Directory
-import System.Environment
-import qualified Control.Exception as E
-
-import Control.Monad
-import Data.Maybe
-
-import Text.Parsec.String
-import Text.Parsec
-import Data.Char (isSpace)
-
-econst :: Monad m => a -> E.IOException -> m a
-econst = const . return
-
--- $usage
--- 1. In your @~\/.xmonad\/xmonad.hs@:
---
--- > import XMonad.Prompt
--- > import XMonad.Prompt.Ssh
---
--- 2. In your keybindings add something like:
---
--- >   , ((modm .|. controlMask, xK_s), sshPrompt defaultXPConfig)
---
--- Keep in mind, that if you want to use the completion you have to
--- disable the "HashKnownHosts" option in your ssh_config
---
--- For detailed instruction on editing the key binding see
--- "XMonad.Doc.Extending#Editing_key_bindings".
-
-data Override = Override
-                { oUser :: Maybe String
-                , oHost :: String
-                , oPort :: Maybe Int
-                , oCommand :: Conn -> String
-                }
-
-mkOverride = Override { oUser = Nothing, oHost = "", oPort = Nothing, oCommand = sshCmd }
-sshCmd c = concat
-           [ "ssh -t "
-           , if isJust $ cUser c then (fromJust $ cUser c) ++ "@" else ""
-           , cHost c
-           , if isJust $ cPort c then " -p " ++ (show $ fromJust $ cPort c) else ""
-           , " -- "
-           , cCommand c
-           ]
-moshCmd c = concat
-            [ "mosh "
-            , if isJust $ cUser c then (fromJust $ cUser c) ++ "@" else ""
-            , cHost c
-            , if isJust $ cPort c then " --ssh=\"ssh -p " ++ (show $ fromJust $ cPort c) ++ "\"" else ""
-            , " -- "
-            , cCommand c
-            ]
-moshCmd' p c = concat
-            [ "mosh "
-            , "--server=" ++ p ++ " "
-            , if isJust $ cUser c then (fromJust $ cUser c) ++ "@" else ""
-            , cHost c
-            , if isJust $ cPort c then " --ssh=\"ssh -p " ++ (show $ fromJust $ cPort c) ++ "\"" else ""
-            , " -- "
-            , cCommand c
-            ]
-inTmux Nothing c
-  | null $ cCommand c = c { cCommand = "tmux new-session" }
-  | otherwise = c { cCommand = "tmux new-session \"" ++ (cCommand c) ++  "\"" }
-inTmux (Just h) c
-  | null $ cCommand c = c { cCommand = "tmux new-session -As " <> h }
-  | otherwise = c { cCommand = "tmux new-session \"" ++ (cCommand c) ++  "\"" }
-withEnv :: [(String, String)] -> Conn -> Conn
-withEnv envs c = c { cCommand = "env" ++ (concat $ map (\(n, v) -> ' ' : (n ++ "=" ++ v)) envs) ++ " " ++ (cCommand c) }
-             
-data Conn = Conn
-            { cUser :: Maybe String
-            , cHost :: String
-            , cPort :: Maybe Int
-            , cCommand :: String
-            } deriving (Eq, Show, Read)
-
-data Ssh = Ssh
-
-instance XPrompt Ssh where
-  showXPrompt       Ssh = "SSH to: "
-  commandToComplete _ c = c
-  nextCompletion      _ = getNextCompletion
-
-toConn :: String -> Maybe Conn
-toConn = toConn' . parse connParser "(unknown)"
-toConn' :: Either ParseError Conn -> Maybe Conn
-toConn' (Left _) = Nothing
-toConn' (Right a) = Just a
-
-connParser :: Parser Conn
-connParser = do
-  spaces
-  user' <- optionMaybe $ try $ do
-    str <- many1 $ satisfy (\c -> (not $ isSpace c) && (c /= '@'))
-    char '@'
-    return str
-  host' <- many1 $ satisfy (not . isSpace)
-  port' <- optionMaybe $ try $ do
-    space
-    string "-p"
-    spaces
-    int <- many1 digit
-    (space >> return ()) <|> eof
-    return $ (read int :: Int)
-  spaces
-  command' <- many anyChar
-  eof
-  return $ Conn
-         { cHost = host'
-         , cUser = user'
-         , cPort = port'
-         , cCommand = command'
-         }
-
-sshPrompt :: [Override] -> XPConfig -> X ()
-sshPrompt o c = do
-  sc <- io sshComplList
-  mkXPrompt Ssh c (mkComplFunFromList c sc) $ ssh o
-
-ssh :: [Override] -> String -> X ()
-ssh overrides str = do
-  let cmd = applyOverrides overrides str
-  liftIO $ putStr "SSH Command: "
-  liftIO $ putStrLn cmd
-  runInTerm "" cmd
-
-applyOverrides :: [Override] -> String -> String
-applyOverrides [] str = "ssh " ++ str
-applyOverrides (o:os) str = case (applyOverride o str) of
-  Just str -> str
-  Nothing -> applyOverrides os str
-
-applyOverride :: Override -> String -> Maybe String
-applyOverride o str = let
-  conn = toConn str
-  in
-   if isNothing conn then Nothing else
-     case (fromJust conn) `matches` o of
-       True -> Just $ (oCommand o) (fromJust conn)
-       False -> Nothing
-
-matches :: Conn -> Override -> Bool
-a `matches` b = and
-                [ justBool (cUser a) (oUser b) (==)
-                , (cHost a) == (oHost b)
-                , justBool (cPort a) (oPort b) (==)
-                ]
-
-justBool :: Eq a => Maybe a -> Maybe a -> (a -> a -> Bool) -> Bool
-justBool Nothing _ _ = True
-justBool _ Nothing _ = True
-justBool (Just a) (Just b) match = a `match` b
-
-sshComplList :: IO [String]
-sshComplList = uniqSort `fmap` liftM2 (++) sshComplListLocal sshComplListGlobal
-
-sshComplListLocal :: IO [String]
-sshComplListLocal = do
-  h <- getEnv "HOME"
-  s1 <- sshComplListFile $ h ++ "/.ssh/known_hosts"
-  s2 <- sshComplListConf $ h ++ "/.ssh/config"
-  return $ s1 ++ s2
-
-sshComplListGlobal :: IO [String]
-sshComplListGlobal = do
-  env <- getEnv "SSH_KNOWN_HOSTS" `E.catch` econst "/nonexistent"
-  fs <- mapM fileExists [ env
-                        , "/usr/local/etc/ssh/ssh_known_hosts"
-                        , "/usr/local/etc/ssh_known_hosts"
-                        , "/etc/ssh/ssh_known_hosts"
-                        , "/etc/ssh_known_hosts"
-                        ]
-  case catMaybes fs of
-    []    -> return []
-    (f:_) -> sshComplListFile' f
-
-sshComplListFile :: String -> IO [String]
-sshComplListFile kh = do
-  f <- doesFileExist kh
-  if f then sshComplListFile' kh
-       else return []
-
-sshComplListFile' :: String -> IO [String]
-sshComplListFile' kh = do
-  l <- readFile kh
-  return $ map (getWithPort . takeWhile (/= ',') . concat . take 1 . words)
-         $ filter nonComment
-         $ lines l
-
-sshComplListConf :: String -> IO [String]
-sshComplListConf kh = do
-  f <- doesFileExist kh
-  if f then sshComplListConf' kh
-       else return []
-
-sshComplListConf' :: String -> IO [String]
-sshComplListConf' kh = do
-  l <- readFile kh
-  return $ map (!!1)
-         $ filter isHost
-         $ map words
-         $ lines l
- where
-   isHost ws = take 1 ws == ["Host"] && length ws > 1
-
-fileExists :: String -> IO (Maybe String)
-fileExists kh = do
-  f <- doesFileExist kh
-  if f then return $ Just kh
-       else return Nothing
-
-nonComment :: String -> Bool
-nonComment []      = False
-nonComment ('#':_) = False
-nonComment ('|':_) = False -- hashed, undecodeable
-nonComment _       = True
-
-getWithPort :: String -> String
-getWithPort ('[':str) = host ++ " -p " ++ port
-    where (host,p) = break (==']') str
-          port = case p of
-                   ']':':':x -> x
-                   _         -> "22"
-getWithPort  str = str
diff --git a/accounts/gkleen@sif/xmonad/package.yaml b/accounts/gkleen@sif/xmonad/package.yaml
deleted file mode 100644
index f65137af..00000000
--- a/accounts/gkleen@sif/xmonad/package.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: xmonad-yggdrasil
-
-executables:
-  xmonad:
-    dependencies:
-      - base
-      - xmonad
-      - xmonad-contrib
-      - aeson
-      - bytestring
-      - text
-      - temporary
-      - filepath
-      - directory
-      - network
-      - unix
-      - utf8-string
-      - parsec
-      - process
-      - mtl
-      - X11
-      - transformers
-      - containers
-      - hostname
-      - libnotify
-      - taffybar
-
-    main: xmonad.hs
-    source-dirs:
-      - .
-      - lib
diff --git a/accounts/gkleen@sif/xmonad/stack.nix b/accounts/gkleen@sif/xmonad/stack.nix
deleted file mode 100644
index 17a49e04..00000000
--- a/accounts/gkleen@sif/xmonad/stack.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ghc, nixpkgs ? import ./nixpkgs.nix {} }:
-
-let
-  haskellPackages = import ./stackage.nix { inherit nixpkgs; };
-  inherit (nixpkgs {}) pkgs;
-in pkgs.haskell.lib.buildStackProject {
-  inherit ghc;
-  inherit (haskellPackages) stack;
-  name = "stackenv";
-  buildInputs = (with pkgs;
-    [ xorg.libX11 xorg.libXrandr xorg.libXinerama xorg.libXScrnSaver xorg.libXext xorg.libXft
-      cairo
-      glib
-    ]) ++ (with haskellPackages;
-    [ 
-    ]);
-}
diff --git a/accounts/gkleen@sif/xmonad/stack.yaml b/accounts/gkleen@sif/xmonad/stack.yaml
deleted file mode 100644
index b8ed1147..00000000
--- a/accounts/gkleen@sif/xmonad/stack.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-nix:
-  enable: true
-  shell-file: stack.nix
-
-resolver: lts-13.21
-
-packages:
-  - .
-
-extra-deps: []
diff --git a/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix b/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
deleted file mode 100644
index 7c853619..00000000
--- a/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, containers, directory
-, filepath, hostname, hpack, mtl, network, parsec, process, lib
-, temporary, transformers, unix, utf8-string, X11, xmonad
-, xmonad-contrib, libnotify, taffybar
-}:
-mkDerivation {
-  pname = "xmonad-yggdrasil";
-  version = "0.0.0";
-  src = ./.;
-  isLibrary = false;
-  isExecutable = true;
-  libraryToolDepends = [ hpack ];
-  executableHaskellDepends = [
-    aeson base bytestring containers directory filepath hostname mtl
-    network parsec process temporary transformers unix utf8-string X11
-    xmonad xmonad-contrib libnotify taffybar
-  ];
-  preConfigure = "hpack";
-  license = "unknown";
-  hydraPlatforms = lib.platforms.none;
-}
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs
deleted file mode 100644
index a44d3bb7..00000000
--- a/accounts/gkleen@sif/xmonad/xmonad.hs
+++ /dev/null
@@ -1,939 +0,0 @@
-{-# LANGUAGE TupleSections, ViewPatterns, OverloadedStrings, FlexibleInstances, UndecidableInstances, MultiWayIf, NumDecimals #-}
-
-import XMonad
-import XMonad.Hooks.DynamicLog
-import XMonad.Hooks.ManageDocks
-import XMonad.Util.Run hiding (proc)
-import XMonad.Util.Loggers
-import XMonad.Util.EZConfig(additionalKeys)
-import System.IO
-import System.IO.Error
-import System.Environment
-import Data.Map (Map)
-import qualified Data.Map as Map
-import qualified XMonad.StackSet as W
-import System.Exit
-import Control.Monad.State (get)
--- import XMonad.Layout.Spiral
-import Data.Ratio
-import Data.List
-import Data.Char
-import Data.Maybe (fromMaybe, listToMaybe, maybeToList, catMaybes, isJust)
-import XMonad.Layout.Tabbed
-import XMonad.Prompt
-import XMonad.Prompt.Input
-import XMonad.Util.Scratchpad
-import XMonad.Util.NamedScratchpad
-import XMonad.Util.Ungrab
-import Control.Monad (sequence, liftM, liftM2, join, void)
-import XMonad.Util.WorkspaceCompare
-import XMonad.Layout.NoBorders
-import XMonad.Layout.PerWorkspace
-import XMonad.Layout.SimplestFloat
-import XMonad.Layout.Renamed
-import XMonad.Layout.Reflect
-import XMonad.Layout.OnHost
-import XMonad.Layout.Combo
-import XMonad.Layout.ComboP
-import XMonad.Layout.Column
-import XMonad.Layout.TwoPane
-import XMonad.Layout.IfMax
-import XMonad.Layout.LayoutBuilder
-import XMonad.Layout.WindowNavigation
-import XMonad.Layout.Dwindle
-import XMonad.Layout.TrackFloating
-import System.Process
-import System.Directory (removeFile)
-import System.Posix.Files
-import System.FilePath ((</>))
-import Control.Concurrent
-import System.Posix.Process (getProcessID)
-import System.IO.Error
-import System.IO
-import XMonad.Hooks.ManageHelpers hiding (CW)
-import XMonad.Hooks.UrgencyHook as U
-import XMonad.Hooks.EwmhDesktops
-import XMonad.StackSet (RationalRect (..))
-import Control.Monad (when, filterM, (<=<))
-import Graphics.X11.ExtraTypes.XF86
-import XMonad.Util.Cursor
-import XMonad.Actions.Warp
-import XMonad.Actions.FloatKeys
-import XMonad.Util.SpawnOnce
-import System.Directory
-import System.FilePath
-import XMonad.Actions.CopyWindow
-import XMonad.Hooks.ServerMode
-import XMonad.Actions.Commands
-import XMonad.Actions.CycleWS
-import XMonad.Actions.RotSlaves
-import XMonad.Actions.UpdatePointer
-import XMonad.Prompt.Window
-import Data.IORef
-import Data.Monoid
-import Data.String
-import qualified XMonad.Actions.PhysicalScreens as P
-
-import XMonad.Layout.IM
-
-import System.Taffybar.Support.PagerHints (pagerHints)
-
-import XMonad.Prompt.MyShell
-import XMonad.Prompt.MyPass
-import XMonad.Prompt.MySsh
-
-import XMonad.Mpv
-
-import Network.HostName
-
-import Control.Applicative ((<$>))
-
-import Libnotify as Notify hiding (appName)
-import qualified Libnotify as Notify (appName)
-import Libnotify (Notification)
--- import System.Information.Battery
-
-import Data.Int (Int32)
-
-import System.Posix.Process
-import System.Posix.Signals
-import System.Posix.IO as Posix
-import Control.Exception
-
-import System.IO.Unsafe
-
-import Control.Monad.Trans.Class
-import Control.Monad.Trans.Maybe
-
-import Data.Fixed (Micro)
-
-import qualified Data.Text as Text
-import Data.Ord (comparing)
-import Debug.Trace
-
-instance MonadIO m => IsString (m ()) where
-  fromString = spawn
-
-type KeyMap = Map (ButtonMask, KeySym) (X ())
-
-data Host = Host
-            { hName :: HostName
-            , hManageHook :: ManageHook
-            , hWsp :: Integer -> WorkspaceId
-            , hCoWsp :: String -> Maybe WorkspaceId
-            , hKeysMod :: XConfig Layout -> (KeyMap -> KeyMap)
-            , hScreens :: [P.PhysicalScreen]
-            , hKbLayouts :: [(String, Maybe String)]
-            , hCmds :: X [(String, X ())]
-            , hKeyUpKeys :: XConfig Layout -> KeyMap
-            }
-
-defaultHost = Host { hName = "unkown"
-                   , hManageHook = composeOne [manageScratchTerm]
-                   , hWsp = show
-                   , hCoWsp = const Nothing
-                   , hKeysMod = const id
-                   , hScreens = [0,1..]
-                   , hKbLayouts = [ ("us", Just "dvp")
-                                  , ("us", Nothing)
-                                  , ("de", Nothing)
-                                  ]
-                   , hCmds = return []
-                   , hKeyUpKeys = const Map.empty
-                   }
-
-browser :: String
-browser = "env MOZ_USE_XINPUT2=1 firefox"
-
-gray, darkGray, red, green :: String
-gray = "#808080"
-darkGray = "#202020"
-red = "#800000"
-green = "#008000"
-
-hostFromName :: HostName -> Host
-hostFromName h@("vali") = defaultHost { hName = h
-                                      , hManageHook = composeOne $ catMaybes [ Just manageScratchTerm
-                                                                             , assign "web"  $ className =? ".dwb-wrapped"
-                                                                             , assign "web"  $ className =? "Chromium"
-                                                                             , assign "work" $ className =? "Emacs"
-                                                                             , assign "media" $ className =? "mpv"
-                                                                             ]
-                                      , hWsp = hWsp
-                                      , hCoWsp = hCoWsp
-                                      , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_d, ["chromium", "chromium $(xclip -o)"])
-                                                                                                                        , (xK_e, ["emacsclient -c"])
-                                                                                                                        ])
-                                                            `Map.union`
-                                                            ( Map.fromList [ ((XMonad.modMask conf .|. controlMask, xK_Return), scratchpadSpawnActionCustom $ (XMonad.terminal conf) ++ " -name scratchpad -title scratchpad -e tmux new-session -D -s scratch")
-                                                                           ] )
-                                      , hScreens = hScreens defaultHost
-                                      }
-  where
-    workspaceNames = Map.fromList [ (2, "web")
-                                  , (3, "work")
-                                  , (10, "media")
-                                  ]
-    hWsp = wspFromMap workspaceNames
-    hCoWsp = coWspFromMap workspaceNames
-    assign wsp test = (\wsp -> test -?> doShift wsp) <$> hCoWsp wsp
-hostFromName h
-  | h `elem` ["hel", "sif"] = defaultHost { hName = h
-                                          , hManageHook = namedScratchpadManageHook scratchpads <+> composeOne (catMaybes
-                                              [ assign "mpv"     $ className =? "mpv"
-                                              , assign "mpv"     $ stringProperty "WM_WINDOW_ROLE" =? "presentation"
-                                              , assign "read"    $ stringProperty "WM_WINDOW_ROLE" =? "presenter"
-                                              , assign "mpv"     $ className =? "factorio"
-                                              , assign "mpv"     $ resource =? "twitch"
-                                              , assign "web"     $ className =? "chromium-browser"
-                                              , assign "web"     $ className =? "Google-chrome"
-                                              , assign "work"    $ (appName =? "Devtools" <&&> className =? "firefox")
-                                              , assign "work"    $ className =? "Postman"
-                                              , assign "web"     $ (appName =? "Navigator" <&&> className =? "firefox")
-                                              , assign "comm"    $ (className =? "Emacs" <&&> title =? "Mail")
-                                              , assign "comm"    $ className =? "Zulip"
-                                              , assign "comm"    $ className =? "Element"
-                                              , assign "comm"    $ className =? "Rocket.Chat"
-                                              , assign "comm"    $ className =? "Discord"
-                                              , assign "comm"    $ className =? "Rainbow"
-                                              , assign "media"   $ resource =? "media"
-                                              , assign "monitor" $ className =? "Grafana"
-                                              , assign "monitor" $ className =? "Virt-viewer"
-                                              , assign "monitor" $ resource =? "htop"
-                                              , assign "monitor" $ resource =? "monitor"
-                                              , assign "monitor" $ className =? "xfreerdp"
-                                              , assign "monitor" $ className =? "org.remmina.Remmina"
-                                              , Just $ resource =? "htop" -?> centerFloat
-                                              , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat
-                                              , Just $ resource =? "log" -?> centerFloat
-                                              , assign "work"    $ className =? "Alacritty"
-                                              , Just $ (appName =? "Edit with Emacs FRAME") -?> centerFloat
-                                              , assign' ["work", "uni"] $ (className =? "Emacs" <&&> appName /=? "Edit with Emacs FRAME")
-                                              , assign' ["work", "uni"] $ className =? "jetbrains-idea-ce"
-                                              , assign "read"    $ className =? "llpp"
-                                              , assign "read"    $ className =? "Evince"
-                                              , assign "read"    $ className =? "Zathura"
-                                              , assign "read"    $ className =? "MuPDF"
-                                              , assign "read"    $ className =? "Xournal"
-                                              , assign "read"    $ appName =? "libreoffice"
-                                              , assign "read"    $ appName =? "com-trollworks-gcs-app-GCS"
-                                              , assign "read"    $ appName =? "Tux.py"
-                                              , assign "read"    $ className =? "Gnucash"
-                                              , assign "comm"    $ className =? "Skype"
-                                              , assign "comm"    $ className =? "Daily"
-                                              , assign "comm"    $ className =? "Pidgin"
-                                              , assign "comm"    $ className =? "Thunderbird"
-                                              , assign "comm"    $ className =? "Slack"
-                                              , Just $ (resource =? "xvkbd") -?> doRectFloat $ RationalRect (1 % 8) (3 % 8) (6 % 8) (4 % 8)
-                                              , Just $ (stringProperty "_NET_WM_WINDOW_TYPE" =? "_NET_WM_WINDOW_TYPE_DIALOG") -?> doFloat
-                                              , Just $ (className =? "Dunst") -?> doFloat
-                                              , Just $ (className =? "Xmessage") -?> doCenterFloat
-                                              , Just $ (className =? "Nm-openconnect-auth-dialog") -?> centerFloat
-                                              , Just $ (className =? "Pinentry") -?> doCenterFloat
-                                              , Just $ (className =? "pinentry") -?> doCenterFloat
-                                              , Just $ (stringProperty "WM_WINDOW_ROLE" =? "GtkFileChooseDialog") -?> centerFloatSmall
-                                              , Just $ (className =? "Nvidia-settings") -?> doCenterFloat
-                                              , Just $ fmap ("Minetest" `isInfixOf`) title -?> doIgnore
-                                              , Just $ fmap ("Automachef" `isInfixOf`) title -?> doIgnore
-                                              , assign "call"    $ className =? "zoom"
-                                              ])
-                                          , hWsp = hWsp
-                                          , hCoWsp = hCoWsp
-                                          , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"])
-                                                                                                                            , (xK_d, [fromString browser, "google-chrome" {- , "notmuch-links" -}])
-                                                                                                                            , (xK_c, [ inputPrompt xPConfigMonospace "dc" ?+ dc ])
-                                                                                                                            , (xK_g, ["pidgin"])
-                                                                                                                            , (xK_s, ["skype"])
-                                                                                                                            -- , (xK_p, [mkPassPrompt "Type password" pwType xPConfig, mkPassPrompt "Show password" pwShow xPConfig, mkPassPrompt "Copy password" pwClip xPConfig])
-                                                                                                                            , (xK_w, ["sudo rewacom"])
-                                                                                                                            , (xK_y, [ "tmux new-window -dt media /var/media/link.hs $(xclip -o)"
-                                                                                                                                     , "tmux new-window -dt media /var/media/download.hs $(xclip -o)"
-                                                                                                                                     , "tmux new-window -dt media /var/media/download.hs $(xclip -o -selection clipboard)"
-                                                                                                                                     ])
-                                                                                                                            , (xK_l, [ "tmux new-window -dt media mpv $(xclip -o)"
-                                                                                                                                     , "tmux new-window -dt media mpv $(xclip -o -selection clipboard)"
-                                                                                                                                     , "alacritty --class media -e tmuxp load /var/media"
-                                                                                                                                     ])
-                                                                                                                            {- , (xK_m, [ "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch)'"
-                                                                                                                                     , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch-mua-new-mail)'"
-                                                                                                                                     , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e \"(browse-url-mail \"$(xclip -o)\")\""
-                                                                                                                                     ]) -}
-                                                                                                                            , (xK_Return, ["keynav start,windowzoom", "keynav start"])
-                                                                                                                            , (xK_t, [inputPrompt xPConfigMonospace "fuzzytime timer" ?+ fuzzytime, fuzzytime "unset", work_fuzzytime])
-                                                                                                                            , (xK_a, [inputPrompt xPConfigMonospace "adjmix" ?+ adjmix])
-                                                                                                                            , (xK_s, [ inputPromptWithCompl xPConfigMonospace "start synergy" synergyCompl ?+ synergyStart
-                                                                                                                                     , inputPromptWithCompl xPConfigMonospace "stop synergy" synergyCompl ?+ synergyStop
-                                                                                                                                     ])
-                                                                                                                            , (xK_h, [ "alacritty --class htop -e htop"
-                                                                                                                                     , "alacritty --class log -e journalctl -xef"
-                                                                                                                                     ])
-                                                                                                                            , (xK_x, [ "autorandr -c"
-                                                                                                                                     , "autorandr -fl def"
-                                                                                                                                     ])
-                                                                                                                            , (xK_z, [ "zulip -- --force-device-scale-factor=2"
-                                                                                                                                     ])
-                                                                                                                            ])
-                                                                `Map.union`
-                                                                ( Map.fromList [ ((XMonad.modMask conf .|. controlMask, xK_Return), namedScratchpadAction scratchpads "term")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_a), namedScratchpadAction scratchpads "pavucontrol")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_o), namedScratchpadAction scratchpads "easyeffects")
-                                                                               , ((XMonad.modMask conf .|. controlMask .|. shiftMask, xK_o), namedScratchpadAction scratchpads "helvum")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_w), namedScratchpadAction scratchpads "alarms")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_b), namedScratchpadAction scratchpads "blueman")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_p), namedScratchpadAction scratchpads "keepassxc")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_t), namedScratchpadAction scratchpads "toggl")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_e), namedScratchpadAction scratchpads "emacs")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_m), namedScratchpadAction scratchpads "calendar")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_f), namedScratchpadAction scratchpads "music")
-                                                                               , ((XMonad.modMask conf .|. mod1Mask, xK_Up), rotate U)
-                                                                               , ((XMonad.modMask conf .|. mod1Mask, xK_Down), rotate D)
-                                                                               , ((XMonad.modMask conf .|. mod1Mask, xK_Left), rotate L)
-                                                                               , ((XMonad.modMask conf .|. mod1Mask, xK_Right), rotate R)
-                                                                               , ((controlMask,               xK_space ), "dunstctl close"      )
-                                                                               , ((controlMask .|. shiftMask, xK_space ), "dunstctl close-all"  )
-                                                                               , ((controlMask,               xK_period), "dunstctl context"    )
-                                                                               , ((controlMask,               xK_comma ), "dunstctl history-pop")
-                                                                               -- , ((XMonad.modMask conf .|. shiftMask, xK_a), startMute "hel")
-                                                                               ] )
-                                          , hKeyUpKeys = \conf -> Map.fromList [ -- ((XMonad.modMask conf .|. shiftMask, xK_a), stopMute "hel")
-                                                                               ]
-                                          , hScreens = hScreens defaultHost
-                                          , hCmds = return [ ("prev-workspace", prevWS)
-                                                           , ("next-workspace", nextWS)
-                                                           , ("prev-window", rotAllDown)
-                                                           , ("next-window", rotAllUp)
-                                                           , ("banish", banishScreen LowerRight)
-                                                           , ("update-gpg-tty", safeSpawn "gpg-connect-agent" ["UPDATESTARTUPTTY", "/bye"])
-                                                           , ("rescreen", rescreen)
-                                                           , ("repanel", do
-                                                                 spawn "nm-applet"
-                                                                 spawn "blueman-applet"
-                                                                 spawn "pasystray"
-                                                                 spawn "kdeconnect-indicator"
-                                                                 spawn "dunst -print"
-                                                                 spawn "udiskie"
-                                                                 spawn "autocutsel -s PRIMARY"
-                                                                 spawn "autocutsel -s CLIPBOARD"
-                                                             )
-                                                           , ("pause", mediaMpv $ MpvSetProperty "pause" True)
-                                                           , ("unpause", mediaMpv $ MpvSetProperty "pause" False)
-                                                           , ("exit", io $ exitWith ExitSuccess)
-                                                           ]
-                                          }
-  where
-    withGdkScale act = void . xfork $ setEnv "GDK_SCALE" "2" >> act
-    workspaceNames = Map.fromList [ (1, "comm")
-                                  , (2, "web")
-                                  , (3, "work")
-                                  , (4, "read")
-                                  , (5, "monitor")
-                                  , (6, "uni")
-                                  , (8, "call")
-                                  , (9, "media")
-                                  , (10, "mpv")
-                                  ]
-    scratchpads = [ NS "term" "alacritty --class scratchpad --title scratchpad -e tmux new-session -AD -s scratch" (resource =? "scratchpad") centerFloat
-                  , NS "pavucontrol" "pavucontrol" (resource =? "pavucontrol") centerFloat
-                  , NS "helvum" "helvum" (resource =? "helvum") centerFloat
-                  , NS "easyeffects" "easyeffects" (resource =? "easyeffects") centerFloat
-                  , NS "alarms" "alarm-clock-applet" (className =? "Alarm-clock-applet" <&&> title =? "Alarms") centerFloat
-                  , NS "blueman" "blueman-manager" (className =? ".blueman-manager-wrapped") centerFloat
-                  , NS "keepassxc" "keepassxc" (className =? "KeePassXC") centerFloat
-                  , NS "toggl" "toggldesktop" (className =? "Toggl Desktop") centerFloat
-                  , NS "calendar" "minetime -- --force-device-scale-factor=1.6" (className =? "MineTime") centerFloat
-                  , NS "emacs" "emacsclient -c -F \"'(title . \\\"Scratchpad\\\")\"" (className =? "Emacs" <&&> title =? "Scratchpad") centerFloat
-                  , NS "music" "ytmdesktop" (className =? "youtube-music-desktop-app") centerFloat
-                  ]
-    centerFloat = customFloating $ RationalRect (1 % 16) (1 % 16) (7 % 8) (7 % 8)
-    centerFloatSmall = customFloating $ RationalRect (1 % 4) (1 % 4) (1 % 2) (1 % 2)
-    hWsp = wspFromMap workspaceNames
-    hCoWsp = coWspFromMap workspaceNames
-    assign wsp test = (\wsp -> test -?> doShift wsp) <$> hCoWsp wsp
-    assign' :: [String] -> Query Bool -> Maybe MaybeManageHook
-    assign' wsps test = do
-      wsIds <- mapM hCoWsp wsps
-      return $ test -?> go wsIds
-      where
-        go :: [WorkspaceId] -> ManageHook
-        go wsps = do
-          visWsps <- liftX $ (\wset -> W.tag . W.workspace <$> W.current wset : W.visible wset) <$> gets windowset
-          case (filter (`elem` visWsps) wsps, wsps) of
-            (wsp : _, _) -> doShift wsp
-            (_, wsp : _) -> doShift wsp
-            ([], [])     -> return mempty
-    rotate rot = do
-      safeSpawn "xrandr" ["--output", "eDP-1", "--rotate", xrandrDir]
-      mapM_ rotTouch touchscreens
-      where
-        xrandrDir = case rot of
-          U -> "normal"
-          L -> "left"
-          R -> "right"
-          D -> "inverted"
-        matrix = case rot of
-          U -> [ [ 1,  0,  0]
-               , [ 0,  1,  0]
-               , [ 0,  0,  1]
-               ]
-          L -> [ [ 0, -1,  1]
-               , [ 1,  0,  0]
-               , [ 0,  0,  1]
-               ]
-          R -> [ [ 0,  1,  0]
-               , [-1,  0,  1]
-               , [ 0,  0,  1]
-               ]
-          D -> [ [-1,  0,  1]
-               , [ 0, -1,  1]
-               , [ 0,  0,  1]
-               ]
-        touchscreens = [ "Wacom Co.,Ltd. Pen and multitouch sensor Finger touch"
-                       , "Wacom Co.,Ltd. Pen and multitouch sensor Pen stylus"
-                       , "Wacom Co.,Ltd. Pen and multitouch sensor Pen eraser"
-                       ]
-        rotTouch screen = do
-          safeSpawn "xinput" $ ["set-prop", screen, "Coordinate Transformation Matrix"] ++ map (\n -> show n ++ ",") (concat matrix)
-          safeSpawn "xinput" ["map-to-output", screen, "eDP-1"]
-    withPw f label = io . void . forkProcess $ do
-      uninstallSignalHandlers
-      void $ createSession
-      (dropWhileEnd isSpace -> pw) <- readCreateProcess (proc "pass" ["show", label]) ""
-      void $ f pw
-    pwType :: String -> X ()
-    pwType = withPw $ readCreateProcess (proc "xdotool" ["type", "--clearmodifiers", "--file", "-"])
-    pwClip label = safeSpawn "pass" ["show", "--clip", label]
-    pwShow :: String -> X ()
-    pwShow = withPw $ \pw -> do
-      xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE")
-      readCreateProcess (proc xmessage ["-file", "-"]) pw
-    fuzzytime str = safeSpawn "fuzzytime" $ "timer" : words str
-    work_fuzzytime = io . void . forkProcess $ do
-      readCreateProcess (proc "worktime" []) "" >>= safeSpawn "fuzzytime" . ("timer" : ) . pure
-    adjmix str = safeSpawn "adjmix" $ words str
-    dc expr = void . xfork $ do
-      result <- readProcess "dc" [] $ expr ++ "f"
-      let
-        (first : rest) = filter (not . null) $ lines result
-        notification = Notify.summary first <> Notify.body (unlines rest) <> Notify.timeout Infinite <> Notify.urgency Normal <> Notify.appName "dc"
-      void $ Notify.display notification
-    synergyCompl = mkComplFunFromList' xPConfigMonospace ["mathw86"]
-    synergyStart host = safeSpawn "systemctl" ["--user", "start", "synergy-rtunnel@" ++ host ++ ".service"]
-    synergyStop host = safeSpawn "systemctl" ["--user", "stop", "synergy-rtunnel@" ++ host ++ ".service"]
-
-hostFromName _ = defaultHost
-
--- muteRef :: IORef (Maybe (String, Notification))
--- {-# NOINLINE muteRef #-}
--- muteRef = unsafePerformIO $ newIORef Nothing
-
--- startMute, stopMute :: String -> X ()
--- startMute sink = liftIO $ do
---   muted <- isJust <$> readIORef muteRef
---   when (not muted) $ do
---     let
---       notification = Notify.summary "Muted" <> Notify.timeout Infinite <> Notify.urgency Normal
---       level = "0.0dB"
---     -- level <- runProcessWithInput "ssh" ["bragi", "cat", "/dev/shm/mix/" ++ sink ++ "/level"] ""
---     -- callProcess "ssh" ["bragi", "adjmix", "-t", sink, "-o", "0"]
---     hPutStrLn stderr "Mute"
---     writeIORef muteRef . Just . (level, ) =<< Notify.display notification
--- stopMute sink = liftIO $ do
---   let
---     unmute (Just (level, notification)) = do
---       hPutStrLn stderr "Unmute"
---       -- callProcess "ssh" ["bragi", "adjmix", "-t", sink, "-o", level]
---       Notify.close notification
---     unmute Nothing = return ()
---   muted <- isJust <$> readIORef muteRef
---   when muted . join . atomicModifyIORef muteRef $ (Nothing, ) . unmute
-
-wspFromMap workspaceNames = \i -> case Map.lookup i workspaceNames of
-  Just str -> show i ++ " " ++ str
-  Nothing -> show i
-
-coWspFromMap workspaceNames = \str -> case filter ((== str) . snd) $ Map.toList workspaceNames of
-  [] -> Nothing
-  [(i, _)] -> Just $ wspFromMap workspaceNames i
-  _ -> Nothing
-
-spawnModifiers = [0, controlMask, shiftMask .|. controlMask]
-spawnBindings :: XConfig layout -> (KeySym, [X ()]) -> [((KeyMask, KeySym), X ())]
-spawnBindings conf (k, cmds) = zipWith (\m cmd -> ((modm .|. mod1Mask .|. m, k), cmd)) spawnModifiers cmds
-  where
-    modm = XMonad.modMask conf
-
-manageScratchTerm = (resource =? "scratchpad" <||> resource =? "keysetup") -?> doRectFloat $ RationalRect (1 % 16) (1 % 16) (7 % 8) (7 % 8)
-
-tabbedLayout t = renamed [Replace "Tabbed"] $ reflectHoriz $ t CustomShrink $ tabbedTheme
-tabbedLayoutHoriz t = renamed [Replace "Tabbed Horiz"] $ reflectVert $ t CustomShrink $ tabbedTheme
-tabbedTheme = def
-  { activeColor = "black"
-  , inactiveColor = "black"
-  , urgentColor = "black"
-  , activeBorderColor = gray
-  , inactiveBorderColor = darkGray
-  , urgentBorderColor = red
-  , activeTextColor = gray
-  , inactiveTextColor = gray
-  , urgentTextColor = gray
-  , decoHeight = 32
-  , fontName = "xft:Fira Sans:pixelsize=21"
-  }
-
-main :: IO ()
-main = do
-  arguments <- either (const []) id <$> tryIOError getArgs
-  case arguments of
-    ["--command", s] -> do
-      d   <- openDisplay ""
-      rw  <- rootWindow d $ defaultScreen d
-      a   <- internAtom d "XMONAD_COMMAND" False
-      m   <- internAtom d s False
-      allocaXEvent $ \e -> do
-        setEventType e clientMessage
-        setClientMessageEvent e rw a 32 m currentTime
-        sendEvent d rw False structureNotifyMask e
-        sync d False
-    _ -> do
-      -- batteryMon <- xfork $ monitorBattery Nothing Nothing
-      hostname <- getHostName
-      let
-        host = hostFromName hostname
-      setEnv "HOST" hostname
-      let myConfig = withHostUrgency . ewmhFullscreen . ewmh . pagerHints $ docks def
-            { manageHook = hManageHook host
-            , terminal = "alacritty"
-            , layoutHook = smartBorders . avoidStruts $ windowNavigation layout'
-            , logHook = do
-                dynamicLogString xmobarPP' >>= writeProps
-                updatePointer (99 % 100, 98 % 100) (0, 0)
-            , modMask = mod4Mask
-            , keys = \conf -> hKeysMod host conf $ myKeys' conf host
-            , workspaces = take (length numKeys) $ map wsp [1..]
-            , startupHook = setDefaultCursor xC_left_ptr
-            , normalBorderColor = darkGray
-            , focusedBorderColor = gray
-            , handleEventHook = serverModeEventHookCmd' (hCmds host) <+> keyUpEventHook
-            }
-          writeProps str = do
-            let encodeCChar = map $ fromIntegral . fromEnum
-                atoms = [ "_XMONAD_WORKSPACES"
-                        , "_XMONAD_LAYOUT"
-                        , "_XMONAD_TITLE"
-                        ]
-            (flip mapM_) (zip atoms (lines str)) $ \(atom', content) -> do
-              ustring <- getAtom "UTF8_STRING"
-              atom <- getAtom atom'
-              withDisplay $ \dpy -> io $ do
-                root <- rootWindow dpy $ defaultScreen dpy
-                changeProperty8 dpy root atom ustring propModeReplace $ encodeCChar content
-                sync dpy True
-          wsp = hWsp host
-          -- We can´t define per-host layout modifiers because we lack dependent types
-          layout' = onHost "skadhi" ( onWorkspace (wsp 1) (Full ||| withIM (1%5) (Title "Buddy List") tabbedLayout') $
-                                      onWorkspace (wsp 10) Full $
-                                      onWorkspace (wsp 2) (Full ||| tabbedLayout') $
-                                      onWorkspace (wsp 5) tabbedLayout' $
-                                      onWorkspace (wsp 8) (withIM (1%5) (Title "Friends") tabbedLayout') $
-                                      defaultLayouts
-                                    ) $
-                    onHost "vali"   ( onWorkspace (wsp 2) (Full ||| tabbedLayout' ||| combineTwo (TwoPane 0.01 0.57) Full tabbedLayout') $
-                                      onWorkspace (wsp 3) workLayouts $
-                                      defaultLayouts
-                                    ) $
-                    onHost "hel"    ( onWorkspace (wsp 1) (withIM (1 % 8) (Title "Buddy List") $ trackFloating tabbedLayout') $
-                                      onWorkspace (wsp 2) (tabbedLayout''' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 3) workLayouts $
-                                      onWorkspace (wsp 6) workLayouts $
-                                      onWorkspace (wsp 4) (tabbedLayout' ||| tabbedLayoutHoriz' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 5) (tabbedLayout''' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 10) (tabbedLayout''' ||| combineTwoP (TwoPane (1 % 100) (3 % 4)) tabbedLayout''' tabbedLayout''' (ClassName "mpv") ||| Dwindle R CW 1 (5 % 100)) $
-                                      defaultLayouts
-                                    ) $
-                    onHost "sif"    ( onWorkspace (wsp 1) (withIM (1 % 8) (Title "Buddy List") $ trackFloating tabbedLayout') $
-                                      onWorkspace (wsp 2) (tabbedLayout''' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 3) workLayouts $
-                                      onWorkspace (wsp 6) workLayouts $
-                                      onWorkspace (wsp 4) (tabbedLayout' ||| tabbedLayoutHoriz' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 5) (tabbedLayout''' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 8) tabbedLayout''' $
-                                      onWorkspace (wsp 10) (tabbedLayout''' ||| combineTwoP (TwoPane (1 % 100) (3 % 4)) tabbedLayout''' tabbedLayout''' (ClassName "mpv") ||| Dwindle R CW 1 (5 % 100)) $
-                                      defaultLayouts
-                                    ) $
-                    defaultLayouts
-          -- tabbedLayout''' = renamed [Replace "Tabbed'"] $ IfMax 1 (noBorders Full) (tabbedLayout tabbedBottomAlways)
-          tabbedLayout''' = tabbedLayout tabbedBottom
-          tabbedLayout' = tabbedLayout tabbedBottomAlways
-          tabbedLayoutHoriz' = tabbedLayoutHoriz tabbedLeftAlways
-          defaultLayouts = {- spiralWithDir East CW (1 % 2) -} Dwindle R CW 1 (5 % 100) ||| tabbedLayout' ||| Full
-          -- workLayouts = {- spiralWithDir East CW (1 % 2) -} Dwindle R CW (2 % 1) (5 % 100) ||| tabbedLayout' ||| Full
-          workLayouts = tabbedLayout' ||| (renamed [Replace "Combined"] $ combineTwoP (TwoPane (1 % 100) (1891 % 2560)) tabbedLayout''' (Column 1.6) (ClassName "Postman" `Or` ClassName "Emacs" `Or` ClassName "jetbrains-idea-ce" `Or` (Resource "Devtools" `And` ClassName "Firefox"))) ||| Full ||| Dwindle R CW 1 (5 % 100)
-          sqrtTwo = approxRational (sqrt 2) (1 / 2560)
-          xmobarPP' = xmobarPP { ppTitle = shorten 80
-                               , ppSort = (liftM2 (.)) getSortByIndex $ return scratchpadFilterOutWorkspace
-                               , ppUrgent = wrap "(" ")" . xmobarColor "#800000" ""
-                               , ppHiddenNoWindows = xmobarColor "#202020" "" . wrap "(" ")"
-                               , ppVisible = wrap "(" ")" . xmobarColor "#808000" ""
-                               , ppCurrent = wrap "(" ")" . xmobarColor "#008000" ""
-                               , ppHidden = wrap "(" ")"
-                               , ppWsSep = " "
-                               , ppSep = "\n"
-                               }
-          withHostUrgency = case hostname of
-            "sif" -> withUrgencyHookC urgencyHook' $ def { suppressWhen = U.Never, remindWhen = Every 2 }
-            _ -> id
-          urgencyHook' window = do
-            let blinkLight = (lightHigh >> threadDelay 0.5e6) `finally` lightLow
-                  where
-                    lightHigh =
-                      writeFile "/sys/class/leds/input0::capslock/brightness" =<< readFile "/sys/class/leds/input0::capslock/max_brightness"
-                    lightLow = writeFile "/sys/class/leds/input0::capslock/brightness" "0"
-            runQuery ((resource =? "comm" <||> resource =? "Pidgin" <||> className =? "Gajim" <||> className =? "Skype" <||> className =? "Thunderbird") --> void (xfork blinkLight)) window
-            urgencyHook (BorderUrgencyHook { urgencyBorderColor = red }) window
-          shutdown :: SomeException -> IO a
-          shutdown e = do
-            let pids = [ -- batteryMon
-                       ]
-            mapM_ (signalProcess sigTERM) pids
-            mapM_ (getProcessStatus False False) pids
-            throw e
-          keyUpEventHook :: Event -> X All
-          keyUpEventHook event = handle event >> return (All True)
-            where
-              handle (KeyEvent { ev_event_type = t, ev_state = m, ev_keycode = code })
-                | t == keyRelease = withDisplay $ \dpy -> do
-                    s  <- io $ keycodeToKeysym dpy code 0
-                    mClean <- cleanMask m
-                    ks <- asks $ hKeyUpKeys host . config
-                    userCodeDef () $ whenJust (Map.lookup (mClean, s) ks) id
-                | otherwise = return ()
-              handle _ = return ()
-      handle shutdown $ launch myConfig =<< getDirectories
-
-secs :: Int -> Int
-secs = (* 1000000)
-
--- monitorBattery :: Maybe BatteryContext -> Maybe Notification -> IO ()
--- monitorBattery Nothing n = do
---   ctx <- batteryContextNew
---   case ctx of
---     Nothing -> threadDelay (secs 10) >> monitorBattery Nothing n
---     Just _  -> monitorBattery ctx n
--- monitorBattery ctx@(Just ctx') n = do
---   batInfo <- getBatteryInfo ctx'
---   case batInfo of
---     Nothing -> threadDelay (secs 1) >> monitorBattery ctx n
---     Just batInfo -> do
---       let n'
---             | batteryState batInfo == BatteryStateDischarging
---             , timeLeft <= 1200
---             , timeLeft > 0 = Just $ summary "Discharging" <> hint "value" percentage <> urgency u <> body (duz timeLeft ++ "left")
---             | otherwise = Nothing
---           u
---             | timeLeft <= 600 = Critical
---             | timeLeft <= 1800 = Normal
---             | otherwise = Low
---           timeLeft = batteryTimeToEmpty batInfo
---           percentage :: Int32
---           percentage = round $ batteryPercentage batInfo
---           ts = [("s", 60), ("m", 60), ("h", 24), ("d", 365), ("y", 1)]
---           duz ms = ss
---             where (ss, _) = foldl (\(ss, x) (s, y) -> ((if rem x y > 0 then show (rem x y) ++ s ++ " " else "") ++ ss , quot x y)) ("", ms) ts
---       case n' of
---         Just n' -> Notify.display (maybe mempty reuse n <> Notify.appName "monitorBattery" <> n') >>= (\n -> threadDelay (secs 2) >> monitorBattery ctx (Just n))
---         Nothing -> threadDelay (secs 30) >> monitorBattery ctx n
-
-disableTouchpad, disableTrackpoint, enableTrackpoint, enableTouchpad :: X ()
-enableTouchpad = safeSpawn "xinput" ["enable", "SynPS/2 Synaptics TouchPad"]
-disableTouchpad = safeSpawn "xinput" ["disable", "SynPS/2 Synaptics TouchPad"]
-enableTrackpoint = safeSpawn "xinput" ["enable", "TPPS/2 IBM TrackPoint"]
-disableTrackpoint = safeSpawn "xinput" ["disable", "TPPS/2 IBM TrackPoint"]
-
-isDisabled :: String -> X Bool
-isDisabled str = do
-  out <- runProcessWithInput "xinput" ["list", str] ""
-  return $ "disabled" `isInfixOf` out
-
-
-spawnKeychain :: X ()
-spawnKeychain = do
-  home <- liftIO getHomeDirectory
-  let keys = (map ((home </>) . (".ssh/" ++)) ["id", "id-rsa"]) ++ ["6B13AA67"]
-  liftIO (maybe (return ()) (setEnv "SSH_ASKPASS") =<< findAskpass)
-  safeSpawn "keychain" . (["--agents", "gpg,ssh"] ++)=<< liftIO (filterM doesFileExist keys)
-  where
-    findAskpass = filter `liftM` readFile "/etc/zshrc"
-    filter = listToMaybe . catMaybes . map (stripPrefix "export SSH_ASKPASS=") . lines
-
-assimilateKeychain :: X ()
-assimilateKeychain = liftIO $ assimilateKeychain' >> return ()
-assimilateKeychain' = tryIOError $ do
-  -- pid <- getProcessID
-  -- tmpDir <- lookupEnv "TMPDIR"
-  -- let tmpDir' = fromMaybe "/tmp" tmpDir
-  --     tmpFile = tmpDir' </> "xmonad-keychain" ++ (show pid) ++ ".env"
-  env <- runProcessWithInput "sh" ["-c", "eval $(keychain --eval --noask --agents gpg,ssh); env"] "" -- > " ++ tmpFile] ""
-  -- env <- readFile tmpFile
-  let envVars = Map.fromList $ map (\(k, v) -> (k, tail' v)) $ map (span (/= '=')) $ envLines
-      envVars' = Map.filterWithKey (\k _ -> k `elem` transfer) envVars
-      transfer = ["SSH_AUTH_SOCK", "SSH_AGENT_PID", "GPG_AGENT_INFO"]
-      envLines = filter (elem '=') $ lines env :: [String]
-  sequence $ map (\(k, c) -> setEnv k c) $ Map.toList envVars'
-  -- removeFile tmpFile
-  where
-    tail' [] = []
-    tail' (x:xs) = xs
-
-
-numKeys = [xK_parenleft, xK_parenright, xK_braceright, xK_plus, xK_braceleft, xK_bracketright, xK_bracketleft, xK_exclam, xK_equal, xK_asterisk]
-
-instance Shrinker CustomShrink where
-  shrinkIt _ "" = [""]
-  shrinkIt s cs
-    | length cs >= 4 = cs : shrinkIt s ((reverse . drop 4 . reverse $ cs) ++ "...")
-    | otherwise = cs : shrinkIt s (init cs)
-
-xPConfig, xPConfigMonospace :: XPConfig
-xPConfig = def
-  { font = "xft:Fira Sans:pixelsize=21"
-  , height = 32
-  , bgColor = "black"
-  , fgColor = gray
-  , fgHLight = green
-  , bgHLight = "black"
-  , borderColor = gray
-  , searchPredicate = (\needle haystack -> all (`isInfixOf` map toLower haystack) . map (map toLower) $ words needle)
-  , position = Top
-  }
-xPConfigMonospace = xPConfig { font = "xft:Fira Code:pixelsize=21" }
-
-sshOverrides host = map (\h -> mkOverride { oHost = h, oCommand = moshCmd . inTmux host} )
-               [ "odin"
-               , "ymir"
-               , "surtr"
-               , "vidhar"
-               , "srv02.uniworx.de"
-               ]
-               ++
-               map (\h -> mkOverride { oHost = h, oCommand = moshCmd' "/run/current-system/sw/bin/mosh-server" . withEnv [("TERM", "xterm")] . inTmux host} )
-               [ "bragi", "bragi.asgard.yggdrasil"
-               ]
-               ++
-               map (\h -> mkOverride { oHost = h, oCommand = sshCmd . inTmux host } )
-               [ "uni2work-dev1", "srv01.uniworx.de"
-               ]
-               ++
-               map (\h -> mkOverride { oHost = h, oCommand = sshCmd . withEnv [("TERM", "xterm")] . inTmux host } )
-               [ "remote.cip.ifi.lmu.de"
-               , "uniworx3", "uniworx4", "uniworx5", "uniworxdb2"
-               , "testworx"
-               ]
-
-backlight :: (Rational -> Rational) -> X ()
-backlight f = void . xfork . liftIO $ do
-  [   _device
-    , _class
-    , read . Text.unpack -> currentBright
-    , _currentPercentage
-    , read . Text.unpack -> maximumBright
-    ] <- Text.splitOn "," . Text.pack <$> readProcess "brightnessctl" ["-m"] ""
-  let current = currentBright % maximumBright
-      new' = f current * fromIntegral maximumBright
-      new :: Integer
-      new | floor new' < 0 = 0
-          | ceiling new' > maximumBright = maximumBright
-          | new' >= maximumBright % 2 = ceiling new'
-          | otherwise = floor new'
-  callProcess "brightnessctl" ["-m", "s", show new]
-
-cycleThrough :: [Rational] -> (Rational -> Rational)
-cycleThrough opts current = fromMaybe currentOpt $ listToMaybe next'
-  where currentOpt = minimumBy (comparing $ abs . subtract current) opts
-        (_, _ : next') = break (== currentOpt) opts
-
-cycleKbLayout :: [(String, Maybe String)] -> X ()
-cycleKbLayout [] = return ()
-cycleKbLayout layouts = liftIO $ do
-  next <- (getNext . extract) `liftM` runProcessWithInput "setxkbmap" ["-query"] ""
-  let
-    args = case next of
-      (l, Just v) -> [l, v]
-      (l, Nothing) -> [l]
-  safeSpawn "setxkbmap" args
-  where
-    extract :: String -> Maybe (String, Maybe String)
-    extract str = listToMaybe $ do
-      ["layout:", l] <- str'
-      [(l, Just v) | ["variant:", v] <- str'] ++ pure (l, Nothing)
-      where
-        str' = map words $ lines str
-    getNext :: Maybe (String, Maybe String) -> (String, Maybe String)
-    getNext = maybe (head layouts) getNext'
-    getNext' x = case elemIndex x layouts of
-      Nothing -> getNext Nothing
-      Just i -> layouts !! ((i + 1) `mod` length layouts)
-
-mpvAll' :: MpvCommand -> IO [MpvResponse]
-mpvAll' = mpvAll "/var/media/.mpv-ipc"
-
-mpvOne' :: MpvCommand -> IO (Maybe MpvResponse)
-mpvOne' = mpvOne "/var/media/.mpv-ipc"
-
-mediaMpv :: MpvCommand -> X ()
-mediaMpv cmd = void . xfork $ print =<< mpvAll' cmd
-
-mediaMpvTogglePause :: X ()
-mediaMpvTogglePause = void . xfork $ do
-  paused <- mapM mpvResponse <=< mpvAll' $ MpvGetProperty "pause"
-  if
-    | and paused -> print <=< mpvAll' $ MpvSetProperty "pause" False
-    | otherwise  -> print <=< mpvOne' $ MpvSetProperty "pause" True
-
-myKeys' conf host = Map.fromList $
-    -- launch a terminal
-    [ ((modm,               xK_Return), spawn $ (XMonad.terminal conf) ++ " -e tmux")
-    , ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf)
-
-    -- launch dmenu
-    --, ((modm,               xK_d     ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"")
-    , ((modm,               xK_d     ), shellPrompt "Run: " xPConfigMonospace)
-    , ((modm .|. shiftMask, xK_d     ), prompt "Run in Terminal: " ("alacritty" ++ " -e") xPConfigMonospace)
-    , ((modm,               xK_at    ), sshPrompt (sshOverrides . Just $ hName host) xPConfigMonospace)
-
-    -- close focused window
-    , ((modm .|. shiftMask, xK_q     ), kill)
-    , ((modm .|. controlMask .|. shiftMask, xK_q     ), spawn "xkill")
-
-     -- Rotate through the available layout algorithms
-    , ((modm,               xK_space ), sendMessage NextLayout)
-
-    --  Reset the layouts on the current workspace to default
-    , ((modm .|. controlMask, xK_r   ), (setLayout $ XMonad.layoutHook conf) >> refresh)
-
-    -- Resize viewed windows to the correct size
-    , ((modm,               xK_r     ), refresh)
-
-    -- Move focus to the next window
-    , ((modm,               xK_t     ), windows W.focusDown)
-
-    -- Move focus to the previous window
-    , ((modm,               xK_n     ), windows W.focusUp  )
-
-    -- Move focus to the master window
-    , ((modm,               xK_m     ), windows W.focusMaster  )
-
-    -- Swap the focused window and the master window
-    , ((modm .|. shiftMask, xK_m     ), windows W.swapMaster)
-
-    -- Swap the focused window with the next window
-    , ((modm .|. shiftMask, xK_t     ), windows W.swapDown  )
-
-    -- Swap the focused window with the previous window
-    , ((modm .|. shiftMask, xK_n     ), windows W.swapUp    )
-
-    -- Swap the focused window with the previous window
-    , ((modm .|. shiftMask .|. controlMask, xK_m), sendMessage SwapWindow)
-
-    , ((modm,                 xK_Right), sendMessage $ Go R)
-    , ((modm,                 xK_Left ), sendMessage $ Go L)
-    , ((modm,                 xK_Up   ), sendMessage $ Go U)
-    , ((modm,                 xK_Down ), sendMessage $ Go D)
-    , ((modm .|. shiftMask  , xK_Right), sendMessage $ Move R)
-    , ((modm .|. shiftMask  , xK_Left ), sendMessage $ Move L)
-    , ((modm .|. shiftMask  , xK_Up   ), sendMessage $ Move U)
-    , ((modm .|. shiftMask  , xK_Down ), sendMessage $ Move D)
-    -- , ((modm .|. controlMask, xK_Right), withFocused $ keysMoveWindow (10, 0))
-    -- , ((modm .|. controlMask, xK_Left ), withFocused $ keysMoveWindow (-10, 0))
-    -- , ((modm .|. controlMask, xK_Up   ), withFocused $ keysMoveWindow (0, -10))
-    -- , ((modm .|. controlMask, xK_Down ), withFocused $ keysMoveWindow (0, 10))
-     -- Shrink the master area
-    , ((modm,               xK_h     ), sendMessage Shrink)
-
-    -- Expand the master area
-    , ((modm,               xK_s     ), sendMessage Expand)
-
-    -- Push window back into tiling
-    , ((modm .|. shiftMask, xK_space ), withFocused $ windows . W.sink)
-    , ((modm, xK_BackSpace), focusUrgent)
-    , ((modm .|. shiftMask, xK_BackSpace), clearUrgents)
-
-    -- Increment the number of windows in the master area
-    , ((modm              , xK_comma ), sendMessage (IncMasterN 1))
-
-    -- Deincrement the number of windows in the master area
-    , ((modm              , xK_period), sendMessage (IncMasterN (-1)))
-
-    , ((0, xF86XK_AudioRaiseVolume), safeSpawn "pamixer" ["-i", "2"])
-    , ((0, xF86XK_AudioLowerVolume), safeSpawn "pamixer" ["-d", "2"])
-    , ((0, xF86XK_AudioMute), safeSpawn "pamixer" ["-t"])
-    , ((0, xF86XK_AudioPause), mediaMpv $ MpvSetProperty "pause" False)
-    , ((0, {-xF86XK_AudioMicMute-} 269025202), safeSpawn "pulseaudio-ctl" ["mute-input"])
-    , ((0, xF86XK_AudioPlay), mediaMpvTogglePause)
-    , ((0, xK_Print), do
-          home <- liftIO getHomeDirectory
-          unGrab
-          safeSpawn "scrot" ["-s", "-F", home </> "screenshots" </> "%Y-%m-%dT%H:%M:%S.png", "-e", "xclip -selection clipboard -t image/png -i $f"]
-      )
-    , ((modm .|. mod1Mask, xK_space), mediaMpvTogglePause)
-
-    -- , ((0, xF86XK_MonBrightnessDown), backlight . cycleThrough $ reverse brCycle)
-    -- , ((0, xF86XK_MonBrightnessUp  ), backlight $ cycleThrough brCycle)
-    , ((modm .|. shiftMask                , xK_b), backlight . cycleThrough $ reverse brCycle)
-    , ((modm .|. shiftMask .|. controlMask, xK_b), backlight $ cycleThrough brCycle)
-
-    , ((modm                , xK_Escape), cycleKbLayout (hKbLayouts host))
-    , ((modm .|. controlMask, xK_Escape), safeSpawn "setxkbmap" $ fst (head $ hKbLayouts host) : maybeToList (snd . head $ hKbLayouts host))
-
-    -- Toggle the status bar gap
-    -- Use this binding with avoidStruts from Hooks.ManageDocks.
-    -- See also the statusBar function from Hooks.DynamicLog.
-    --
-    , ((modm              , xK_b     ), sendMessage ToggleStruts)
-
-    , ((modm .|. shiftMask, xK_p     ), safeSpawn "playerctl" ["-a", "pause"])
-
-    -- Quit xmonad
-    , ((modm .|. shiftMask, xK_e     ), io (exitWith ExitSuccess))
-
-    -- Restart xmonad
-    -- , ((modm .|. shiftMask .|. controlMask, xK_r     ), void . xfork $ recompile False >>= flip when (safeSpawn "xmonad" ["--restart"]))
-    , ((modm .|. shiftMask, xK_r     ), void . liftIO $ executeFile "xmonad" True [] Nothing)
-    , ((modm .|. shiftMask, xK_l     ), void . xfork $ do
-          sessId <- getEnv "XDG_SESSION_ID"
-          safeSpawn "loginctl" ["lock-session", sessId]
-      )
-    , ((modm .|. shiftMask, xK_s     ), safeSpawn "systemctl" ["suspend"])
-    , ((modm .|. shiftMask, xK_h     ), inputPromptWithCompl xPConfigMonospace "systemctl" powerActCompl ?+ powerAct)
-    , ((modm, xK_v ), windows copyToAll) -- @@ Make focused window always visible
-    , ((modm .|. shiftMask, xK_v ),  killAllOtherCopies) -- @@ Toggle window state back
-    , ((modm .|. shiftMask, xK_g     ), windowPrompt xPConfig Goto wsWindows)
-    , ((modm              , xK_g     ), windowPrompt xPConfig Bring allWindows)
-    ]
-    ++
-
-    --
-    -- mod-[1..9], Switch to workspace N
-    --
-    -- mod-[1..9], Switch to workspace N
-    -- mod-shift-[1..9], Move client to workspace N
-    --
-    [((m .|. modm, k), windows $ f i)
-    | (i, k) <- zip (XMonad.workspaces conf) $ numKeys
-    , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]
-    ]
-    ++
-    [((m .|. modm .|. controlMask, k), void . runMaybeT $
-         MaybeT (P.getScreen def i) >>= MaybeT . screenWorkspace >>= lift . windows . f
-     )
-    | (i, k) <- zip (hScreens host) [xK_g, xK_c, xK_r, xK_l]
-    , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
-    ]
-  where
-    modm = XMonad.modMask conf
-
-    brCycle = [0, 1 % 500, 1 % 250, 1 % 100, 1 % 10, 1 % 4, 1 % 2, 3 % 4, 1]
-
-    powerActWords = ["poweroff", "reboot", "hibernate", "suspend"]
-    powerActCompl = mkComplFunFromList' xPConfigMonospace powerActWords
-    powerAct act | act `elem` powerActWords = safeSpawn "systemctl" $ pure act
-                 | otherwise = return ()
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index e3f675a1..abc200c6 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -2,17 +2,14 @@ dir() {
     curlArchive=false
     templateArchive=""
     repoUrl=""
-    nixShell=""
-    findNix=false
     dir=""
     forceShell=false
     wormhole=false
     gitWorktree=""
-    # notmuchMsg=""
-    quickserve=false
     modifyPDF=""
+    miniserve=false
 
-    while getopts ':t:a:s:Sd:ir:wqg:p:' arg; do
+    while getopts ':t:a:d:ir:wg:p:m' arg; do
         case $arg in
             "t") ;;
             "a")
@@ -23,16 +20,13 @@ dir() {
                     templateArchive=${OPTARG:a}
                 fi
                 ;;
-            "s") nixShell=${OPTARG:a} ;;
-            "S") findNix=true ;;
             "d") dir=${OPTARG} ;;
             "i") forceShell=true ;;
             "r") repoUrl=${OPTARG} ;;
             "w") wormhole=true ;;
             "g") gitWorktree=${OPTARG} ;;
-            # "n") notmuchMsg=${OPTARG} ;;
-            "q") quickserve=true ;;
             "p") modifyPDF=${OPTARG:a} ;;
+            "m") miniserve=true ;;
             *) printf "Invalid option: %s\n" $arg >&2; exit 2 ;;
         esac
     done
@@ -56,20 +50,34 @@ dir() {
         gitWorktree=""
     fi
 
+    miniservePIDFile=""
+    if [[ ${miniserve} = "true" ]]; then
+      miniservePIDFile=$(mktemp --tmpdir --suffix=.pid)
+    fi
+
     cleanup()
     {
-        cd ${modifyPDF:h}
-        [[ -n ${modifyPDF} ]] && nix shell nixos#imagemagick -c convert -verbose ${dir}/${modifyPDF:t:r}_*.png(on) ${modifyPDF}
+        if [[ -n ${modifyPDF} ]]; then
+           cd ${modifyPDF:h}
+           typeset -a pages
+           eval 'pages=(${dir}/${modifyPDF:t:r}_*.png(on))'
+           magick -verbose "$pages" ${modifyPDF}
+           modifyPDF=""
+        fi
+        if [[ -n ${miniservePIDFile} ]]; then
+           command kill --verbose -- $(cat ${miniservePIDFile}) && wait $(cat ${miniservePIDFile})
+           miniservePIDFile=""
+        fi
     }
 
     (
+        set -o localoptions -o localtraps
+        trap 'return 1' INT TERM
         trap cleanup EXIT
 
         cd ${dir}
         export dir;
 
-        ${findNix} && { nixShell=$(findNix) || return $? }
-
         [[ -n ${repoUrl} ]] && git clone -- ${repoUrl} .
 
         [[ -n ${modifyPDF} ]] && templateArchive=${modifyPDF}
@@ -82,7 +90,7 @@ dir() {
                 }
                 trap cleanup EXIT
 
-                if ${curlArchive}; then
+                if [[ $curlArchive = "true" ]]; then
                     archiveFile=$(mktemp -t "archive.XXXXXXXXXX.${templateArchive:t}")
 
                     curl -L -o ${archiveFile} ${templateArchive}
@@ -91,14 +99,14 @@ dir() {
                 fi
 
                 unpack=true
-                while ${unpack}; do
+                while [[ $unpack = "true" ]]; do
                     case $(file --brief --mime-type --dereference ${templateArchive}) in
                         application/zip)
                             unzip ${templateArchive}
                             unpack=false
                         ;;
                         application/vnd.debian.binary-package)
-                            nix shell nixos#binutils --command ar x ${templateArchive}
+                            ar x ${templateArchive}
                             mkdir control data
                             tar -C control -xvaf control.*
                             tar -C data -xvaf data.*
@@ -106,7 +114,7 @@ dir() {
                         ;;
                         application/x-rpm)
                             cpioArchive=$(mktemp -t "archive.XXXXXXXXXX.${templateArchive:t:r}.cpio")
-                            nix shell nixos#busybox --command rpm2cpio ${templateArchive} > ${cpioArchive}
+                            rpm2cpio ${templateArchive} > ${cpioArchive}
                             templateArchive=${cpioArchive}
                             unpack=true
                         ;;
@@ -115,12 +123,12 @@ dir() {
                             unpack=false
                         ;;
                         application/pdf)
-                            nix shell nixos#ghostscript nixos#imagemagick -c convert -verbose -density 400 ${templateArchive} ${modifyPDF:t:r}_%0d.png
+                            magick -verbose -density 400 ${templateArchive} ${modifyPDF:t:r}_%0d.png
                             unpack=false
                         ;;
                         application/octet-stream)
-                            if [[ $(file --brief --dereferenc ${templateArchive}) =~ Squashfs ]]; then
-                               nix shell nixos#squashfsTools -c unsquashfs -d . ${templateArchive}
+                            if [[ $(file --brief --dereference ${templateArchive}) =~ Squashfs ]]; then
+                               unsquashfs -d . ${templateArchive}
                                unpack=false
                             fi
                         ;;
@@ -134,25 +142,21 @@ dir() {
         fi
 
 
-        ${wormhole} && wormhole receive --accept-file
+        [[ $wormhole = "true" ]] && wormhole receive --accept-file
 
 
-        if ${quickserve}; then
-          quickserve --root . --upload . --show-hidden --tar gz
+        if [[ ${#@} -gt 0 ]]; then
+            ${@}
         fi
 
+        cd $(pwd) # Needed for mounting to work
 
-        if [[ ${#@} -eq 0 ]] || ${forceShell}; then
-            if [[ ${#@} -gt 0 ]]; then
-                if [[ -z ${nixShell} ]]; then
-                    ${@}
-                else
-                    nix-shell ${nixShell} --run "${@}"
-                fi
-            fi
-
-            cd $(pwd) # Needed for mounting to work
+        if [[ ${miniserve} = "true" ]]; then
+           miniserve --random-route --hidden --enable-tar-gz --enable-zip . &
+           echo $! > "${miniservePIDFile}"
+        fi
 
+        if [[ ${#@} -eq 0 ]] && [[ ${miniserve} != "true" ]] || [[ $forceShell = "true" ]]; then
             isSingleDir() {
                 typeset -a contents
                 contents=(*(N) .*(N))
@@ -166,18 +170,9 @@ dir() {
             }
             while d=$(isSingleDir); do cd ${d}; done
 
-
-            if [[ -z ${nixShell} ]]; then
-                zsh
-            else
-                nix-shell ${nixShell} --run zsh
-            fi
-        else
-            if [[ -z ${nixShell} ]]; then
-                ${@}
-            else
-                nix-shell ${nixShell} --run "${@}"
-            fi
+            zsh
+        elif [[ ${miniserve} == "true" ]]; then
+            wait $(cat "${miniservePIDFile}")
         fi
     )
 }
@@ -185,27 +180,30 @@ dir() {
 tmpdir() {
     cleanup()
     {
-      cd /
+        cd /
         unmount() {
             printf "Unmounting %s\n" ${1} >&2
             fusermount -u ${1} || umount ${1} || sudo umount ${1}
         }
 
-        if mountpoint -q -- ${dir}; then
-            unmount ${dir} || return $?
-        else
-            while read -d $'\0' subDir; do
-                mountpoint -q -- ${subDir} || continue
-                unmount ${subDir} || return $?
-            done <<<$(find ${dir} -xdev -type d -print0 | sort -zr)
-        fi
-
-        rm -rfv --one-file-system -- ${dir}
+        if [[ -n ${dir} ]]; then
+            if mountpoint -q -- ${dir}; then
+                unmount ${dir} || return $?
+            else
+                while read -d $'\0' subDir; do
+                    mountpoint -q -- ${subDir} || continue
+                    unmount ${subDir} || return $?
+                done <<<$(find ${dir} -xdev -type d -print0 | sort -zr)
+            fi
+
+            rm -rfv --one-file-system -- ${dir}
+            dir=""
+        fi
     }
 
     local tmpdir=""
 
-    while getopts ':t:a:s:Sd:ir:wqg:p:' arg; do
+    while getopts ':t:a:d:ir:wg:p:m' arg; do
         case $arg in
             "t") tmpdir="=${OPTARG}" ;;
             "?"|":") printf "Invalid option: %s\n" $arg >&2; exit 2 ;;
@@ -213,6 +211,8 @@ tmpdir() {
     done
 
     (
+        set -o localoptions -o localtraps
+        trap 'return 1' INT TERM
         trap cleanup EXIT
 
 
@@ -234,16 +234,6 @@ public-ip() {
     curl -s -H 'Accept: application/json' $@ ifconfig.co | jq -r '.ip'
 }
 
-nix-ghci() {
-    pkgExpr=""
-    if [[ ${#@} -gt 0 ]]; then
-        pkgExpr="${1}"
-        shift
-    fi
-
-    nix-shell -p "with (import <nixpkgs> {}); pkgs.haskellPackages.ghcWithPackages (p: with p; [${pkgExpr}])" --run "ghci ${@}"
-}
-
 swap() {
     f1=${1}
     f2=${2}
@@ -271,14 +261,6 @@ l() {
   ls --long --binary --git --time-style=iso --header $@
 }
 
-re() {
-  systemctl --restart $@
-}
-
-ure() {
-  systemctl --user --restart $@
-}
-
 ssh-installer() {
   ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/gkleen@sif.midgard.yggdrasil $@
 }
@@ -306,20 +288,7 @@ done < <(find ~/projects ~/uni -regextype posix-extended -maxdepth 2 -type d -re
        sed -zr 's|(.*/([0-9]{2}[ws])/(.+))|\1 \2 \3|' | \
        sort -z -r -k2 | sort -z -s -k3 | uniq -z -f 2)
 
-alias '..'='cd ..'
 alias rzadm=$'tmpdir -i sh -c \'mkdir adm; sshfs gkleen@mgmt01:/adm adm\''
 alias mathcloud=$'tmpdir -i rclone mount --daemon mathcloud:// .'
-alias -g L='| less'
-alias -g S='&> /dev/null'
-alias -g G='| grep'
-alias -g B='&> /dev/null &'
-alias -g BB='&> /dev/null &!'
 
 export DEFAULT_USER=gkleen
-
-bindkey -e
-bindkey ';5C' emacs-forward-word
-bindkey ';5D' emacs-backward-word
-bindkey '^[[1;5C' emacs-forward-word
-bindkey '^[[1;5D' emacs-backward-word
-bindkey '^H' backward-kill-word
diff --git a/accounts/gkleen@surtr.nix b/accounts/gkleen@surtr.nix
index 58c4f21d..8f678ac9 100644
--- a/accounts/gkleen@surtr.nix
+++ b/accounts/gkleen@surtr.nix
@@ -1,3 +1,7 @@
-{ userName, ... }: {
-  home-manager.users.${userName}.home.stateVersion = "20.09";
+{ flake, userName, ... }: {
+  imports = with flake.nixosModules.userProfiles.${userName}; [
+    zsh tmux
+  ];
+
+  config.home-manager.users.${userName}.home.stateVersion = "20.09";
 }
diff --git a/accounts/gkleen@vidhar.nix b/accounts/gkleen@vidhar.nix
index 8509c2f4..3a37c4bd 100644
--- a/accounts/gkleen@vidhar.nix
+++ b/accounts/gkleen@vidhar.nix
@@ -1,4 +1,8 @@
 { flake, pkgs, userName, config, ... }: {
+  imports = with flake.nixosModules.userProfiles.${userName}; [
+    zsh tmux
+  ];
+
   config = {
     users.users.${userName} = {
       uid = 1000;
diff --git a/accounts/mherold@eostre.nix b/accounts/mherold@eostre.nix
index 51e4529a..0e2f37aa 100644
--- a/accounts/mherold@eostre.nix
+++ b/accounts/mherold@eostre.nix
@@ -7,9 +7,9 @@
     home-manager.users.${userName} = {
       home.stateVersion = "20.09";
 
-      nixpkgs.config = {
-        allowUnfree = true;
-      };
+      # nixpkgs.config = {
+      #   allowUnfree = true;
+      # };
 
       home.packages = with pkgs; [
         thunderbird libreoffice element-desktop keepassxc vlc
diff --git a/accounts/root@installer.nix b/accounts/root@installer.nix
index c7a418f8..5fe1db38 100644
--- a/accounts/root@installer.nix
+++ b/accounts/root@installer.nix
@@ -1,7 +1,11 @@
-{ userName, ... }:
+{ flake, userName, ... }:
 
 {
-  home-manager.users.${userName} = { config, ... } : {
+  imports = with flake.nixosModules.userProfiles.${userName}; [
+    zsh tmux
+  ];
+
+  config.home-manager.users.${userName} = { config, ... } : {
     home.stateVersion = config.home.version.release;
   };
 }
diff --git a/accounts/root@sif.nix b/accounts/root@sif.nix
index c9e129a0..bb816230 100644
--- a/accounts/root@sif.nix
+++ b/accounts/root@sif.nix
@@ -1,6 +1,10 @@
-{ userName, ... }:
+{ flake, userName, ... }:
 {
-  home-manager.users.${userName} = {
+  imports = with flake.nixosModules.userProfiles.${userName}; [
+    zsh tmux
+  ];
+
+  config.home-manager.users.${userName} = {
     home.stateVersion = "20.09";
 
     programs.ssh.matchBlocks = {
diff --git a/accounts/root@surtr.nix b/accounts/root@surtr.nix
index 58c4f21d..8f678ac9 100644
--- a/accounts/root@surtr.nix
+++ b/accounts/root@surtr.nix
@@ -1,3 +1,7 @@
-{ userName, ... }: {
-  home-manager.users.${userName}.home.stateVersion = "20.09";
+{ flake, userName, ... }: {
+  imports = with flake.nixosModules.userProfiles.${userName}; [
+    zsh tmux
+  ];
+
+  config.home-manager.users.${userName}.home.stateVersion = "20.09";
 }
diff --git a/accounts/root@vidhar.nix b/accounts/root@vidhar.nix
index e82414a8..0fc56633 100644
--- a/accounts/root@vidhar.nix
+++ b/accounts/root@vidhar.nix
@@ -1,6 +1,11 @@
-{ config, userName, ... }:
+{ flake, config, userName, ... }:
+
 {
-  home-manager.users.${userName} = {
+  imports = with flake.nixosModules.userProfiles.${userName}; [
+    zsh tmux
+  ];
+
+  config.home-manager.users.${userName} = {
     home.stateVersion = "20.09";
 
     programs.ssh.matchBlocks = {