85 files changed, 9525 insertions, 1335 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 7d5a9c25..101330c3 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,48 @@ 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";
+  editor = pkgs.symlinkJoin {
+    name = "${cfg.services.emacs.package.name}-editor";
+    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";
+    nixpkgs.externalConfig.allowUnfreePackages = [
+      "graphite"
+    ];
 
     home-manager.users.${userName} = {
       imports = [
         ./libvirt
-        ./niri
-        flakeInputs.nix-index-database.hmModules.nix-index
-        flakeInputs.impermanence.nixosModules.home-manager.impermanence
+        ./niri.nix
+        ./shell
+        ./synadm
+        flakeInputs.nix-index-database.homeModules.nix-index
       ];
 
       home.stateVersion = "20.09";
 
-      nixpkgs.config = {
-        allowUnfree = true;
-        zathura.useMupdf = false;
-      };
+      # nixpkgs.config = {
+      #   allowUnfree = true;
+      #   zathura.useMupdf = false;
+      # };
 
       nix.registry = {
         "flk" = {
@@ -112,14 +93,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,11 +118,12 @@ 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
+              ProxyCommand ${lib.getExe pkgs.socat} - SOCKS4A:127.0.0.1:%h:%p,socksport=8126
+              # ProxyJump cip04
 
             Match host *.ifi.lmu.de,*.math.lmu.de
               AddressFamily inet
@@ -155,22 +137,32 @@ 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
+            typst-ts-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 = {
@@ -184,23 +176,110 @@ in {
             };
           };
         };
+        chromium.enable = true;
 
-        zathura.enable = true;
+        zathura = {
+          enable = true;
+          options = {
+            scroll-page-aware = true;
+          };
+        };
         imv.enable = true;
 
         mpv.config = {
-          demuxer-max-bytes = 1073741824;
-          demuxer-max-back-bytes = 268435456;
-          gpu-api = "vulkan";
-        };
-
-        zsh.initExtra = ''
-          source ${./zshrc}
+          demuxer-max-bytes = 2147483648;
+          demuxer-max-back-bytes = 536870912;
+          vo = "dmabuf-wayland";
+        };
+
+        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
+                  p7zip
+                ];
+                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}"
+                  "cannot:${lib.getExe' p7zip "7z"}"
+                ];
+                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";
+            self = "nixos";
           };
         in flakeHashes // {
           u2w = "$HOME/projects/uni2work";
@@ -212,6 +291,24 @@ in {
           pro = "$HOME/projects/pro";
           media = "$HOME/media";
         };
+        starship.settings = {
+          directory.substitutions = mapAttrs' (name: value: let
+            value' = builtins.unsafeDiscardStringContext value;
+            value'' = if hasPrefix "$HOME/" value' then "~" + removePrefix "$HOME" value' else value';
+          in nameValuePair value'' "~${name}"
+          ) cfg.programs.zsh.dirHashes;
+        };
+        nix-index.enable = true;
+        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,55 +318,59 @@ in {
         gh = {
           enable = true;
           settings = {
-            editor = "${config.home-manager.users.${userName}.programs.emacs.package}/bin/emacsclient";
+            editor = lib.getExe' editor "emacsclient";
             gitProtocol = "ssh";
           };
         };
 
-        kitty = {
+        alacritty = {
           enable = true;
-          font = {
-            package = pkgs.nerd-fonts.fira-mono;
-            name = "Fira Mono";
-            size = 10;
-          };
+          theme = "kitty";
           settings = {
-            scrollback_pager_history_size = 50;
-            # background_opacity = "0.9";
-            enable_audio_bell = false;
-            update_check_interval = 0;
-            strip_trailing_spaces = "smart";
-            focus_follows_mouse = true;
-            visual_bell_duration = "0.1";
-            visual_bell_color = "#26240d";
-            tab_bar_style = "powerline";
-            tab_powerline_style = "slanted";
-            # notify_on_cmd_finish = "invisible 120";
-          };
-          keybindings = {
-            "kitty_mod+n" = "detach_window";
-            "kitty_mod+m" = "detach_window ask";
-          };
-        };
-        wpaperd = {
-          enable = true;
-          settings.default = {
-            path = "~/.wallpapers";
-            duration = "8h";
-            mode = "center";
+            font = {
+              normal = {
+                family = "Fira Mono";
+                style = "Medium";
+              };
+              size = 10;
+            };
+            hints = {
+              alphabet = "aoeuhtns";
+              enabled = [
+                {
+                  command = lib.getExe' pkgs.xdg-utils "xdg-open";
+                  hyperlinks = true;
+                  post_processing = true;
+                  persist = false;
+                  mouse.enabled = true;
+                  binding = { key = "O"; mods = "Control|Shift"; };
+                  regex = "(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file:|git://|ssh:|ftp://)[^\\u0000-\\u001F\\u007F-\\u009F<>\"\\\\s{-}\\\\^⟨⟩`\\\\\\\\]+";
+                }
+                {
+                  command = lib.getExe' pkgs.wl-clipboard-rs "wl-copy";
+                  hyperlinks = true;
+                  post_processing = true;
+                  persist = false;
+                  mouse.enabled = true;
+                  binding = { key = "Y"; mods = "Control|Shift"; };
+                  regex = "(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file:|git://|ssh:|ftp://)[^\\u0000-\\u001F\\u007F-\\u009F<>\"\\\\s{-}\\\\^⟨⟩`\\\\\\\\]+";
+                }
+              ];
+            };
+            terminal.shell.program = lib.getExe cfg.programs.zsh.package;
           };
         };
         fuzzel = {
           enable = true;
           settings = {
             main = {
-              terminal = lib.getExe cfg.programs.kitty.package;
+              terminal = "${lib.getExe cfg.programs.alacritty.package} msg --socket /run/user/1000/alacritty.sock create-window --command ${lib.getExe' config.systemd.package "systemd-run"} --user --pty --same-dir --wait --collect --quiet --service-type=exec --expand-environment=no {cmd}";
               layer = "overlay";
               icon-theme = "Paper";
               font = "Fira Sans";
             };
             colors = {
-              background = "000000aa";
+              background = "000000cc";
               text = "cdd6f4ff";
               match = "94e2d5ff";
               selection = "585b70ff";
@@ -282,26 +383,46 @@ in {
             };
           };
         };
+        pandoc = {
+          enable = true;
+          extraAbbreviations = ["i.A." "d.h." "D.h." "gdw."];
+        };
+        nushell = {
+          enable = true;
+          settings.show_banner = false;
+        };
+        fd.enable = true;
       };
 
       services = {
+        wpaperd = {
+          enable = false;
+          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;
@@ -313,8 +434,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;
@@ -331,7 +455,7 @@ in {
                 batch = "true";
                 log = "false";
                 repeat = "watch";
-                sshcmd = "${pkgs.openssh}/bin/ssh";
+                sshcmd = lib.getExe' pkgs.openssh "ssh";
                 ui = "text";
               };
             };
@@ -347,35 +471,9 @@ in {
           serverUrl = "https://etesync.yggdrasil.li";
         };
 
-        swayidle = {
-          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; }
-          ];
-          extraArgs = [
-            "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";
-          };
-        };
+
+        gnome-keyring.enable = lib.mkForce false;
       };
 
       home.pointerCursor = {
@@ -406,6 +504,15 @@ in {
           name = "Paper-Mono-Dark";
         };
       };
+      qt.enable = true;
+      qt.platformTheme.name = "gtk";
+
+      qt.kde.settings = {
+        kwalletrc = {
+          KSecretD.Enabled = false;
+          Wallet."Default Wallet" = "store";
+        };
+      };
 
       xsession.preferStatusNotifierItems = true;
 
@@ -415,18 +522,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
-          pynitrokey gtklock wlrctl remmina openscad spice-record
-          libguestfs-with-appliance nerd-fonts.fira-mono
+          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
+          nixos-shell virt-viewer freerdp gnome-icon-theme
+          paper-icon-theme sshpassSecret weechat element-desktop
+          sieve-connect gimp3 inkscape udiskie glab
+          gtklock wlrctl remmina openscad spice-record
+          nerd-fonts.fira-mono
           nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
-        ];
+          swtpm (hunspell.withDicts (dicts: with dicts; [en_GB-large de_DE]))
+          libation libqalculate graphite foliate gnucash
+        ] ++ mapAttrsToList (_name: pkg: pkgs.callPackage pkg { inherit sources flake flakeInputs; }) (customUtils.nixImport { dir = ./utils; });
 
         file = {
           ".backup-munin".source = ./backup-patterns;
@@ -443,15 +551,13 @@ in {
         sessionVariables = {
           # GDK_SCALE = 96.0 / 282.0;
           # QT_AUTO_SCREEN_SCALE_FACTOR = 1;
-          QT_QPA_PLATFORMTHEME = "qt5ct";
+          QT_QPA_PLATFORMTHEME = lib.mkForce "gtk3";
           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_ADJUST_TERMINAL_TITLE = "false";
+          SYSTEMD_TINT_BACKGROUND = "false";
         };
 
         extraProfileCommands = ''
@@ -464,7 +570,7 @@ in {
           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" = {
@@ -488,37 +594,32 @@ 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
+        '';
       };
 
       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.freedesktop.secrets.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.freedesktop.secrets.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;
@@ -604,19 +705,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 cfg.programs.chromium.package} \
               --class=Rainbow \
-              --kiosk "https://web.openrainbow.com" \
-              --user-data-dir=''${HOME}/.config/google-chrome-rainbow
+              --app="https://web.openrainbow.com" \
+              --user-data-dir=''${HOME}/.config/chromium-rainbow
           '');
           icon = pkgs.fetchurl {
             url = "https://web.openrainbow.com/rb/2.139.17/assets/skins/rainbow/images/homepage/logo__rainbow.svg";
             hash = "sha256-5fmo8rDqVDpzkGaPjk4Y+SsSZpAsY7VUQSFW6WdHwuU=";
           };
+          settings = {
+            StartupWMClass = "Rainbow";
+          };
+        };
+        kimai = {
+          name = "Kimai";
+          exec = toString (pkgs.writeShellScript "kimai" ''
+            exec -- \
+              ${lib.getExe cfg.programs.chromium.package} \
+              --class=Kimai \
+              --app="https://kimai.yggdrasil.li" \
+              --user-data-dir=''${HOME}/.config/chromium-kimai
+          '');
+          icon = pkgs.fetchurl {
+            url = "https://www.kimai.org/images/kimai_logo.png";
+            hash = "sha256-lnlOttzR2SwXA70R+egJUkeKr4U5V0avqTk8uX4bqfs=";
+          };
+          settings = {
+            StartupWMClass = "Kimai";
+            StartupNotify = "true";
+          };
+        };
+        audiobookshelf = {
+          name = "Audiobookshelf";
+          exec = toString (pkgs.writeShellScript "audiobookshelf" ''
+            exec -- \
+              ${lib.getExe cfg.programs.chromium.package} \
+              --class=Audiobookshelf \
+              --app="https://audiobookshelf.yggdrasil.li" \
+              --user-data-dir=''${HOME}/.config/chromium-audiobookshelf
+          '');
+          icon = pkgs.fetchurl {
+            url = "https://www.audiobookshelf.org/Logo.png";
+            hash = "sha256-JGPk+WNT1C4DC4lSMb0K0YmAMT5LvmSOeO0QRzkc7Lk=";
+          };
+          settings = {
+            StartupWMClass = "Audiobookshelf";
+            StartupNotify = "true";
+          };
+        };
+        thunderbird-lmu = {
+          name = "Thunderbird (LMU)";
+          exec = "thunderbird --name thunderbird -P lmu %U";
+          icon = "thunderbird";
+          genericName = "Email Client";
+          categories = [ "Network" "Chat" "Email" "Feed" "GTK" "News" ];
+          settings = {
+            StartupWMClass = "thunderbird";
+            StartupNotify = "true";
+          };
         };
       };
 
@@ -632,6 +782,48 @@ in {
           color-scheme = "prefer-dark";
         };
       };
+
+      i18n.inputMethod = {
+        enable = true;
+        type = "fcitx5";
+        fcitx5 = {
+          waylandFrontend = true;
+          settings = {
+            globalOptions."Behavior/DisabledAddons" = {
+              "0" = "clipboard";
+            };
+            inputMethod = {
+              "Groups/0" = {
+                Name = "Default";
+                "Default Layout" = "us";
+                DefaultIM = "keyboard-us";
+              };
+              "Groups/0/Items/0" = {
+                Name = "keyboard-us";
+                Layout = "";
+              };
+              "GroupOrder"."0" = "Default";
+            };
+            addons = {
+              classicui.globalSection = {
+                "Vertical Candidate List" = "True";
+                Font = "Fira Sans 10";
+                MenuFont = "Fira Sans 10";
+                TrayFont = "Fira Sans Demi-Bold 10";
+                UseDarkTheme = "True";
+              };
+              quickphrase = {
+                globalSection = {
+                  "Choose Modifier" = "None";
+                  Spell = "True";
+                  FallbackSpellLanguage = "en";
+                };
+                sections.TriggerKey."0" = "Super+E";
+              };
+            };
+          };
+        };
+      };
     };
   };
 }
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index 183cb322..8ed3368a 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,8 @@ 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@")
+
+(define-key typst-ts-mode-map (kbd "C-<left>") nil)
+(define-key typst-ts-mode-map (kbd "C-<right>") nil)
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..86df9678 100644
--- a/accounts/gkleen@sif/libvirt/default.nix
+++ b/accounts/gkleen@sif/libvirt/default.nix
@@ -3,23 +3,31 @@
 with lib;
 with flakeInputs.nixVirt.lib;
 
-{
+let
+  libosinfo = id: with xml;
+    elem "libosinfo:libosinfo" [ (attr "xmlns:libosinfo" "http://libosinfo.org/xmlns/libvirt/domain/1.0") ]
+      [
+        (elem "libosinfo:os" [ (attr "id" id) ] [])
+      ];
+in {
   config = {
     virtualisation.libvirt = {
       enable = true;
+      swtpm.enable = true;
       connections."qemu:///session" = {
         domains = [
-          { definition = domain.writeXML (updateManyAttrsByPath [
-            ] (recursiveUpdate (domain.templates.windows {
+          { definition = domain.writeXML (recursiveUpdate (domain.templates.windows {
               name = "lmmirzm-vmrz01";
               uuid = "9e1dab2e-7986-4cb3-88af-6fad8969e15f";
               memory = { count = 16; unit = "GiB"; };
               storage_vol = "/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2";
               nvram_path = "/home/gkleen/.local/share/libvirt/lmmirzm-vmrz01.nvram";
-              virtio_drive = true;
               virtio_video = true;
               install_virtio = false;
             }) {
+              metadata = [
+                (libosinfo "http://microsoft.com/win/11")
+              ];
               qemu-commandline.env = [
                 { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
               ];
@@ -38,7 +46,6 @@ with flakeInputs.nixVirt.lib;
               devices.video.model.acceleration.accel3d = false;
               devices.interface = {
                 model.type = "virtio";
-                # model.type = "e1000e";
                 type = "bridge";
                 mac.address = "52:54:00:b9:f3:ed";
                 source.bridge = "rz-0971";
@@ -59,7 +66,7 @@ with flakeInputs.nixVirt.lib;
                 }
               ];
               devices.tpm.model = "tpm-tis";
-            }));
+            });
           }
           { definition = domain.writeXML (recursiveUpdate (domain.templates.linux {
               name = "vmrz02";
@@ -73,6 +80,7 @@ with flakeInputs.nixVirt.lib;
                   {
                     readonly = true;
                     type = "pflash";
+                    secure = false;
                     path = "${pkgs.OVMFFull.fd}/FV/OVMF_CODE.ms.fd";
                   };
                 nvram =
@@ -82,6 +90,9 @@ with flakeInputs.nixVirt.lib;
                   };
                 bootmenu.enable = true;
               };
+              metadata = [
+                (libosinfo "http://ubuntu.com/ubuntu/20.04")
+              ];
               qemu-commandline.env = [
                 { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
               ];
@@ -136,6 +147,86 @@ with flakeInputs.nixVirt.lib;
               };
             });
           }
+          { definition = domain.writeXML (recursiveUpdate (domain.templates.linux {
+              name = "vmrz03";
+              uuid = "1250a47c-3199-478d-8cf3-ea4a64c0567a";
+              memory = { count = 8; unit = "GiB"; };
+              storage_vol = "/home/gkleen/.local/share/libvirt/images/vmrz03.qcow2";
+              virtio_video = true;
+            }) {
+              os = {
+                loader =
+                  {
+                    readonly = true;
+                    type = "pflash";
+                    secure = false;
+                    path = "${pkgs.OVMFFull.fd}/FV/OVMF_CODE.ms.fd";
+                  };
+                nvram =
+                  {
+                    template = "${pkgs.OVMFFull.fd}/FV/OVMF_VARS.ms.fd";
+                    path = "/home/gkleen/.local/share/libvirt/vmrz03.nvram";
+                  };
+                bootmenu.enable = true;
+              };
+              metadata = [
+                (libosinfo "http://ubuntu.com/ubuntu/24.04")
+              ];
+              qemu-commandline.env = [
+                { name = "SPICE_DEBUG_ALLOW_MC"; value = "1"; }
+              ];
+              vcpu.count = 4;
+              cpu = {
+                mode = "host-model";
+                feature = [
+                  { name = "vmx"; policy = "require"; }
+                ];
+              };
+              devices.graphics = {
+                listen.type = "address";
+                gl.enable = false;
+              };
+              devices.video.model.acceleration.accel3d = false;
+              devices.interface = [
+                {
+                  model.type = "virtio";
+                  type = "bridge";
+                  mac.address = "52:54:00:a1:f7:8a";
+                  source.bridge = "rz-0971";
+                }
+                {
+                  model.type = "virtio";
+                  type = "bridge";
+                  mac.address = "52:54:00:8d:d3:0b";
+                  source.bridge = "rz-2403";
+                  link.state = "down";
+                }
+              ];
+              devices.channel = [
+                {
+                  type = "unix";
+                  target = { type = "virtio"; name = "org.qemu.guest_agent.0"; };
+                }
+                {
+                  type = "spicevmc";
+                  target = { type = "virtio"; name = "com.redhat.spice.0"; };
+                }
+                {
+                  type = "spiceport";
+                  target = { type = "virtio"; name = "org.spice-space.webdav.0"; };
+                  source.channel = "org.spice-space.webdav.0";
+                }
+              ];
+              devices.tpm = {
+                model = "tpm-tis";
+                backend =
+                  {
+                    type = "emulator";
+                    version = "2.0";
+                  };
+              };
+            });
+          }
         ];
         pools = [
           { definition = pool.writeXML {
@@ -151,7 +242,8 @@ with flakeInputs.nixVirt.lib;
               { definition = volume.writeXML {
                   type = "file";
                   name = "lmmirzm-vmrz01.qcow2";
-                  capacity = { count = 40; unit = "GB"; };
+                  allocation = { count = 0; };
+                  capacity = { count = 256; unit = "GB"; };
                   target = {
                     path = "/home/gkleen/.local/share/libvirt/images/lmmirzm-vmrz01.qcow2";
                     format.type = "qcow2";
@@ -162,6 +254,7 @@ with flakeInputs.nixVirt.lib;
               { definition = volume.writeXML {
                   type = "file";
                   name = "vmrz02.qcow2";
+                  allocation = { count = 0; };
                   capacity = { count = 256; unit = "GB"; };
                   target = {
                     path = "/home/gkleen/.local/share/libvirt/images/vmrz02.qcow2";
@@ -170,6 +263,18 @@ with flakeInputs.nixVirt.lib;
                   };
                 };
               }
+              { definition = volume.writeXML {
+                  type = "file";
+                  name = "vmrz03.qcow2";
+                  allocation = { count = 0; };
+                  capacity = { count = 256; unit = "GB"; };
+                  target = {
+                    path = "/home/gkleen/.local/share/libvirt/images/vmrz03.qcow2";
+                    format.type = "qcow2";
+                    features.lazy_refcounts = {};
+                  };
+                };
+              }
             ];
           }
         ];
diff --git a/accounts/gkleen@sif/niri.nix b/accounts/gkleen@sif/niri.nix
new file mode 100644
index 00000000..b30c5701
--- /dev/null
+++ b/accounts/gkleen@sif/niri.nix
@@ -0,0 +1,1005 @@
+{ config, hostConfig, pkgs, lib, utils, flakeInputs, ... }:
+let
+  cfg = config.programs.niri;
+
+  kdl = flakeInputs.niri-flake.lib.kdl;
+  sleaf = name: arg: kdl.node name [arg] [];
+
+  niri = cfg.package;
+  spawnTerminal = { command ? lib.getExe config.programs.zsh.package, extraArgs ? [] }:
+    [(lib.getExe config.programs.alacritty.package) "msg" "--socket" "/run/user/1000/alacritty.sock" "create-window"] ++ lib.toList extraArgs ++ ["--command" (lib.getExe' hostConfig.systemd.package "systemd-run") "--user" "--pty" "--same-dir" "--wait" "--collect" "--quiet" "--service-type=exec" "--expand-environment=no"] ++ lib.mapAttrsToList (k: v: "--property=Environment=${utils.escapeSystemdExecArg "${k}=${if v == null then "" else v}"}") execEnvironment ++ lib.toList command;
+
+  execEnvironment = {
+    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;
+    GTK_IM_MODULE = null;
+    QT_IM_MODULE = null;
+    QT_IM_MODULES = null;
+  };
+
+  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 {
+  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 = {
+    home.packages = [ pkgs.xwayland-satellite-unstable ];
+
+    systemd.user.sockets.niri-workspace-history = {
+      Socket = {
+        ListenStream = "%t/niri-workspace-history.sock";
+        SocketMode = "0600";
+      };
+    };
+    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
+
+
+          @contextmanager
+          def detaching(thing):
+              try:
+                  yield thing
+              finally:
+                  thing.detach()
+
+
+          workspace_history = defaultdict(list)
+          history_lock = Lock()
+
+
+          def monitor_niri():
+              workspaces = list()
+
+              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)
+
+              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
+
+
+          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)
+
+
+          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)
+
+
+          def run_server():
+              with Server() as server:
+                  server.serve_forever()
+
+
+          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; [
+          (sleaf "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 = "Alacritty-scratch";
+        spawn = spawnTerminal { extraArgs = ["--class" "Alacritty-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; [
+          (sleaf "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));
+        normalize-nodes = nodes: lib.remove null (lib.flatten nodes);
+      in
+        normalize-nodes [
+          (flag "prefer-no-csd")
+
+          (sleaf "screenshot-path" "~/screenshots/%Y-%m-%dT%H:%M:%S.png")
+
+          (plain "hotkey-overlay" [
+            (flag "skip-at-startup")
+          ])
+
+          (plain "input" [
+            (plain "keyboard" [
+              (sleaf "repeat-delay" 300)
+              (sleaf "repeat-rate" 50)
+
+              (plain "xkb" [
+                (sleaf "layout" "us,us")
+                (sleaf "variant" "dvp,")
+                (sleaf "options" "compose:caps,grp:win_space_toggle")
+              ])
+            ])
+
+            (flag "workspace-auto-back-and-forth")
+            # (sleaf "focus-follows-mouse" {})
+            # (flag "warp-mouse-to-focus")
+
+            # (plain "touchpad" [ (flag "off") ])
+            (plain "trackball" [
+              (sleaf "scroll-method" "on-button-down")
+              (sleaf "scroll-button" 278)
+            ])
+            (plain "touch" [
+              (sleaf "map-to-output" "eDP-1")
+            ])
+            (plain "tablet" [
+              (sleaf "map-to-output" "eDP-1")
+            ])
+          ])
+
+          (plain "gestures" [
+            (plain "hot-corners" [(flag "off")])
+          ])
+
+          (plain "environment" (lib.mapAttrsToList sleaf execEnvironment))
+
+          (node "output" ["eDP-1"] [
+            (sleaf "scale" 1.5)
+            (sleaf "position" { x = 0; y = 0; })
+          ])
+          (node "output" ["Ancor Communications Inc ASUS PB287Q 0x0000DD9B"] [
+            (sleaf "scale" 1.5)
+            (sleaf "position" { x = 2560; y = 0; })
+          ])
+          (node "output" ["HP Inc. HP 727pu CN4417143K"] [
+            (sleaf "mode" "2560x1440@119.998")
+            (sleaf "scale" 1)
+            (sleaf "position" { x = 2560; y = 0; })
+            (flag "variable-refresh-rate")
+          ])
+
+          (plain "debug" [
+            (sleaf "render-drm-device" "/dev/dri/by-path/pci-0000:00:02.0-render")
+          ])
+
+          (plain "animations" [
+            (sleaf "slowdown" 0.5)
+            (plain "workspace-switch" [(flag "off")])
+          ])
+
+          (plain "layout" [
+            (sleaf "gaps" 8)
+            (plain "struts" [
+              (sleaf "left" 26)
+              (sleaf "right" 26)
+              (sleaf "top" 0)
+              (sleaf "bottom" 0)
+            ])
+            (plain "border" [
+              (sleaf "width" 2)
+              (sleaf "active-gradient" {
+                from = "hsla(195 100% 45% 1)";
+                to = "hsla(155 100% 37.5% 1)";
+                angle = 29;
+                relative-to = "workspace-view";
+              })
+              (sleaf "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: sleaf "proportion" prop) [
+              (1. / 4.) (1. / 3.) (1. / 2.) (2. / 3.) (3. / 4.) (1.)
+            ]))
+            (plain "default-column-width" [ (sleaf "proportion" (1. / 2.)) ])
+            (plain "preset-window-heights" (map (prop: sleaf "proportion" prop) [
+              (1. / 3.) (1. / 2.) (2. / 3.) (1.)
+            ]))
+
+            (flag "always-center-single-column")
+
+            (plain "tab-indicator" [
+              (sleaf "gap" 4)
+              (sleaf "width" 8)
+              (sleaf "gaps-between-tabs" 4)
+              (flag "place-within-column")
+              (sleaf "length" { total-proportion = 1.; })
+              (sleaf "active-gradient" {
+                from = "hsla(195 100% 60% 0.75)";
+                to = "hsla(155 100% 50% 0.75)";
+                angle = 29;
+                relative-to = "workspace-view";
+              })
+              (sleaf "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] [
+              (sleaf "open-on-output" "eDP-1")
+            ])
+          ) (map ({name, ...}: name) cfg.scratchspaces))
+          (map (name:
+            (sleaf "workspace" name)
+          ) ["comm" "web" "vid" "bmr"])
+
+          (plain "window-rule" [
+            (sleaf "clip-to-geometry" true)
+          ])
+
+          (plain "window-rule" [
+            (sleaf "match" { is-floating = true; })
+            (sleaf "geometry-corner-radius" 8)
+            (plain "shadow" [ (flag "on") ])
+          ])
+
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^org\\.keepassxc\\.KeePassXC$"; })
+            (sleaf "block-out-from" "screencast")
+          ])
+          (plain "window-rule" (normalize-nodes [
+            (map (title:
+              (sleaf "match" { app-id = "^org\\.keepassxc\\.KeePassXC$"; inherit title; })
+            ) ["^Unlock Database.*" "^Access Request.*" ".*Passkey credentials$" "Browser Access Request$"])
+            (sleaf "open-focused" true)
+            (sleaf "open-floating" true)
+          ]))
+
+          (map ({ name, match, exclude, windowRuleExtra, ... }:
+            (optional-node (match != []) (plain "window-rule" (normalize-nodes [
+              (map (sleaf "match") match)
+              (map (sleaf "exclude") exclude)
+              (sleaf "open-on-workspace" name)
+              (sleaf "open-maximized" true)
+              windowRuleExtra
+            ])))
+          ) cfg.scratchspaces)
+
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^emacs$"; })
+            (sleaf "match" { app-id = "^firefox$"; })
+            (sleaf "match" { app-id = "^gnucash$"; })
+            (sleaf "exclude" { app-id = "^gnucash$"; title = "^(Securities|Price Database)$"; })
+            (plain "default-column-width" [(sleaf "proportion" (2. / 3.))])
+          ])
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^Alacritty$"; })
+            (sleaf "match" { app-id = "^Alacritty-play$"; })
+            (plain "default-column-width" [(sleaf "proportion" (1. / 3.))])
+          ])
+
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^thunderbird$"; })
+            (sleaf "match" { app-id = "^Element$"; })
+            (sleaf "match" { app-id = "^chrome-web\.openrainbow\.com__-Default$"; })
+            (sleaf "open-on-workspace" "comm")
+          ])
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^firefox$"; })
+            (sleaf "open-on-workspace" "web")
+            (sleaf "open-maximized" true)
+          ])
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^mpv$"; })
+            (sleaf "open-on-workspace" "vid")
+            (plain "default-column-width" [(sleaf "proportion" 1.)])
+          ])
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^Alacritty-play$"; })
+            (sleaf "open-on-workspace" "vid")
+            (sleaf "open-focused" false)
+          ])
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^chrome-audiobookshelf\.yggdrasil\.li__-Default$"; })
+            (sleaf "match" { app-id = "^YouTube Music Desktop App$"; })
+            (sleaf "open-on-workspace" "vid")
+          ])
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^pdfpc$"; })
+            (plain "default-column-width" [(sleaf "proportion" 1.)])
+          ])
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^pdfpc$"; title = "^.*presentation.*$"; })
+            (plain "default-column-width" [(sleaf "proportion" 1.)])
+            (sleaf "open-fullscreen" true)
+            (sleaf "open-on-workspace" "bmr")
+            (sleaf "open-focused" false)
+          ])
+          (plain "window-rule" (normalize-nodes [
+            (map (sleaf "match") [
+              { app-id = "^Gimp-"; title = "^Quit GIMP$"; }
+              { app-id = "^org\\.kde\\.polkit-kde-authentication-agent-1$"; }
+              { app-id = "^xdg-desktop-portal-gtk$"; }
+            ])
+            (sleaf "open-floating" true)
+          ]))
+          (plain "window-rule" [
+            (sleaf "match" { app-id = "^org\\.pwmt\\.zathura$"; })
+            (sleaf "match" { app-id = "^evince$"; })
+            (sleaf "match" { app-id = "^org\\.gnome\\.Papers$"; })
+            (sleaf "default-column-display" "tabbed")
+          ])
+          (plain "window-rule" [
+            (sleaf "match" { is-window-cast-target = true; })
+            (plain "border" [
+              (sleaf "width" 2)
+              (sleaf "active-gradient" {
+                from = "hsla(20 100% 45% 1)";
+                to = "hsla(340 100% 37.5% 1)";
+                angle = 29;
+                relative-to = "workspace-view";
+              })
+              (sleaf "inactive-gradient" {
+                from = "hsla(20 50% 27.7% 1)";
+                to = "hsla(340 50% 23% 1)";
+                angle = 29;
+                relative-to = "workspace-view";
+              })
+            ])
+          ])
+
+          (plain "layer-rule" [
+            (sleaf "match" { namespace = "^notifications$"; })
+            (sleaf "match" { namespace = "^bar$"; })
+            (sleaf "match" { namespace = "^launcher$"; })
+            (sleaf "block-out-from" "screencast")
+          ])
+
+          (plain "recent-windows" [
+            (flag "off")
+          ])
+
+          (plain "binds"
+            (let
+              bind = name: cfg: node name [(lib.removeAttrs cfg ["action"])] (lib.mapAttrsToList leaf (lib.removeAttrs cfg.action ["__functor"]));
+
+              move-column-to-workspace = kdl.magic-leaf "move-column-to-workspace";
+              screenshot = kdl.magic-leaf "screenshot";
+              screenshot-window = kdl.magic-leaf "screenshot-window";
+              screenshot-screen = kdl.magic-leaf "screenshot-screen";
+            in
+              normalize-nodes [
+                (lib.mapAttrsToList bind (with config.lib.niri.actions; {
+                  "Mod+Slash".action = show-hotkey-overlay;
+
+                  "Mod+Return".action = spawn (spawnTerminal {});
+                  "Mod+Shift+Return".action = spawn (spawnTerminal {
+                    command = lib.getExe config.programs.nushell.package;
+                  });
+                  "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 ];
+                    text = ''
+                      exec -- ${lib.concatStringsSep " " (spawnTerminal {
+                        extraArgs = [ "--class" "Alacritty-play" "--working-directory" "\"$HOME\"/media" ];
+                        command = ["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 = spawn (spawnTerminal {
+                    command = lib.getExe pkgs.libqalculate;
+                  });
+                  # "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 = 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 = move-column-to-workspace "comm";
+
+                  "Mod+ParenRight".action = focus-workspace "web";
+                  "Mod+Shift+ParenRight".action = move-column-to-workspace "web";
+
+                  "Mod+BraceRight".action = focus-workspace "read";
+                  "Mod+Shift+BraceRight".action = move-column-to-workspace "read";
+
+                  "Mod+BraceLeft".action = focus-workspace "mon";
+                  "Mod+Shift+BraceLeft".action = move-column-to-workspace "mon";
+
+                  "Mod+Asterisk".action = focus-workspace "vid";
+                  "Mod+Shift+Asterisk".action = 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+L".action = maximize-window-to-edges;
+                  "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 = power-off-monitors;
+                    allow-when-locked = true;
+                  };
+                  "Mod+Shift+E".action = quit;
+
+                  # "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 (toString (pkgs.resholve.writeScript "worktime-ui" {
+                    interpreter = pkgs.runtimeShell;
+                    inputs = [ pkgs.worktime config.programs.quickshell.package ];
+                    execer = [
+                      "cannot:${lib.getExe' config.programs.quickshell.package "qs"}"
+                    ];
+                  } ''
+                    worktime-ui && qs ipc call Worktime refresh
+                  ''));
+                  "Mod+Shift+K".action = spawn (lib.getExe' pkgs.worktime "worktime-stop");
+                }))
+                (lib.mapAttrsToList (name: cfg: node name [(lib.removeAttrs cfg ["action"])] [cfg.action]) (let
+                  shell = obj: leaf "send-unix" [
+                    { path = ''''${XDG_RUNTIME_DIR}/shell.sock''; }
+                    (builtins.toJSON obj + "\n")
+                  ];
+                in {
+                  "XF86AudioRaiseVolume" = {
+                    allow-when-locked = true;
+                    action = shell { Volume.volume = "up"; };
+                  };
+                  "XF86AudioLowerVolume" = {
+                    allow-when-locked = true;
+                    action = shell { Volume.volume = "down"; };
+                  };
+                  "XF86AudioMute" = {
+                    allow-when-locked = true;
+                    action = shell { Volume.muted = "toggle"; };
+                  };
+                  "XF86AudioMicMute" = {
+                    allow-when-locked = true;
+                    action = shell { Volume."mic-muted" = "toggle"; };
+                  };
+                  "XF86MonBrightnessUp" = {
+                    action = shell { Brightness = "up"; };
+                    allow-when-locked = true;
+                  };
+                  "XF86MonBrightnessDown" = {
+                    action = shell { Brightness = "down"; };
+                    allow-when-locked = true;
+                  };
+                  "Mod+Shift+L".action = shell { LockSession = {}; };
+                  "Mod+Shift+Minus" = {
+                    action = shell { Suspend = {}; };
+                    allow-when-locked = true;
+                  };
+                  "Mod+Shift+Control+Minus" = {
+                    action = shell { Hibernate = {}; };
+                    allow-when-locked = true;
+                  };
+                  "Mod+Shift+P" = {
+                    action = shell { Mpris = { PauseAll = {}; }; };
+                    allow-when-locked = true;
+                  };
+                  "Mod+Semicolon".action = shell { Notifications = { DismissGroup = {}; }; };
+                  "Mod+Shift+Semicolon".action = shell { Notifications = { DismissAll = {}; }; };
+                  "Mod+Print".action = shell { ScreenRecord = { Toggle = {}; }; };
+                }))
+                (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 = move-column-to-workspace name; } else null) cfg.scratchspaces)
+              ]
+            ))
+        ];
+  };
+}
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
deleted file mode 100644
index 0c4a58e5..00000000
--- a/accounts/gkleen@sif/niri/default.nix
+++ /dev/null
@@ -1,536 +0,0 @@
-{ config, hostConfig, pkgs, lib, ... }:
-let
-  niri = config.programs.niri.package;
-  terminal = lib.getExe config.programs.kitty.package;
-  lightctl = lib.getExe' config.services.avizo.package "lightctl";
-  volumectl = lib.getExe' config.services.avizo.package "volumectl";
-  makoctl = lib.getExe' config.services.mako.package "makoctl";
-  loginctl = lib.getExe' hostConfig.systemd.package "loginctl";
-  systemctl = lib.getExe' hostConfig.systemd.package "systemctl";
-
-  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 --output "$active_output" "$workspace_name"
-        socat STDIO "$NIRI_SOCKET" <<<'{"Action":{"FocusWorkspace":{"reference":{"Id":'"''${active_workspace}"'}}}}'
-        niri msg action move-workspace-to-index --index 1 "$workspace_name"
-      fi
-
-      while IFS=$'\n' read -r window_json; do
-        if [[ -n $(jq -c "$window_select" <<<"$window_json") ]]; then
-          niri msg action focus-window --id "$(jq -r '.id' <<<"$window_json")"
-          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);
-  focus-or-spawn-action-app_id = app_id: focus-or-spawn-action ''select(.app_id == "${app_id}")'';
-
-  with_adjacent_workspace = pkgs.writeShellApplication {
-    name = "with-adjacent-workspace";
-    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) "^pwctl|kpxc|bmgr|edit|term$";
-  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}}}}'';
-
-  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")"
-
-      workspace_json="$(jq -c --arg active_output "$active_output" 'map(select(.output == $active_output and .name == null)) | sort_by(.idx) | .[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_select_window = pkgs.writeShellApplication {
-    name = "with-unnamed-workspace";
-    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="$(gojq -r --arg active_workspace "$active_workspace" '.[] | select('"$window_select"') | "\(.title)\t\(.id)"' <<<"$windows_json" | fuzzel --log-level=warning --dmenu)"
-      window_id="$(awk -F $'\t' '{print $2}' <<<"$window")"
-      window_json="$(jq -r --arg window_id "$window_id" '.[] | select(.id == ($window_id | 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);
-in {
-  imports = [
-    ./waybar.nix
-    ./mako.nix
-  ];
-
-  config = {
-    systemd.user.services.xwayland-satellite = {
-      Unit = {
-        BindsTo = [ "graphical-session.target" ];
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session.target" ];
-        Requisite = [ "graphical-session.target" ];
-      };
-      Service = {
-        Type = "notify";
-        NotifyAccess = "all";
-        Environment = [ "DISPLAY=:0" ];
-        ExecStart = ''${lib.getExe pkgs.xwayland-satellite-unstable} ''${DISPLAY}'';
-        ExecStartPre = "${systemctl} --user import-environment DISPLAY";
-        StandardOutput = "journal";
-      };
-      Install = {
-        WantedBy = [ "graphical-session.target" ];
-      };
-    };
-
-    services.swayidle = {
-      events = [
-        { event = "after-resume"; command = "${lib.getExe niri} msg action power-on-monitors"; }
-      ];
-      timeouts = [
-        { timeout = 300;
-          command = "${lib.getExe niri} msg action power-off-monitors";
-        }
-      ];
-    };
-
-    programs.niri.settings = {
-      prefer-no-csd = true;
-      screenshot-path = "${config.home.homeDirectory}/screenshots";
-
-      hotkey-overlay.skip-at-startup = true;
-
-      input = {
-        keyboard.xkb = {
-          layout = "us,us";
-          variant = "dvp,";
-          options = "compose:caps,grp:win_space_toggle";
-        };
-
-        workspace-auto-back-and-forth = true;
-        # focus-follows-mouse.enable = true;
-        warp-mouse-to-focus = true;
-      };
-
-      outputs = {
-        "eDP-1" = {
-          scale = 1.5;
-          position = { x = 0; y = 0; };
-        };
-        "Ancor Communications Inc ASUS PB287Q 0x0000DD9B" = {
-          scale = 1.5;
-          position = { x = 2560; y = 0; };
-        };
-      };
-
-      environment = {
-        NIXOS_OZONE_WL = "1";
-        QT_QPA_PLATFORM = "wayland";
-        GDK_BACKEND = "wayland";
-        SDL_VIDEODRIVER = "wayland";
-      };
-
-      layout = {
-        gaps = 8;
-        struts = { left = 0; right = 0; top = 0; bottom = 0; };
-        focus-ring = {
-          width = 2;
-          active.gradient = {
-            from = "hsla(195 100% 60% 0.75)";
-            to = "hsla(155 100% 50% 0.75)";
-            angle = 29;
-            relative-to = "workspace-view";
-          };
-          inactive.gradient = {
-            from = "hsla(0 0% 42% 0.66)";
-            to = "hsla(0 0% 35% 0.66)";
-            angle = 29;
-            relative-to = "workspace-view";
-          };
-        };
-
-        preset-column-widths = [
-          { proportion = 1. / 4.; }
-          { proportion = 1. / 3.; }
-          { proportion = 1. / 2.; }
-          { proportion = 2. / 3.; }
-          { proportion = 3. / 4.; }
-        ];
-        default-column-width.proportion = 1. / 2.;
-        preset-window-heights = [
-          { proportion = 1. / 3.; }
-          { proportion = 1. / 2.; }
-          { proportion = 2. / 3.; }
-          { proportion = 1.; }
-        ];
-
-        always-center-single-column = true;
-      };
-
-      cursor.hide-when-typing = true;
-
-      workspaces = {
-        "001" = { name = "pwctl"; open-on-output = "eDP-1"; };
-        "002" = { name = "kpxc"; open-on-output = "eDP-1"; };
-        "003" = { name = "bmgr"; open-on-output = "eDP-1"; };
-        "004" = { name = "term"; open-on-output = "eDP-1"; };
-        "005" = { name = "edit"; open-on-output = "eDP-1"; };
-        "101".name = "comm";
-        "102".name = "web";
-        # "104".name = "read";
-        # "105".name = "mon";
-        "110".name = "vid";
-      };
-
-      window-rules = [
-        # {
-        #   geometry-corner-radius =
-        #     let
-        #       allCorners = r: { bottom-left = r; bottom-right = r; top-left = r; top-right = r; };
-        #     in allCorners 4.;
-        #   clip-to-geometry = true;
-        # }
-        {
-          matches = [ { app-id = "^com\.saivert\.pwvucontrol$"; } ];
-          open-on-workspace = "pwctl";
-        }
-        {
-          matches = [ { app-id = "^\.blueman-manager-wrapped$"; } ];
-          open-on-workspace = "bmgr";
-        }
-        {
-          matches = [ { app-id = "^org\.keepassxc\.KeePassXC$"; } ];
-          excludes = [
-            { title = "^Unlock Database.*"; }
-            { title = "^Access Request.*"; }
-            { title = ".*Passkey credentials$"; }
-          ];
-          open-on-workspace = "kpxc";
-          open-focused = false;
-        }
-        {
-          matches = [
-            { app-id = "^org\.keepassxc\.KeePassXC$";  title = "^Unlock Database.*"; }
-            { app-id = "^org\.keepassxc\.KeePassXC$";  title = "^Access Request.*"; }
-            { app-id = "^org\.keepassxc\.KeePassXC$";  title = ".*Passkey credentials$"; }
-          ];
-          open-focused = true;
-        }
-        {
-          matches = [ { app-id = "^kitty-scratch$"; } ];
-          open-on-workspace = "term";
-        }
-        {
-          matches = [ { title = "^scratch$"; app-id = "^emacs$"; } ];
-          open-on-workspace = "edit";
-        }
-        {
-          matches = [
-            { app-id = "^thunderbird$"; }
-            { app-id = "^Element$"; }
-          ];
-          open-on-workspace = "comm";
-        }
-        {
-          matches = [ { app-id = "^firefox$"; } ];
-          open-on-workspace = "web";
-        }
-        # {
-        #   matches = [
-        #     { app-id = "^evince$"; }
-        #     { app-id = "^imv$"; }
-        #     { app-id = "^org\.pwmt\.zathura$"; }
-        #   ];
-        #   open-on-workspace = "read";
-        # }
-        {
-          matches = [ { app-id = "^mpv$"; } ];
-          open-on-workspace = "vid";
-          default-column-width.proportion = 1.;
-        }
-        {
-          matches = [ { app-id = "^kitty-play$"; } ];
-          open-on-workspace = "vid";
-          default-column-width.proportion = 1. / 3.;
-          open-focused = false;
-        }
-        # {
-        #   matches = [
-        #     { app-id = "^qemu$"; }
-        #     { app-id = "^virt-manager$"; }
-        #   ];
-        #   open-on-workspace = "mon";
-        # }
-      ];
-
-      binds = with config.lib.niri.actions; {
-        "Mod+Slash".action = show-hotkey-overlay;
-
-        "Mod+Return".action = spawn terminal;
-        "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+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> ") || exit $?
-            if [[ "$FUZZEL_RES" =~ .*\ =\ .* ]]; then
-              QALC_RES="$FUZZEL_RES"
-              QALC_RET=0
-            else
-              QALC_RES=$(qalc "$FUZZEL_RES" 2>&1)
-              QALC_RET=$?
-            fi
-            [[ -n "$QALC_RES" ]] || exit 1
-            EXISTING=false
-            set +e
-            grep -Fxrl "$QALC_RES" "$RESULTS_DIR" | xargs -r touch
-            [[ ''${PIPESTATUS[0]} -eq 0 ]] && EXISTING=true
-            set -e
-            if [[ $QALC_RET -eq 0 ]] && ! $EXISTING; then
-              RES_FILE="$RESULTS_DIR"/$(date -uIs).$(tr -Cd 'a-zA-Z0-9' </dev/random | head -c 10)
-              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+E".action = spawn (lib.getExe (pkgs.writeShellApplication {
-          name = "emoji-fuzzel";
-          runtimeInputs = with pkgs; [ config.programs.fuzzel.package wtype wl-clipboard-rs ];
-          text = ''
-            FUZZEL_RES=$(fuzzel --dmenu --prompt "emoji> " <"$HOME"/.local/share/emoji-data/list.txt) || exit $?
-            [[ -n "$FUZZEL_RES" ]] || exit 1
-            wl-copy "$(cut -d ':' -f 1 <<<"$FUZZEL_RES" | tr -d '\n')" && wtype -k XF86Paste
-          '';
-        }));
-        "Print".action = spawn (lib.getExe (pkgs.writeShellApplication {
-          name = "screenshot";
-          runtimeInputs = with pkgs; [ grim slurp wl-clipboard-rs coreutils ];
-          text = ''
-            grim -g "$(slurp -b 00000080 -c FFFFFFFF -s 00000000 -w 1)" - \
-              | tee "$HOME/screenshots/$(date +"%Y-%m-%dT%H:%M:%S").png" \
-              | wl-copy --type image/png
-          '';
-        }));
-        "Shift+Print".action = spawn (lib.getExe (pkgs.writeShellApplication {
-          name = "screenshot";
-          runtimeInputs = with pkgs; [ grim niri gojq wl-clipboard-rs coreutils ];
-          text = ''
-            grim -o "$(niri msg -j workspaces | jq -r '.[] | select(.is_focused) | .output')" - \
-              | tee "$HOME/screenshots/$(date +"%Y-%m-%dT%H:%M:%S").png" \
-              | wl-copy --type image/png
-          '';
-        }));
-        "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+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 = move-column-to-workspace "comm";
-
-        "Mod+ParenRight".action = focus-workspace "web";
-        "Mod+Shift+ParenRight".action = move-column-to-workspace "web";
-
-        "Mod+BraceRight".action = focus-workspace "read";
-        "Mod+Shift+BraceRight".action = move-column-to-workspace "read";
-
-        "Mod+BraceLeft".action = focus-workspace "mon";
-        "Mod+Shift+BraceLeft".action = move-column-to-workspace "mon";
-
-        "Mod+Asterisk".action = focus-workspace "vid";
-        "Mod+Shift+Asterisk".action = move-column-to-workspace "vid";
-
-        "Mod+Plus".action = with-unnamed-workspace-action ''{"Action":{"FocusWorkspace":{"reference":{"Id": .id}}}}'';
-        "Mod+Shift+Plus".action = with-unnamed-workspace-action ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}}}}'';
-
-        "Mod+M".action = consume-or-expel-window-left;
-        "Mod+W".action = consume-or-expel-window-right;
-
-        "Mod+R".action = switch-preset-column-width;
-        "Mod+Shift+R".action = switch-preset-window-height;
-        "Mod+F".action = center-column;
-        "Mod+Shift+F".action = maximize-column;
-        "Mod+Shift+Ctrl+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;
-        };
-
-        "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 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+A".action = focus-or-spawn-action-app_id "com.saivert.pwvucontrol" "pwctl" "pwvucontrol";
-        "Mod+Control+P".action = focus-or-spawn-action-app_id "org.keepassxc.KeePassXC" "kpxc" "keepassxc";
-        "Mod+Control+B".action = focus-or-spawn-action-app_id ".blueman-manager-wrapped" "bmgr" "blueman-manager";
-        "Mod+Control+Return".action = focus-or-spawn-action-app_id "kitty-scratch" "term" "kitty" "--app-id" "kitty-scratch";
-        "Mod+Control+E".action = focus-or-spawn-action "select(.app_id == \"emacs\" and .title == \"scratch\")" "edit" "emacsclient" "-c" "--frame-parameters=(quote (name . \"scratch\"))";
-      };
-    };
-  };
-}
diff --git a/accounts/gkleen@sif/niri/mako.nix b/accounts/gkleen@sif/niri/mako.nix
deleted file mode 100644
index 8abf14d8..00000000
--- a/accounts/gkleen@sif/niri/mako.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ config, lib, ... }:
-{
-  config = {
-    services.mako = {
-      enable = true;
-      font = "Fira Sans 10";
-      format = "<i>%s</i>\\n%b";
-      margin = "2";
-      maxVisible = -1;
-      backgroundColor = "#000000dd";
-      progressColor = "source #223544ff";
-      width = 384;
-      extraConfig = ''
-        outer-margin=1
-        max-history=100
-
-        [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
-
-        [mode=silent]
-        invisible=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";
-      };
-    };
-  };
-}
diff --git a/accounts/gkleen@sif/niri/waybar.nix b/accounts/gkleen@sif/niri/waybar.nix
deleted file mode 100644
index 79c429f8..00000000
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ /dev/null
@@ -1,338 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  config = {
-    programs.waybar = {
-      enable = true;
-      systemd = {
-        enable = true;
-        target = "graphical-session.target";
-      };
-      settings = let
-        windowRewrites = {
-          "(.*) — Mozilla Firefox" = "$1";
-          "(.*) - Mozilla Thunderbird" = "$1";
-          "(.*) - mpv" = "$1";
-        };
-        iconSize = 11;
-      in [
-        {
-          layer = "top";
-          position = "top";
-          height = 14;
-          output = [ "eDP-1" "DP-2" "DP-3" ];
-          modules-left = [ "niri/workspaces" ];
-          modules-center = [ "niri/window" ];
-          modules-right = [ # "custom/worktime" "custom/worktime-today"
-            "custom/weather"
-            "custom/keymap"
-            "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "custom/mako" "clock" ];
-
-          "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}, 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=\\\"100%\\\">{ICON}</span> {FeelsLikeC}°\"";
-            return-type = "json";
-          };
-          "custom/keymap" = {
-            format = "{}";
-            tooltip = true;
-            return-type = "json";
-            exec = pkgs.writers.writePython3 "keymap" {} ''
-              import os
-              import socket
-              import json
-
-
-              def output(keymap):
-                  short = keymap
-                  if keymap == "English (programmer Dvorak)":
-                      short = "dvp"
-                  elif keymap == "English (US)":
-                      short = "<span color=\"#ffffff\">us</span>"
-                  print(json.dumps({'text': short, 'tooltip': keymap}, separators=(',', ':')), flush=True)  # noqa: E501
-
-
-              keyboard_layouts = []
-
-              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 "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 = "niri msg action switch-layout next";
-          };
-          "custom/worktime" = {
-            interval = 60;
-            exec = lib.getExe pkgs.worktime;
-            tooltip = false;
-          };
-          "custom/worktime-today" = {
-            interval = 60;
-            exec = "${lib.getExe pkgs.worktime} today";
-            tooltip = false;
-          };
-          "niri/workspaces" = {
-            ignore = ["pwctl" "kpxc" "bmgr" "edit" "term"];
-          };
-          "niri/window" = {
-            separate-outputs = true;
-            icon = true;
-            icon-size = 14;
-            rewrite = windowRewrites;
-          };
-          clock = {
-              interval = 1;
-              # timezone = "Europe/Berlin";
-              format = "W{:%V-%u %F %H:%M:%S%Ez}";
-              tooltip-format = "<tt><small>{calendar}</small></tt>";
-              calendar = {
-                mode = "year";
-                mode-mon-col = 3;
-                weeks-pos = "left";
-                on-scroll = 1;
-                format = {
-                  months = "<span color='#ffead3'><b>{}</b></span>";
-                  days = "{}";
-                  weeks = "<span color='#99ffdd'><b>{}</b></span>";
-                  weekdays = "<span color='#ffcc66'><b>{}</b></span>";
-                  today = "<span color='#ff6699'><b>{}</b></span>";
-                };
-              };
-          };
-          battery = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize - 2;
-            states = { warning = 30; critical = 15; };
-            format-icons = ["&#xf008e;" "&#xf007a;" "&#xf007b;" "&#xf007c;" "&#xf007d;" "&#xf007e;" "&#xf007f;" "&#xf0080;" "&#xf0081;" "&#xf0082;" "&#xf0079;" ];
-            format-charging = "&#xf0084;";
-            format-plugged = "&#xf06a5;";
-            tooltip-format = "{capacity}% {timeTo}";
-            interval = 20;
-          };
-          tray = {
-            icon-size = 16;
-            # show-passive-items = true;
-            spacing = 1;
-          };
-          privacy = {
-            icon-spacing = 7;
-            icon-size = iconSize;
-            modules = [
-              { type = "screenshare"; }
-              { type = "audio-in"; }
-            ];
-          };
-          idle_inhibitor = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize;
-            format-icons = { activated = "&#xf0208;"; deactivated = "&#xf0209;"; };
-            timeout = 120;
-          };
-          backlight = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            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";
-          };
-          wireplumber = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize;
-            tooltip-format = "{volume}% {node_name}";
-            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";
-          };
-        }
-        {
-          layer = "top";
-          position = "top";
-          height = 14;
-          output = [ "!eDP-1" "!DP-2" "!DP-3" ];
-          modules-left = [ "niri/workspaces" ];
-          modules-center = [ "niri/window" ];
-          modules-right = [ "clock" ];
-
-          "niri/workspaces" = {
-            ignore = ["pwctl" "kpxc" "bmgr" "edit" "term"];
-          };
-          "niri/window" = {
-            separate-outputs = true;
-            icon = true;
-            icon-size = 14;
-            rewrite = windowRewrites;
-          };
-          clock = {
-              interval = 1;
-              # timezone = "Europe/Berlin";
-              format = "{:%H:%M}";
-              tooltip-format = "W{:%V-%u %F %H:%M:%S%Ez}";
-          };
-        }
-      ];
-      style = ''
-        @define-color white #ffffff;
-        @define-color grey #555555;
-        @define-color blue #1a8fff;
-        @define-color green #23fd00;
-        @define-color orange #f28a21;
-        @define-color red #f2201f;
-
-        * {
-          border: none;
-          font-family: "Fira Sans Nerd Font";
-          font-size: 10pt;
-          min-height: 0;
-        }
-
-        window#waybar {
-          background-color: rgba(0, 0, 0, 0.66);
-          color: @white;
-        }
-
-        .modules-left {
-          margin-left: 8px;
-        }
-        .modules-right {
-          margin-right: 8px;
-        }
-
-        .module {
-          margin: 0 5px;
-        }
-
-        #workspaces button {
-          color: @white;
-          padding: 2px 5px;
-        }
-        #workspaces button.empty {
-          color: @grey;
-        }
-        #workspaces button.active {
-          color: @green;
-        }
-        #workspaces button.urgent {
-          color: @red;
-        }
-
-        #custom-weather, #custom-keymap, #custom-worktime, #custom-worktime-today {
-          color: @grey;
-          margin: 0 5px;
-        }
-        #custom-weather, #custom-worktime-today {
-          margin-right: 3px;
-        }
-        #custom-keymap, #custom-weather {
-          margin-left: 3px;
-        }
-
-        #tray {
-          margin: 0;
-        }
-        #battery, #idle_inhibitor, #backlight, #wireplumber, #custom-mako {
-          color: @grey;
-          margin: 0 5px 0 2px;
-        }
-        #idle_inhibitor {
-          margin-right: 4px;
-          margin-left: 6px;
-        }
-        #custom-mako {
-          margin-right: 2px;
-          margin-left: 3px;
-        }
-        #battery {
-          margin-right: 3px;
-        }
-        #battery.discharging {
-          color: @white;
-        }
-        #battery.warning {
-          color: @orange;
-        }
-        #battery.critical {
-          color: @red;
-        }
-        #battery.charging {
-          color: @white;
-        }
-        #idle_inhibitor.activated {
-          color: @white;
-        }
-
-        #idle_inhibitor {
-          padding-top: 1px;
-        }
-
-        #privacy {
-          color: @red;
-          margin: -1px 2px 0px 5px;
-        }
-        #clock {
-          /* margin-right: 5px; */
-        }
-      '';
-    };
-  };
-}
diff --git a/accounts/gkleen@sif/shell/default.nix b/accounts/gkleen@sif/shell/default.nix
new file mode 100644
index 00000000..09eb6863
--- /dev/null
+++ b/accounts/gkleen@sif/shell/default.nix
@@ -0,0 +1,123 @@
+{ config, pkgs, lib, ... }:
+
+{
+  config = {
+    programs.quickshell = {
+      enable = true;
+      package = pkgs.symlinkJoin {
+        pname = pkgs.quickshell.pname + "-wrapped";
+        inherit (pkgs.quickshell) version meta;
+        paths = [ pkgs.quickshell ];
+        buildInputs = [ pkgs.makeWrapper ];
+        postBuild = ''
+          for binary in quickshell qs; do
+            wrapProgram $out/bin/$binary \
+              --prefix QT_PLUGIN_PATH : ${pkgs.qt6.qtimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix} \
+              --prefix QML_IMPORT_PATH : ${pkgs.qt6Packages.callPackage ./quickshell-plugins {}}/${pkgs.qt6.qtbase.qtQmlPrefix}
+          done
+        '';
+      };
+      config = {
+        src = ./quickshell;
+        replacements = {
+          ignore_workspaces = builtins.toJSON (map ({ name, ... }: name) config.programs.niri.scratchspaces);
+          wallpapers = builtins.toJSON (pkgs.stdenvNoCC.mkDerivation {
+            name = "wallpapers";
+            srcs = [
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/publicationtiff10k/carinanebula3.tif";
+                hash = "sha256-YxZEweDKJfvfrdxb/QFmgJhcZDEJYxotoHrG+RRn1tw=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/pillarsofcreation_composite.tif";
+                hash = "sha256-qRiODxR0lZWdxgYXna0fNRFFDErpBJDwOJuQl6sNjRc=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/publicationtiff10k/weic2212a.tif";
+                hash = "sha256-l2fqE/z//C1a0xkvZwsnwPbTSb+WuA11h+SUl3E1dhw=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/publicationtiff10k/weic2415a.tif";
+                hash = "sha256-onBy7cPoUpDuzQStbY2E+qmlGgSLXPwFCLX53ukAb4c=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/publicationtiff10k/weic2330a.tif";
+                hash = "sha256-nn0ZtjZIrPcpj3YcLTsrL7XiXvyh3QYgCSmdDMD+3OM=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2426a.tif";
+                hash = "sha256-EDnfPn3GE9jt6XPqiGInP7E2F3Az7d25NqATSWltDv0=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2503a.tif";
+                hash = "sha256-3/RX6RQp8naELcgReHPd5/zhJkoCjnA10w5BEnNo+qI=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2506a.tif";
+                hash = "sha256-aDld0aoY1owRxDVf7Jcyw71TH42M1foYotxn2thyFYw=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2514a.tif";
+                hash = "sha256-jTi1G1Ofo5xsF6ggrbtYJHxqLaCQ7edM5B3uORiVQtg=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2425c.tif";
+                hash = "sha256-oaEOexSJHEGj090dJF3ct5HAoR+Y5gRiPrUlxdvnTRo=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2605c.tif";
+                hash = "sha256-IwWfgkz84LFXkfk77anb5e0Mf0wWiIszum7UC3yZn0U=";
+              })
+            ];
+
+            dontUnpack = true;
+
+            buildInputs = [ pkgs.imagemagick ];
+            buildPhase = ''
+              runHook preBuild
+
+              typeset sources=($srcs)
+
+              mkdir -p $out
+              magick ''${sources[0]} -crop 10000x5625+0+79 +repage -define webp:target-size=10000000 $out/carinanebula3.webp
+              magick ''${sources[1]} -crop 6716x3778+329+80 +repage -define webp:target-size=10000000 $out/pillarsofcreation_composite.webp
+              magick ''${sources[2]} -crop 10000x5625+0+79 +repage -define webp:target-size=10000000 $out/weic2212a.webp
+              magick ''${sources[3]} -crop 7650x4302+1166+389 +repage -define webp:target-size=10000000 $out/weic2415a.webp
+              magick ''${sources[4]} -crop 8732x4912+0+434 +repage -define webp:target-size=10000000 $out/weic2330a.webp
+              magick ''${sources[5]} -crop 5302x2982+636+0 +repage -define webp:target-size=10000000 $out/weic2426a.webp
+              magick ''${sources[6]} -crop 4328x2434+0+906 +repage -define webp:target-size=10000000 $out/weic2503a.webp
+              magick ''${sources[7]} -crop 4152x2335+0+666 +repage -define webp:target-size=10000000 $out/weic2506a.webp
+              magick ''${sources[8]} -crop 4320x2430+0+0 +repage -define webp:target-size=10000000 $out/weic2514a.webp
+              magick ''${sources[9]} -crop 5863x3298+0+477 +repage -define webp:target-size=10000000 $out/weic2425c.webp
+              magick ''${sources[10]} -crop 3990x2244+0+1379 +repage -define webp:target-size=10000000 $out/weic2605c.webp
+
+              runHook postBuild
+            '';
+          });
+          niri_session = builtins.toJSON [
+            (pkgs.writeShellScript "niri-session" ''
+              exec ${lib.getExe pkgs.dex} -w ${config.programs.niri.package}/share/wayland-sessions/niri.desktop &>/tmp/niri-session-$$.log
+            '')
+            # (lib.getExe pkgs.dex)
+            # "${config.programs.niri.package}/share/wayland-sessions/niri.desktop"
+          ];
+          username = builtins.toJSON config.home.username;
+          mdi = builtins.toJSON (pkgs.fetchFromGitHub {
+            owner = "Templarian";
+            repo = "MaterialDesign";
+            rev = "2424e748e0cc63ab7b9c095a099b9fe239b737c0";
+            hash = "sha256-QMGl7soAhErrrnY3aKOZpt49yebkSNzy10p/v5OaqQ0=";
+          });
+          worktime = builtins.toJSON (lib.getExe pkgs.worktime);
+          slurp = builtins.toJSON (lib.getExe pkgs.slurp);
+          wf-recorder = builtins.toJSON (lib.getExe pkgs.wf-recorder);
+        };
+      };
+    };
+    systemd.user.services.quickshell = {
+      Service = {
+        RuntimeDirectory = "quickshell";
+      };
+    };
+  };
+}
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/CMakeLists.txt b/accounts/gkleen@sif/shell/quickshell-plugins/CMakeLists.txt
new file mode 100644
index 00000000..020c0515
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/CMakeLists.txt
@@ -0,0 +1,168 @@
+set(INSTALL_QMLDIR "" CACHE STRING "QML install dir")
+set(INSTALL_QML_PREFIX "" CACHE STRING "QML install prefix")
+
+# There doesn't seem to be a standard cross-distro qml install path.
+if ("${INSTALL_QMLDIR}" STREQUAL "" AND "${INSTALL_QML_PREFIX}" STREQUAL "")
+        message(WARNING "Neither INSTALL_QMLDIR nor INSTALL_QML_PREFIX is set. QML modules will not be installed.")
+else()
+        if ("${INSTALL_QMLDIR}" STREQUAL "")
+                set(QML_FULL_INSTALLDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_QML_PREFIX}")
+        else()
+                set(QML_FULL_INSTALLDIR "${INSTALL_QMLDIR}")
+        endif()
+
+        message(STATUS "QML install dir: ${QML_FULL_INSTALLDIR}")
+endif()
+
+# Install a given target as a QML module. This is mostly pulled from ECM, as there does not seem
+# to be an official way to do it.
+# see https://github.com/KDE/extra-cmake-modules/blob/fe0f606bf7f222e36f7560fd7a2c33ef993e23bb/modules/ECMQmlModule6.cmake#L160
+function(install_qml_module arg_TARGET)
+        if (NOT DEFINED QML_FULL_INSTALLDIR)
+                return()
+        endif()
+
+        qt_query_qml_module(${arg_TARGET}
+                URI module_uri
+                VERSION module_version
+                PLUGIN_TARGET module_plugin_target
+                TARGET_PATH module_target_path
+                QMLDIR module_qmldir
+                TYPEINFO module_typeinfo
+                QML_FILES module_qml_files
+                RESOURCES module_resources
+        )
+
+  set(module_dir "${QML_FULL_INSTALLDIR}/${module_target_path}")
+
+  if (NOT TARGET "${module_plugin_target}")
+    message(FATAL_ERROR "install_qml_modules called for a target without a plugin")
+  endif()
+
+        get_target_property(target_type "${arg_TARGET}" TYPE)
+        if (NOT "${target_type}" STREQUAL "STATIC_LIBRARY")
+                install(
+                        TARGETS "${arg_TARGET}"
+                        LIBRARY DESTINATION "${module_dir}"
+                        RUNTIME DESTINATION "${module_dir}"
+                )
+
+                install(
+                        TARGETS "${module_plugin_target}"
+                        LIBRARY DESTINATION "${module_dir}"
+                        RUNTIME DESTINATION "${module_dir}"
+                )
+        endif()
+
+  install(FILES "${module_qmldir}" DESTINATION "${module_dir}")
+  install(FILES "${module_typeinfo}" DESTINATION "${module_dir}")
+
+  # Install QML files
+  list(LENGTH module_qml_files num_files)
+  if (NOT "${module_qml_files}" MATCHES "NOTFOUND" AND ${num_files} GREATER 0)
+    qt_query_qml_module(${arg_TARGET} QML_FILES_DEPLOY_PATHS qml_files_deploy_paths)
+
+    math(EXPR last_index "${num_files} - 1")
+    foreach(i RANGE 0 ${last_index})
+      list(GET module_qml_files       ${i} src_file)
+      list(GET qml_files_deploy_paths ${i} deploy_path)
+      get_filename_component(dst_name "${deploy_path}" NAME)
+      get_filename_component(dest_dir "${deploy_path}" DIRECTORY)
+      install(FILES "${src_file}" DESTINATION "${module_dir}/${dest_dir}" RENAME "${dst_name}")
+    endforeach()
+  endif()
+
+  # Install resources
+  list(LENGTH module_resources num_files)
+  if (NOT "${module_resources}" MATCHES "NOTFOUND" AND ${num_files} GREATER 0)
+    qt_query_qml_module(${arg_TARGET} RESOURCES_DEPLOY_PATHS resources_deploy_paths)
+
+    math(EXPR last_index "${num_files} - 1")
+    foreach(i RANGE 0 ${last_index})
+      list(GET module_resources       ${i} src_file)
+      list(GET resources_deploy_paths ${i} deploy_path)
+      get_filename_component(dst_name "${deploy_path}" NAME)
+      get_filename_component(dest_dir "${deploy_path}" DIRECTORY)
+      install(FILES "${src_file}" DESTINATION "${module_dir}/${dest_dir}" RENAME "${dst_name}")
+    endforeach()
+  endif()
+endfunction()
+
+
+cmake_minimum_required(VERSION 3.20)
+project(custom LANGUAGES CXX)
+
+find_package(Qt6 REQUIRED COMPONENTS Core Qml DBus)
+
+qt_standard_project_setup(REQUIRES 6.6)
+
+qt6_policy(SET QTP0001 NEW)
+qt6_add_qml_module(customplugin
+    URI "Custom"
+    PLUGIN_TARGET customplugin
+)
+
+set_source_files_properties(org.keepassxc.KeePassXC.MainWindow.xml PROPERTIES
+        CLASSNAME DBusKeePassXC
+        NO_NAMESPACE TRUE
+)
+qt_add_dbus_interface(DBUS_INTERFACES
+        org.keepassxc.KeePassXC.MainWindow.xml
+        dbus_keepassxc
+)
+
+set_source_files_properties(org.freedesktop.systemd1.Manager.xml PROPERTIES
+        CLASSNAME DBusSystemdManager
+        NO_NAMESPACE TRUE
+)
+qt_add_dbus_interface(DBUS_INTERFACES
+        org.freedesktop.systemd1.Manager.xml
+        dbus_systemd_manager
+)
+
+set_source_files_properties(org.freedesktop.login1.Manager.xml PROPERTIES
+        CLASSNAME DBusLogindManager
+        NO_NAMESPACE TRUE
+)
+qt_add_dbus_interface(DBUS_INTERFACES
+        org.freedesktop.login1.Manager.xml
+        dbus_logind_manager
+)
+
+set_source_files_properties(org.freedesktop.login1.Session.xml PROPERTIES
+        CLASSNAME DBusLogindSession
+        NO_NAMESPACE TRUE
+)
+qt_add_dbus_interface(DBUS_INTERFACES
+        org.freedesktop.login1.Session.xml
+        dbus_logind_session
+)
+
+set_source_files_properties(org.freedesktop.DBus.Properties.xml PROPERTIES
+        CLASSNAME DBusProperties
+        NO_NAMESPACE TRUE
+)
+qt_add_dbus_interface(DBUS_INTERFACES
+        org.freedesktop.DBus.Properties.xml
+        dbus_properties
+)
+
+include_directories(${CMAKE_SOURCE_DIR}/build)
+
+target_compile_features(customplugin PUBLIC cxx_std_26)
+
+target_link_libraries(customplugin PRIVATE
+    Qt6::Core
+    Qt6::Qml
+    Qt6::DBus
+)
+
+target_sources(customplugin PRIVATE
+    Chrono.cpp Chrono.hpp
+    FileSelector.cpp FileSelector.hpp
+    KeePassXC.cpp KeePassXC.hpp
+    Systemd.cpp Systemd.hpp
+    ${DBUS_INTERFACES}
+)
+
+install_qml_module(customplugin)
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp
new file mode 100644
index 00000000..22b3469b
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp
@@ -0,0 +1,83 @@
+#include "Chrono.hpp"
+
+#include <format>
+#include <iostream>
+#include <cmath>
+
+Chrono::Chrono(QObject* parent): QObject(parent) {
+  QObject::connect(&this->timer, &QTimer::timeout, this, &Chrono::onTimeout);
+  this->update();
+}
+
+bool Chrono::enabled() const { return this->mEnabled; }
+
+void Chrono::setEnabled(bool enabled) {
+  if (enabled == this->mEnabled) return;
+  this->mEnabled = enabled;
+  emit this->enabledChanged();
+  this->update();
+}
+
+Chrono::Precision Chrono::precision() const { return this->mPrecision; }
+
+void Chrono::setPrecision(Chrono::Precision precision) {
+  if (precision == this->mPrecision) return;
+  this->mPrecision = precision;
+  emit this->precisionChanged();
+  this->update();
+}
+
+void Chrono::onTimeout() {
+  this->setTime(this->targetTime);
+  this->schedule(this->targetTime);
+}
+
+void Chrono::update() {
+  if (this->mEnabled) {
+    this->setTime(std::chrono::time_point<std::chrono::system_clock>());
+    this->schedule(std::chrono::time_point<std::chrono::system_clock>());
+  } else {
+    this->timer.stop();
+  }
+}
+
+void Chrono::setTime(const std::chrono::time_point<std::chrono::system_clock>& targetTime) {
+  using namespace std::chrono_literals;
+
+  auto currentTime = std::chrono::system_clock::now();
+  auto offset = std::chrono::duration_cast<std::chrono::milliseconds>(targetTime - currentTime);
+  this->currentTime = abs(offset) < 500ms ? targetTime : currentTime;
+
+  switch (this->mPrecision) {
+  case Chrono::Hours: this->currentTime = std::chrono::time_point_cast<std::chrono::hours>(this->currentTime);
+  case Chrono::Minutes: this->currentTime = std::chrono::time_point_cast<std::chrono::minutes>(this->currentTime);
+  case Chrono::Seconds: this->currentTime = std::chrono::time_point_cast<std::chrono::seconds>(this->currentTime);
+  }
+
+  emit this->dateChanged();
+}
+
+void Chrono::schedule(const std::chrono::time_point<std::chrono::system_clock>& targetTime) {
+  using namespace std::chrono_literals;
+
+  auto currentTime = std::chrono::system_clock::now();
+  auto offset = std::chrono::duration_cast<std::chrono::milliseconds>(targetTime - currentTime);
+  auto nextTime = abs(offset) < 500ms ? targetTime : currentTime;
+
+  switch (this->mPrecision) {
+  case Chrono::Hours: nextTime = std::chrono::time_point_cast<std::chrono::hours>(nextTime) + 1h;
+  case Chrono::Minutes: nextTime = std::chrono::time_point_cast<std::chrono::minutes>(nextTime) + 1min;
+  case Chrono::Seconds: nextTime = std::chrono::time_point_cast<std::chrono::seconds>(nextTime) + 1s;
+  }
+
+  this->targetTime = nextTime;
+  this->timer.start(std::chrono::duration_cast<std::chrono::milliseconds>(nextTime - currentTime));
+}
+
+QString Chrono::format(const QString& fmt) const {
+  return QString::fromStdString(std::format(std::runtime_format(fmt.toStdString()), std::chrono::zoned_time(std::chrono::current_zone(), std::chrono::time_point_cast<std::chrono::seconds>(this->currentTime))));
+}
+
+QDateTime Chrono::date() const {
+  return QDateTime::fromStdTimePoint(std::chrono::time_point_cast<std::chrono::milliseconds>(this->currentTime));
+}
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp
new file mode 100644
index 00000000..04080187
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <chrono>
+
+#include <QDateTime>
+#include <QObject>
+#include <QTimer>
+
+#include <qqmlintegration.h>
+
+class Chrono : public QObject {
+  Q_OBJECT;
+  Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged);
+  Q_PROPERTY(Chrono::Precision precision READ precision WRITE setPrecision NOTIFY precisionChanged);
+  Q_PROPERTY(QDateTime date READ date NOTIFY dateChanged)
+  QML_ELEMENT;
+
+public:
+  enum Precision : quint8 {
+    Hours = 1,
+    Minutes = 2,
+    Seconds = 3,
+  };
+  Q_ENUM(Precision);
+
+  explicit Chrono(QObject* parent = nullptr);
+
+  bool enabled() const;
+  void setEnabled(bool enabled);
+
+  Chrono::Precision precision() const;
+  void setPrecision(Chrono::Precision precision);
+
+  Q_INVOKABLE QString format(const QString& fmt) const;
+
+  QDateTime date() const;
+
+signals:
+  void enabledChanged();
+  void precisionChanged();
+  void dateChanged();
+
+private slots:
+  void onTimeout();
+
+private:
+  bool mEnabled = true;
+  Chrono::Precision mPrecision = Chrono::Seconds;
+  QTimer timer;
+  std::chrono::time_point<std::chrono::system_clock> currentTime, targetTime;
+
+  void update();
+  void setTime(const std::chrono::time_point<std::chrono::system_clock>& targetTime);
+  void schedule(const std::chrono::time_point<std::chrono::system_clock>& targetTime);
+};
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.cpp b/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.cpp
new file mode 100644
index 00000000..d7051d2a
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.cpp
@@ -0,0 +1,102 @@
+#include "FileSelector.hpp"
+
+#include <sstream>
+#include <vector>
+#include <random>
+#include <algorithm>
+
+#include <iostream>
+#include <format>
+
+namespace fs = std::filesystem;
+
+FileSelector::FileSelector(QObject* parent): QObject(parent) {
+  QObject::connect(&this->timer, &QTimer::timeout, this, &FileSelector::onTimeout);
+  this->timer.setTimerType(Qt::PreciseTimer);
+}
+
+QString FileSelector::directory() const {
+  return QString::fromStdString(this->mDirectory->string());
+}
+void FileSelector::setDirectory(QString directory) {
+  this->mDirectory = directory.toStdString();
+  if (this->mDirectory && this->mEpoch)
+    this->update();
+  emit this->directoryChanged();
+}
+
+unsigned int FileSelector::epoch() const {
+  return std::chrono::duration_cast<std::chrono::milliseconds>(*this->mEpoch).count();
+}
+void FileSelector::setEpoch(unsigned int epoch) {
+  this->mEpoch = std::chrono::milliseconds{epoch};
+  if (this->mDirectory && this->mEpoch)
+    this->update();
+  emit this->epochChanged();
+}
+
+QString FileSelector::seed() const {
+  return this->mSeed;
+}
+void FileSelector::setSeed(QString seed) {
+  this->mSeed = seed;
+  emit this->seedChanged();
+  if (this->mDirectory && this->mEpoch)
+    emit this->selectedChanged();
+}
+
+QString FileSelector::selected() const {
+  if (!this->mDirectory || !this->mEpoch)
+    return QString();
+
+  std::vector<fs::path> shuffled(this->mFiles.begin(), this->mFiles.end());
+  std::sort(shuffled.begin(), shuffled.end());
+
+  auto currentTime = std::chrono::system_clock::now();
+  uint64_t currentEpoch = currentTime.time_since_epoch() / *this->mEpoch;
+  std::chrono::milliseconds timeInEpoch = std::chrono::duration_cast<std::chrono::milliseconds>(currentTime.time_since_epoch()) % *this->mEpoch;
+
+  std::ostringstream seed;
+  seed << this->mSeed.size() << ";" << this->mSeed.toStdString() << ";";
+  seed << *this->mEpoch << ";";
+  seed << currentEpoch << ";";
+  seed << this->mDirectory->string().size() << ";" << *this->mDirectory << ";";
+  seed << this->mFiles.size() << ";";
+  for (const fs::path& p: this->mFiles)
+    seed << p.string().size() << ";" << p << ";";
+
+  std::vector<std::seed_seq::result_type> v;
+  v.reserve(seed.str().size());
+  for (const char& c: seed.str())
+    v.push_back(c);
+
+  std::seed_seq engine_seed(v.begin(), v.end());
+  std::mt19937 g(engine_seed);
+  std::shuffle(shuffled.begin(), shuffled.end(), g);
+
+  std::vector<fs::path>::size_type ix = shuffled.size() * timeInEpoch / *this->mEpoch;
+  return QString::fromStdString((*this->mDirectory / shuffled[ix]).string());
+}
+
+void FileSelector::onTimeout() {
+  if (!this->mFiles.size())
+    return;
+
+  auto currentTime = std::chrono::system_clock::now();
+  uint64_t currentMinorEpoch = currentTime.time_since_epoch() / (*this->mEpoch / this->mFiles.size());
+  auto nextTime = std::chrono::time_point<std::chrono::system_clock>((currentMinorEpoch + 1) * (*this->mEpoch / this->mFiles.size()));
+  this->timer.start(std::chrono::duration_cast<std::chrono::milliseconds>(nextTime - currentTime));
+
+  emit this->selectedChanged();
+}
+
+void FileSelector::update() {
+  this->mFiles = std::set<fs::path>{};
+  for (const fs::directory_entry& entry:
+         fs::recursive_directory_iterator(*this->mDirectory, fs::directory_options::follow_directory_symlink))
+    {
+      this->mFiles.insert(fs::relative(entry, *this->mDirectory));
+    }
+
+  this->onTimeout();
+}
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.hpp b/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.hpp
new file mode 100644
index 00000000..72c4f2a7
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.hpp
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <filesystem>
+#include <chrono>
+#include <set>
+#include <optional>
+
+#include <QObject>
+#include <QTimer>
+
+#include <qqmlintegration.h>
+
+class FileSelector : public QObject {
+  Q_OBJECT;
+  Q_PROPERTY(QString directory READ directory WRITE setDirectory NOTIFY directoryChanged REQUIRED);
+  Q_PROPERTY(unsigned int epoch READ epoch WRITE setEpoch NOTIFY epochChanged REQUIRED);
+  Q_PROPERTY(QString seed READ seed WRITE setSeed NOTIFY seedChanged);
+  Q_PROPERTY(QString selected READ selected NOTIFY selectedChanged);
+  QML_ELEMENT;
+
+public:
+  explicit FileSelector(QObject* parent = nullptr);
+
+  QString directory() const;
+  void setDirectory(QString directory);
+
+  unsigned int epoch() const;
+  void setEpoch(unsigned int epoch);
+
+  QString seed() const;
+  void setSeed(QString seed);
+
+  QString selected() const;
+
+signals:
+  void directoryChanged();
+  void epochChanged();
+  void seedChanged();
+  void selectedChanged();
+
+private slots:
+  void onTimeout();
+
+private:
+  std::optional<std::filesystem::path> mDirectory;
+  std::optional<std::chrono::milliseconds> mEpoch;
+  std::set<std::filesystem::path> mFiles;
+  QString mSeed;
+  QTimer timer;
+
+  void update();
+};
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/KeePassXC.cpp b/accounts/gkleen@sif/shell/quickshell-plugins/KeePassXC.cpp
new file mode 100644
index 00000000..f6e4dd6e
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/KeePassXC.cpp
@@ -0,0 +1,18 @@
+#include "KeePassXC.hpp"
+
+#include <QDBusConnection>
+
+KeePassXC::KeePassXC() {
+  this->service = new DBusKeePassXC(DBusKeePassXC::staticInterfaceName(), "/keepassxc", QDBusConnection::sessionBus(), this);
+}
+KeePassXC::~KeePassXC() {
+  if (this->service)
+    delete this->service;
+}
+
+void KeePassXC::lockAllDatabases() {
+  if (!this->service)
+    return;
+
+  this->service->lockAllDatabases();
+}
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/KeePassXC.hpp b/accounts/gkleen@sif/shell/quickshell-plugins/KeePassXC.hpp
new file mode 100644
index 00000000..c4cd71e0
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/KeePassXC.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "dbus_keepassxc.h"
+
+#include <QObject>
+#include <QtQmlIntegration/qqmlintegration.h>
+
+class KeePassXC : public QObject {
+  Q_OBJECT;
+  QML_SINGLETON;
+  QML_ELEMENT;
+
+public:
+  explicit KeePassXC();
+  ~KeePassXC();
+
+  Q_INVOKABLE void lockAllDatabases();
+
+private:
+  DBusKeePassXC* service = nullptr;
+};
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.cpp b/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.cpp
new file mode 100644
index 00000000..308659e9
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.cpp
@@ -0,0 +1,198 @@
+#include "Systemd.hpp"
+
+#include <sstream>
+
+#include <QDBusConnection>
+#include <QDBusReply>
+#include <QDebug>
+#include <QDBusUnixFileDescriptor>
+#include <QDBusObjectPath>
+
+Systemd::Systemd(QObject* parent) : QObject(parent) {
+  this->systemdManager = new DBusSystemdManager(
+    "org.freedesktop.systemd1",
+    "/org/freedesktop/systemd1",
+    QDBusConnection::sessionBus(),
+    this
+  );
+  this->logindManager = new DBusLogindManager(
+    "org.freedesktop.login1",
+    "/org/freedesktop/login1",
+    QDBusConnection::systemBus(),
+    this
+  );
+
+  QDBusReply<QDBusObjectPath> sessionPath = this->logindManager->GetSession("auto");
+  qDebug() << sessionPath;
+  this->logindSession = new DBusLogindSession(
+    "org.freedesktop.login1",
+    sessionPath.value().path(),
+    QDBusConnection::systemBus(),
+    this
+  );
+  this->logindSessionProperties = new DBusProperties(
+    "org.freedesktop.login1",
+    sessionPath.value().path(),
+    QDBusConnection::systemBus(),
+    this
+  );
+
+  QObject::connect(this->logindManager, &DBusLogindManager::PrepareForShutdown, this, &Systemd::shutdown);
+  QObject::connect(this->logindManager, &DBusLogindManager::PrepareForSleep, this, &Systemd::sleep);
+  QObject::connect(this->logindSession, &DBusLogindSession::Lock, this, &Systemd::lock);
+  QObject::connect(this->logindSession, &DBusLogindSession::Unlock, this, &Systemd::unlock);
+  QObject::connect(this->logindSessionProperties, &DBusProperties::PropertiesChanged, this, &Systemd::onLogindSessionPropertiesChanged);
+}
+
+void Systemd::onLogindSessionPropertiesChanged(const QString& interface_name, const QVariantMap& changed_properties, const QStringList& invalidated_properties) {
+  if (changed_properties.contains("IdleHint") || invalidated_properties.contains("IdleHint"))
+    emit this->idleHintChanged();
+  if (changed_properties.contains("LockedHint") || invalidated_properties.contains("LockedHint"))
+    emit this->lockedHintChanged();
+}
+
+void Systemd::stopUserUnit(const QString& unit, const QString& mode) { this->systemdManager->StopUnit(unit, mode); }
+
+void Systemd::setBrightness(const QString& subsystem, const QString& name, quint32 brightness) { this->logindSession->SetBrightness(subsystem, name, brightness); }
+
+bool Systemd::idleHint() { return this->logindSession->idleHint(); }
+void Systemd::setIdleHint(bool idle) { this->logindSession->SetIdleHint(idle); }
+bool Systemd::lockedHint() { return this->logindSession->lockedHint(); }
+void Systemd::setLockedHint(bool locked) { this->logindSession->SetLockedHint(locked); }
+void Systemd::lockSession() { this->logindSession->call("Lock"); }
+void Systemd::suspend() { this->logindManager->Suspend(true); }
+void Systemd::hibernate() { this->logindManager->Hibernate(true); }
+
+std::string SystemdInhibitorParams::toString(SystemdInhibitorParams::WhatItem what) {
+  if (what == SystemdInhibitorParams::Shutdown)
+    return "shutdown";
+  else if (what == SystemdInhibitorParams::Sleep)
+    return "sleep";
+  else if (what == SystemdInhibitorParams::Idle)
+    return "idle";
+  else if (what == SystemdInhibitorParams::HandlePowerKey)
+    return "handle-power-key";
+  else if (what == SystemdInhibitorParams::HandleSuspendKey)
+    return "handle-suspend-key";
+  else if (what == SystemdInhibitorParams::HandleHibernateKey)
+    return "handle-hibernate-key";
+  else if (what == SystemdInhibitorParams::HandleLidSwitch)
+    return "handle-lid-switch";
+  return "";
+}
+
+std::string SystemdInhibitorParams::toString(SystemdInhibitorParams::What what) {
+  std::ostringstream res;
+  bool first = true;
+  for (const WhatItem& item: SystemdInhibitorParams::allWhatItems) {
+    if (!(what & item))
+      continue;
+
+    if (!first)
+      res << ":";
+    else
+      first = false;
+    res << SystemdInhibitorParams::toString(item);
+  }
+  return res.str();
+}
+
+std::string SystemdInhibitorParams::toString(SystemdInhibitorParams::Mode mode) {
+  if (mode == SystemdInhibitorParams::Block)
+    return "block";
+  else if (mode == SystemdInhibitorParams::BlockWeak)
+    return "block-weak";
+  else if (mode == SystemdInhibitorParams::Delay)
+    return "delay";
+  return "";
+}
+
+bool SystemdInhibitor::enabled() const { return static_cast<bool>(this->activeInhibitor); }
+void SystemdInhibitor::setEnabled(bool enabled) {
+  this->mEnabled = enabled;
+
+  if (enabled)
+    this->update();
+  else
+    this->release();
+}
+
+SystemdInhibitorParams::What SystemdInhibitor::what() const { return this->mWhat; }
+void SystemdInhibitor::setWhat(SystemdInhibitorParams::What what) {
+  this->mWhat = what;
+  this->update();
+}
+
+QString SystemdInhibitor::who() const { return this->mWho; }
+void SystemdInhibitor::setWho(QString who) {
+  this->mWho = who;
+  this->update();
+}
+
+QString SystemdInhibitor::why() const { return this->mWhy; }
+void SystemdInhibitor::setWhy(QString why) {
+  this->mWhy = why;
+  this->update();
+}
+
+SystemdInhibitorParams::Mode SystemdInhibitor::mode() const { return this->mMode; }
+void SystemdInhibitor::setMode(SystemdInhibitorParams::Mode mode) {
+  this->mMode = mode;
+  this->update();
+}
+
+SystemdInhibitor::ActiveSystemdInhibitor::ActiveSystemdInhibitor(SystemdInhibitorParams::What what_, QString who_, QString why_, SystemdInhibitorParams::Mode mode_): what(what_), who(who_), why(why_), mode(mode_) {
+  DBusLogindManager logindManager(
+    "org.freedesktop.login1",
+    "/org/freedesktop/login1",
+    QDBusConnection::systemBus()
+  );
+  QDBusReply<QDBusUnixFileDescriptor> fd_ = logindManager.Inhibit(QString::fromStdString(SystemdInhibitorParams::toString(what)), who, why, QString::fromStdString(SystemdInhibitorParams::toString(mode)));
+  if (fd_.error().isValid())
+    throw fd_.error();
+  this->fd = ::dup(fd_.value().fileDescriptor());
+}
+SystemdInhibitor::ActiveSystemdInhibitor::~ActiveSystemdInhibitor() {
+  if (this->fd != -1)
+    ::close(this->fd);
+}
+
+void SystemdInhibitor::release() {
+  if (!this->activeInhibitor)
+    return;
+
+  this->activeInhibitor.reset();
+  emit this->enabledChanged();
+}
+
+void SystemdInhibitor::update() {
+  if (!this->mWhat || this->mWho.isEmpty() || this->mWhy.isEmpty() || !this->mMode || !this->mEnabled)
+    if (this->activeInhibitor)
+      this->release();
+    else
+      return;
+
+  if (this->activeInhibitor && this->mWhat == this->activeInhibitor->what && this->mWho == this->activeInhibitor->who && this->mWhy == this->activeInhibitor->why && this->mMode == this->activeInhibitor->mode)
+    return;
+
+  std::unique_ptr<ActiveSystemdInhibitor> otherInhibitor;
+  try {
+    otherInhibitor.reset(new SystemdInhibitor::ActiveSystemdInhibitor(this->mWhat, this->mWho, this->mWhy, this->mMode));
+  } catch (const QDBusError& err) {
+    qCritical().noquote()
+      << err.name().toStdString() << " " << err.message().toStdString();
+    return;
+  }
+  this->activeInhibitor.swap(otherInhibitor);
+
+  if (!otherInhibitor && this->activeInhibitor)
+    emit this->enabledChanged();
+  if (otherInhibitor && otherInhibitor->what != this->activeInhibitor->what)
+    emit this->whatChanged();
+  if (otherInhibitor && otherInhibitor->who != this->activeInhibitor->who)
+    emit this->whoChanged();
+  if (otherInhibitor && otherInhibitor->why != this->activeInhibitor->why)
+    emit this->whyChanged();
+  if (otherInhibitor && otherInhibitor->mode != this->activeInhibitor->mode)
+    emit this->modeChanged();
+}
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.hpp b/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.hpp
new file mode 100644
index 00000000..615024d2
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Systemd.hpp
@@ -0,0 +1,147 @@
+#pragma once
+
+#include <cstdint>
+#include <memory>
+#include <string>
+
+#include <QObject>
+#include <QDBusInterface>
+#include <QtQmlIntegration/qqmlintegration.h>
+
+#include "dbus_systemd_manager.h"
+#include "dbus_logind_manager.h"
+#include "dbus_logind_session.h"
+#include "dbus_properties.h"
+
+class Systemd : public QObject {
+  Q_OBJECT;
+  QML_SINGLETON;
+  QML_ELEMENT;
+
+public:
+  explicit Systemd(QObject* parent = nullptr);
+
+  Q_PROPERTY(bool idleHint READ idleHint WRITE setIdleHint NOTIFY idleHintChanged)
+  Q_PROPERTY(bool lockedHint READ lockedHint WRITE setLockedHint NOTIFY lockedHintChanged)
+
+  Q_INVOKABLE void stopUserUnit(const QString& unit, const QString& mode);
+  Q_INVOKABLE void setBrightness(const QString& subsystem, const QString& name, quint32 brightness);
+  Q_INVOKABLE void setIdleHint(bool idle);
+  Q_INVOKABLE void setLockedHint(bool locked);
+  Q_INVOKABLE void lockSession();
+  Q_INVOKABLE void suspend();
+  Q_INVOKABLE void hibernate();
+
+  bool idleHint();
+  bool lockedHint();
+
+signals:
+  void shutdown(bool before);
+  void sleep(bool before);
+  void lock();
+  void unlock();
+  void idleHintChanged();
+  void lockedHintChanged();
+
+private slots:
+  void onLogindSessionPropertiesChanged(const QString& interface_name, const QVariantMap& changed_properties, const QStringList& invalidated_properties);
+
+private:
+  DBusSystemdManager* systemdManager;
+  DBusLogindManager* logindManager;
+  DBusLogindSession* logindSession;
+  DBusProperties* logindSessionProperties;
+};
+
+class SystemdInhibitorParams : public QObject {
+  Q_OBJECT;
+  QML_ELEMENT;
+  QML_SINGLETON;
+
+public:
+  enum WhatItem : uint8_t {
+    Shutdown = 0b1,
+    Sleep = 0b10,
+    Idle = 0b100,
+    HandlePowerKey = 0b1000,
+    HandleSuspendKey = 0b10000,
+    HandleHibernateKey = 0b100000,
+    HandleLidSwitch = 0b1000000,
+  };
+  Q_ENUM(WhatItem);
+  Q_DECLARE_FLAGS(What, WhatItem);
+
+  enum Mode : uint8_t {
+    Block = 1,
+    BlockWeak = 2,
+    Delay = 3,
+  };
+  Q_ENUM(Mode);
+
+  Q_INVOKABLE static std::string toString(WhatItem what);
+  Q_INVOKABLE static std::string toString(What what);
+  Q_INVOKABLE static std::string toString(Mode mode);
+
+  static constexpr WhatItem allWhatItems[] = { Shutdown, Sleep, Idle, HandlePowerKey, HandleSuspendKey, HandleHibernateKey, HandleLidSwitch };
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(SystemdInhibitorParams::What)
+
+class SystemdInhibitor : public QObject {
+  Q_OBJECT;
+  Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged);
+  Q_PROPERTY(SystemdInhibitorParams::What what READ what WRITE setWhat NOTIFY whatChanged);
+  Q_PROPERTY(QString who READ who WRITE setWho NOTIFY whoChanged);
+  Q_PROPERTY(QString why READ why WRITE setWhy NOTIFY whyChanged);
+  Q_PROPERTY(SystemdInhibitorParams::Mode mode READ mode WRITE setMode NOTIFY modeChanged);
+  QML_ELEMENT;
+
+public:
+  explicit SystemdInhibitor(QObject* parent = nullptr): QObject(parent) {}
+
+  bool enabled() const;
+  void setEnabled(bool enabled);
+
+  SystemdInhibitorParams::What what() const;
+  void setWhat(SystemdInhibitorParams::What what);
+
+  QString who() const;
+  void setWho(QString who);
+
+  QString why() const;
+  void setWhy(QString why);
+
+  SystemdInhibitorParams::Mode mode() const;
+  void setMode(SystemdInhibitorParams::Mode mode);
+
+  Q_INVOKABLE void release();
+
+signals:
+  void enabledChanged();
+  void whatChanged();
+  void whoChanged();
+  void whyChanged();
+  void modeChanged();
+
+private:
+  class ActiveSystemdInhibitor {
+  public:
+    uint32_t fd = -1;
+    SystemdInhibitorParams::What what;
+    QString who;
+    QString why;
+    SystemdInhibitorParams::Mode mode;
+
+    ActiveSystemdInhibitor(SystemdInhibitorParams::What what_, QString who_, QString why_, SystemdInhibitorParams::Mode mode_);
+    ~ActiveSystemdInhibitor();
+  };
+
+  void update();
+
+  bool mEnabled = true;
+  std::unique_ptr<ActiveSystemdInhibitor> activeInhibitor;
+  SystemdInhibitorParams::What mWhat = static_cast<SystemdInhibitorParams::What>(0);
+  QString mWho;
+  QString mWhy;
+  SystemdInhibitorParams::Mode mMode = static_cast<SystemdInhibitorParams::Mode>(0);
+};
+
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/customplugin.h b/accounts/gkleen@sif/shell/quickshell-plugins/customplugin.h
new file mode 100644
index 00000000..e66ba9e3
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/customplugin.h
@@ -0,0 +1,7 @@
+#include <QQmlEngineExtensionPlugin>
+
+class CustomPlugin : public QQmlEngineExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid)
+};
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/default.nix b/accounts/gkleen@sif/shell/quickshell-plugins/default.nix
new file mode 100644
index 00000000..20a195eb
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, cmake
+, qt6
+, fmt
+, keepassxc
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+  name = "quickshell-custom";
+
+  src = ./.;
+
+  prePatch = ''
+    cp ${keepassxc.src}/src/gui/org.keepassxc.KeePassXC.MainWindow.xml .
+  '';
+
+  nativeBuildInputs = [ cmake qt6.wrapQtAppsHook ];
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtdeclarative
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "INSTALL_QML_PREFIX" qt6.qtbase.qtQmlPrefix)
+  ];
+
+  LC_ALL = "C.UTF-8";
+}
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.DBus.Properties.xml b/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.DBus.Properties.xml
new file mode 100644
index 00000000..7588e7a5
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.DBus.Properties.xml
@@ -0,0 +1,28 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"https://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.freedesktop.DBus.Properties">
+  <method name="Get">
+   <arg name="interface_name" direction="in" type="s"/>
+   <arg name="property_name" direction="in" type="s"/>
+   <arg name="value" direction="out" type="v"/>
+  </method>
+  <method name="GetAll">
+   <arg name="interface_name" direction="in" type="s"/>
+   <arg name="props" direction="out" type="a{sv}"/>
+   <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+  </method>
+  <method name="Set">
+   <arg name="interface_name" direction="in" type="s"/>
+   <arg name="property_name" direction="in" type="s"/>
+   <arg name="value" direction="in" type="v"/>
+  </method>
+  <signal name="PropertiesChanged">
+   <arg type="s" name="interface_name"/>
+   <arg type="a{sv}" name="changed_properties"/>
+   <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
+   <arg type="as" name="invalidated_properties"/>
+  </signal>
+ </interface>
+</node>
+
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.login1.Manager.xml b/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.login1.Manager.xml
new file mode 100644
index 00000000..120a06d9
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.login1.Manager.xml
@@ -0,0 +1,445 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"https://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.freedesktop.login1.Manager">
+  <property name="EnableWallMessages" type="b" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="WallMessage" type="s" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="NAutoVTs" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="KillOnlyUsers" type="as" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="KillExcludeUsers" type="as" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="KillUserProcesses" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="RebootParameter" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="RebootToFirmwareSetup" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="RebootToBootLoaderMenu" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="RebootToBootLoaderEntry" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="BootLoaderEntries" type="as" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="IdleHint" type="b" access="read">
+  </property>
+  <property name="IdleSinceHint" type="t" access="read">
+  </property>
+  <property name="IdleSinceHintMonotonic" type="t" access="read">
+  </property>
+  <property name="BlockInhibited" type="s" access="read">
+  </property>
+  <property name="BlockWeakInhibited" type="s" access="read">
+  </property>
+  <property name="DelayInhibited" type="s" access="read">
+  </property>
+  <property name="InhibitDelayMaxUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="UserStopDelayUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="SleepOperation" type="as" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandlePowerKey" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandlePowerKeyLongPress" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleRebootKey" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleRebootKeyLongPress" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleSuspendKey" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleSuspendKeyLongPress" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleHibernateKey" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleHibernateKeyLongPress" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleLidSwitch" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleLidSwitchExternalPower" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleLidSwitchDocked" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HandleSecureAttentionKey" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="HoldoffTimeoutUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="IdleAction" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="IdleActionUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="PreparingForShutdown" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="PreparingForShutdownWithMetadata" type="a{sv}" access="read">
+    <annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/>
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="PreparingForSleep" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <!-- <property name="ScheduledShutdown" type="(st)" access="read"> -->
+  <!-- </property> -->
+  <property name="DesignatedMaintenanceTime" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Docked" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="LidClosed" type="b" access="read">
+  </property>
+  <property name="OnExternalPower" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="RemoveIPC" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="RuntimeDirectorySize" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="RuntimeDirectoryInodesMax" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InhibitorsMax" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="NCurrentInhibitors" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="SessionsMax" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="NCurrentSessions" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="StopIdleSessionUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <method name="GetSession">
+   <arg type="s" name="session_id" direction="in"/>
+   <arg type="o" name="object_path" direction="out"/>
+  </method>
+  <method name="GetSessionByPID">
+   <arg type="u" name="pid" direction="in"/>
+   <arg type="o" name="object_path" direction="out"/>
+  </method>
+  <method name="GetUser">
+   <arg type="u" name="uid" direction="in"/>
+   <arg type="o" name="object_path" direction="out"/>
+  </method>
+  <method name="GetUserByPID">
+   <arg type="u" name="pid" direction="in"/>
+   <arg type="o" name="object_path" direction="out"/>
+  </method>
+  <method name="GetSeat">
+   <arg type="s" name="seat_id" direction="in"/>
+   <arg type="o" name="object_path" direction="out"/>
+  </method>
+  <!-- <method name="ListSessions"> -->
+  <!--  <arg type="a(susso)" name="sessions" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ListSessionsEx"> -->
+  <!--  <arg type="a(sussussbto)" name="sessions" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ListUsers"> -->
+  <!--  <arg type="a(uso)" name="users" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ListSeats"> -->
+  <!--  <arg type="a(so)" name="seats" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ListInhibitors"> -->
+  <!--  <arg type="a(ssssuu)" name="inhibitors" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="CreateSession"> -->
+  <!--  <arg type="u" name="uid" direction="in"/> -->
+  <!--  <arg type="u" name="pid" direction="in"/> -->
+  <!--  <arg type="s" name="service" direction="in"/> -->
+  <!--  <arg type="s" name="type" direction="in"/> -->
+  <!--  <arg type="s" name="class" direction="in"/> -->
+  <!--  <arg type="s" name="desktop" direction="in"/> -->
+  <!--  <arg type="s" name="seat_id" direction="in"/> -->
+  <!--  <arg type="u" name="vtnr" direction="in"/> -->
+  <!--  <arg type="s" name="tty" direction="in"/> -->
+  <!--  <arg type="s" name="display" direction="in"/> -->
+  <!--  <arg type="b" name="remote" direction="in"/> -->
+  <!--  <arg type="s" name="remote_user" direction="in"/> -->
+  <!--  <arg type="s" name="remote_host" direction="in"/> -->
+  <!--  <arg type="a(sv)" name="properties" direction="in"/> -->
+  <!--  <arg type="s" name="session_id" direction="out"/> -->
+  <!--  <arg type="o" name="object_path" direction="out"/> -->
+  <!--  <arg type="s" name="runtime_path" direction="out"/> -->
+  <!--  <arg type="h" name="fifo_fd" direction="out"/> -->
+  <!--  <arg type="u" name="uid" direction="out"/> -->
+  <!--  <arg type="s" name="seat_id" direction="out"/> -->
+  <!--  <arg type="u" name="vtnr" direction="out"/> -->
+  <!--  <arg type="b" name="existing" direction="out"/> -->
+  <!--  <annotation name="org.freedesktop.systemd1.Privileged" value="true"/> -->
+  <!-- </method> -->
+  <!-- <method name="CreateSessionWithPIDFD"> -->
+  <!--  <arg type="u" name="uid" direction="in"/> -->
+  <!--  <arg type="h" name="pidfd" direction="in"/> -->
+  <!--  <arg type="s" name="service" direction="in"/> -->
+  <!--  <arg type="s" name="type" direction="in"/> -->
+  <!--  <arg type="s" name="class" direction="in"/> -->
+  <!--  <arg type="s" name="desktop" direction="in"/> -->
+  <!--  <arg type="s" name="seat_id" direction="in"/> -->
+  <!--  <arg type="u" name="vtnr" direction="in"/> -->
+  <!--  <arg type="s" name="tty" direction="in"/> -->
+  <!--  <arg type="s" name="display" direction="in"/> -->
+  <!--  <arg type="b" name="remote" direction="in"/> -->
+  <!--  <arg type="s" name="remote_user" direction="in"/> -->
+  <!--  <arg type="s" name="remote_host" direction="in"/> -->
+  <!--  <arg type="t" name="flags" direction="in"/> -->
+  <!--  <arg type="a(sv)" name="properties" direction="in"/> -->
+  <!--  <arg type="s" name="session_id" direction="out"/> -->
+  <!--  <arg type="o" name="object_path" direction="out"/> -->
+  <!--  <arg type="s" name="runtime_path" direction="out"/> -->
+  <!--  <arg type="h" name="fifo_fd" direction="out"/> -->
+  <!--  <arg type="u" name="uid" direction="out"/> -->
+  <!--  <arg type="s" name="seat_id" direction="out"/> -->
+  <!--  <arg type="u" name="vtnr" direction="out"/> -->
+  <!--  <arg type="b" name="existing" direction="out"/> -->
+  <!--  <annotation name="org.freedesktop.systemd1.Privileged" value="true"/> -->
+  <!-- </method> -->
+  <method name="ReleaseSession">
+   <arg type="s" name="session_id" direction="in"/>
+  </method>
+  <method name="ActivateSession">
+   <arg type="s" name="session_id" direction="in"/>
+  </method>
+  <method name="ActivateSessionOnSeat">
+   <arg type="s" name="session_id" direction="in"/>
+   <arg type="s" name="seat_id" direction="in"/>
+  </method>
+  <method name="LockSession">
+   <arg type="s" name="session_id" direction="in"/>
+  </method>
+  <method name="UnlockSession">
+   <arg type="s" name="session_id" direction="in"/>
+  </method>
+  <method name="LockSessions">
+  </method>
+  <method name="UnlockSessions">
+  </method>
+  <method name="KillSession">
+   <arg type="s" name="session_id" direction="in"/>
+   <arg type="s" name="whom" direction="in"/>
+   <arg type="i" name="signal_number" direction="in"/>
+  </method>
+  <method name="KillUser">
+   <arg type="u" name="uid" direction="in"/>
+   <arg type="i" name="signal_number" direction="in"/>
+  </method>
+  <method name="TerminateSession">
+   <arg type="s" name="session_id" direction="in"/>
+  </method>
+  <method name="TerminateUser">
+   <arg type="u" name="uid" direction="in"/>
+  </method>
+  <method name="TerminateSeat">
+   <arg type="s" name="seat_id" direction="in"/>
+  </method>
+  <method name="SetUserLinger">
+   <arg type="u" name="uid" direction="in"/>
+   <arg type="b" name="enable" direction="in"/>
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="AttachDevice">
+   <arg type="s" name="seat_id" direction="in"/>
+   <arg type="s" name="sysfs_path" direction="in"/>
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="FlushDevices">
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="PowerOff">
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="PowerOffWithFlags">
+   <arg type="t" name="flags" direction="in"/>
+  </method>
+  <method name="Reboot">
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="RebootWithFlags">
+   <arg type="t" name="flags" direction="in"/>
+  </method>
+  <method name="Halt">
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="HaltWithFlags">
+   <arg type="t" name="flags" direction="in"/>
+  </method>
+  <method name="Suspend">
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="SuspendWithFlags">
+   <arg type="t" name="flags" direction="in"/>
+  </method>
+  <method name="Hibernate">
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="HibernateWithFlags">
+   <arg type="t" name="flags" direction="in"/>
+  </method>
+  <method name="HybridSleep">
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="HybridSleepWithFlags">
+   <arg type="t" name="flags" direction="in"/>
+  </method>
+  <method name="SuspendThenHibernate">
+   <arg type="b" name="interactive" direction="in"/>
+  </method>
+  <method name="SuspendThenHibernateWithFlags">
+   <arg type="t" name="flags" direction="in"/>
+  </method>
+  <method name="Sleep">
+   <arg type="t" name="flags" direction="in"/>
+  </method>
+  <method name="CanPowerOff">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="CanReboot">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="CanHalt">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="CanSuspend">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="CanHibernate">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="CanHybridSleep">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="CanSuspendThenHibernate">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="CanSleep">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="ScheduleShutdown">
+   <arg type="s" name="type" direction="in"/>
+   <arg type="t" name="usec" direction="in"/>
+  </method>
+  <method name="CancelScheduledShutdown">
+   <arg type="b" name="cancelled" direction="out"/>
+  </method>
+  <method name="Inhibit">
+   <arg type="s" name="what" direction="in"/>
+   <arg type="s" name="who" direction="in"/>
+   <arg type="s" name="why" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="h" name="pipe_fd" direction="out"/>
+  </method>
+  <method name="CanRebootParameter">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="SetRebootParameter">
+   <arg type="s" name="parameter" direction="in"/>
+  </method>
+  <method name="CanRebootToFirmwareSetup">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="SetRebootToFirmwareSetup">
+   <arg type="b" name="enable" direction="in"/>
+  </method>
+  <method name="CanRebootToBootLoaderMenu">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="SetRebootToBootLoaderMenu">
+   <arg type="t" name="timeout" direction="in"/>
+  </method>
+  <method name="CanRebootToBootLoaderEntry">
+   <arg type="s" name="result" direction="out"/>
+  </method>
+  <method name="SetRebootToBootLoaderEntry">
+   <arg type="s" name="boot_loader_entry" direction="in"/>
+  </method>
+  <method name="SetWallMessage">
+   <arg type="s" name="wall_message" direction="in"/>
+   <arg type="b" name="enable" direction="in"/>
+  </method>
+  <signal name="SecureAttentionKey">
+   <arg type="s" name="seat_id"/>
+   <arg type="o" name="object_path"/>
+  </signal>
+  <signal name="SessionNew">
+   <arg type="s" name="session_id"/>
+   <arg type="o" name="object_path"/>
+  </signal>
+  <signal name="SessionRemoved">
+   <arg type="s" name="session_id"/>
+   <arg type="o" name="object_path"/>
+  </signal>
+  <signal name="UserNew">
+   <arg type="u" name="uid"/>
+   <arg type="o" name="object_path"/>
+  </signal>
+  <signal name="UserRemoved">
+   <arg type="u" name="uid"/>
+   <arg type="o" name="object_path"/>
+  </signal>
+  <signal name="SeatNew">
+   <arg type="s" name="seat_id"/>
+   <arg type="o" name="object_path"/>
+  </signal>
+  <signal name="SeatRemoved">
+   <arg type="s" name="seat_id"/>
+   <arg type="o" name="object_path"/>
+  </signal>
+  <signal name="PrepareForShutdown">
+   <arg type="b" name="start"/>
+  </signal>
+  <signal name="PrepareForShutdownWithMetadata">
+   <arg type="b" name="start"/>
+   <arg type="a{sv}" name="metadata"/>
+   <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
+  </signal>
+  <signal name="PrepareForSleep">
+   <arg type="b" name="start"/>
+  </signal>
+ </interface>
+ <node name="user"/>
+ <node name="session"/>
+ <node name="seat"/>
+</node>
+
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.login1.Session.xml b/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.login1.Session.xml
new file mode 100644
index 00000000..7d6fc8ee
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.login1.Session.xml
@@ -0,0 +1,146 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"https://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.freedesktop.login1.Session">
+  <property name="Id" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="User" type="o" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Name" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Timestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="TimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="VTNr" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Seat" type="o" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="TTY" type="s" access="read">
+  </property>
+  <property name="Display" type="s" access="read">
+  </property>
+  <property name="Remote" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="RemoteHost" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="RemoteUser" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Service" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Desktop" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Scope" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Leader" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Audit" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Type" type="s" access="read">
+  </property>
+  <!-- <property name="Class" type="s" access="read"> -->
+  <!-- </property> -->
+  <property name="Active" type="b" access="read">
+  </property>
+  <property name="State" type="s" access="read">
+  </property>
+  <property name="IdleHint" type="b" access="read">
+  </property>
+  <property name="IdleSinceHint" type="t" access="read">
+  </property>
+  <property name="IdleSinceHintMonotonic" type="t" access="read">
+  </property>
+  <property name="CanIdle" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="CanLock" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="LockedHint" type="b" access="read">
+  </property>
+  <method name="Terminate">
+  </method>
+  <method name="Activate">
+  </method>
+  <!-- <method name="Lock"> -->
+  <!-- </method> -->
+  <!-- <method name="Unlock"> -->
+  <!-- </method> -->
+  <method name="SetIdleHint">
+   <arg type="b" name="idle" direction="in"/>
+  </method>
+  <method name="SetLockedHint">
+   <arg type="b" name="locked" direction="in"/>
+  </method>
+  <method name="Kill">
+   <arg type="s" name="whom" direction="in"/>
+   <arg type="i" name="signal_number" direction="in"/>
+  </method>
+  <method name="TakeControl">
+   <arg type="b" name="force" direction="in"/>
+  </method>
+  <method name="ReleaseControl">
+  </method>
+  <method name="SetType">
+   <arg type="s" name="type" direction="in"/>
+  </method>
+  <!-- <method name="SetClass"> -->
+  <!--  <arg type="s" name="class" direction="in"/> -->
+  <!-- </method> -->
+  <method name="SetDisplay">
+   <arg type="s" name="display" direction="in"/>
+  </method>
+  <method name="SetTTY">
+   <arg type="h" name="tty_fd" direction="in"/>
+  </method>
+  <method name="TakeDevice">
+   <arg type="u" name="major" direction="in"/>
+   <arg type="u" name="minor" direction="in"/>
+   <arg type="h" name="fd" direction="out"/>
+   <arg type="b" name="inactive" direction="out"/>
+  </method>
+  <method name="ReleaseDevice">
+   <arg type="u" name="major" direction="in"/>
+   <arg type="u" name="minor" direction="in"/>
+  </method>
+  <method name="PauseDeviceComplete">
+   <arg type="u" name="major" direction="in"/>
+   <arg type="u" name="minor" direction="in"/>
+  </method>
+  <method name="SetBrightness">
+   <arg type="s" name="subsystem" direction="in"/>
+   <arg type="s" name="name" direction="in"/>
+   <arg type="u" name="brightness" direction="in"/>
+  </method>
+  <signal name="PauseDevice">
+   <arg type="u" name="major"/>
+   <arg type="u" name="minor"/>
+   <arg type="s" name="type"/>
+  </signal>
+  <signal name="ResumeDevice">
+   <arg type="u" name="major"/>
+   <arg type="u" name="minor"/>
+   <arg type="h" name="fd"/>
+  </signal>
+  <signal name="Lock">
+  </signal>
+  <signal name="Unlock">
+  </signal>
+ </interface>
+</node>
+
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.systemd1.Manager.xml b/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.systemd1.Manager.xml
new file mode 100644
index 00000000..b4f84a13
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/org.freedesktop.systemd1.Manager.xml
@@ -0,0 +1,817 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"https://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.freedesktop.systemd1.Manager">
+  <property name="Version" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Features" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Virtualization" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="ConfidentialVirtualization" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Architecture" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="Tainted" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="FirmwareTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="FirmwareTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="LoaderTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="LoaderTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="KernelTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="KernelTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="UserspaceTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="UserspaceTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="FinishTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="FinishTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="ShutdownStartTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="ShutdownStartTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="SecurityStartTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="SecurityStartTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="SecurityFinishTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="SecurityFinishTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="GeneratorsStartTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="GeneratorsStartTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="GeneratorsFinishTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="GeneratorsFinishTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="UnitsLoadStartTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="UnitsLoadStartTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="UnitsLoadFinishTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="UnitsLoadFinishTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="UnitsLoadTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="UnitsLoadTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDSecurityStartTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDSecurityStartTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDSecurityFinishTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDSecurityFinishTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDGeneratorsStartTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDGeneratorsStartTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDGeneratorsFinishTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDGeneratorsFinishTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDUnitsLoadStartTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDUnitsLoadStartTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDUnitsLoadFinishTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="InitRDUnitsLoadFinishTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="LogLevel" type="s" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="LogTarget" type="s" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="NNames" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="NFailedUnits" type="u" access="read">
+  </property>
+  <property name="NJobs" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="NInstalledJobs" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="NFailedJobs" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="Progress" type="d" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="Environment" type="as" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="ConfirmSpawn" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="ShowStatus" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="UnitPath" type="as" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultStandardOutput" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultStandardError" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="WatchdogDevice" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="WatchdogLastPingTimestamp" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="WatchdogLastPingTimestampMonotonic" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="RuntimeWatchdogUSec" type="t" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="RuntimeWatchdogPreUSec" type="t" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="RuntimeWatchdogPreGovernor" type="s" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="RebootWatchdogUSec" type="t" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="KExecWatchdogUSec" type="t" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="ServiceWatchdogs" type="b" access="readwrite">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </property>
+  <property name="ControlGroup" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="SystemState" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="ExitCode" type="y" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="DefaultTimerAccuracyUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultTimeoutStartUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultTimeoutStopUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultTimeoutAbortUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="DefaultDeviceTimeoutUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultRestartUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultStartLimitIntervalUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultStartLimitBurst" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultCPUAccounting" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultBlockIOAccounting" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultIOAccounting" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultIPAccounting" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultMemoryAccounting" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultTasksAccounting" type="b" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitCPU" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitCPUSoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitFSIZE" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitFSIZESoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitDATA" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitDATASoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitSTACK" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitSTACKSoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitCORE" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitCORESoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitRSS" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitRSSSoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitNOFILE" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitNOFILESoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitAS" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitASSoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitNPROC" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitNPROCSoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitMEMLOCK" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitMEMLOCKSoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitLOCKS" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitLOCKSSoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitSIGPENDING" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitSIGPENDINGSoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitMSGQUEUE" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitMSGQUEUESoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitNICE" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitNICESoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitRTPRIO" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitRTPRIOSoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitRTTIME" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultLimitRTTIMESoft" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultTasksMax" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="DefaultMemoryPressureThresholdUSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="DefaultMemoryPressureWatch" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false"/>
+  </property>
+  <property name="TimerSlackNSec" type="t" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultOOMPolicy" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="DefaultOOMScoreAdjust" type="i" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="CtrlAltDelBurstAction" type="s" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <property name="SoftRebootsCount" type="u" access="read">
+   <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/>
+  </property>
+  <method name="GetUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="o" name="unit" direction="out"/>
+  </method>
+  <method name="GetUnitByPID">
+   <arg type="u" name="pid" direction="in"/>
+   <arg type="o" name="unit" direction="out"/>
+  </method>
+  <method name="GetUnitByInvocationID">
+   <arg type="ay" name="invocation_id" direction="in"/>
+   <arg type="o" name="unit" direction="out"/>
+  </method>
+  <method name="GetUnitByControlGroup">
+   <arg type="s" name="cgroup" direction="in"/>
+   <arg type="o" name="unit" direction="out"/>
+  </method>
+  <method name="GetUnitByPIDFD">
+   <arg type="h" name="pidfd" direction="in"/>
+   <arg type="o" name="unit" direction="out"/>
+   <arg type="s" name="unit_id" direction="out"/>
+   <arg type="ay" name="invocation_id" direction="out"/>
+  </method>
+  <method name="LoadUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="o" name="unit" direction="out"/>
+  </method>
+  <method name="StartUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <method name="StartUnitWithFlags">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="t" name="flags" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <method name="StartUnitReplace">
+   <arg type="s" name="old_unit" direction="in"/>
+   <arg type="s" name="new_unit" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <method name="StopUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <method name="ReloadUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <method name="RestartUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <method name="TryRestartUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <method name="ReloadOrRestartUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <method name="ReloadOrTryRestartUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="mode" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <!-- <method name="EnqueueUnitJob"> -->
+  <!--  <arg type="s" name="name" direction="in"/> -->
+  <!--  <arg type="s" name="job_type" direction="in"/> -->
+  <!--  <arg type="s" name="job_mode" direction="in"/> -->
+  <!--  <arg type="u" name="job_id" direction="out"/> -->
+  <!--  <arg type="o" name="job_path" direction="out"/> -->
+  <!--  <arg type="s" name="unit_id" direction="out"/> -->
+  <!--  <arg type="o" name="unit_path" direction="out"/> -->
+  <!--  <arg type="s" name="job_type" direction="out"/> -->
+  <!--  <arg type="a(uosos)" name="affected_jobs" direction="out"/> -->
+  <!-- </method> -->
+  <method name="KillUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="whom" direction="in"/>
+   <arg type="i" name="signal" direction="in"/>
+  </method>
+  <method name="QueueSignalUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="whom" direction="in"/>
+   <arg type="i" name="signal" direction="in"/>
+   <arg type="i" name="value" direction="in"/>
+  </method>
+  <method name="CleanUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="as" name="mask" direction="in"/>
+  </method>
+  <method name="FreezeUnit">
+   <arg type="s" name="name" direction="in"/>
+  </method>
+  <method name="ThawUnit">
+   <arg type="s" name="name" direction="in"/>
+  </method>
+  <method name="ResetFailedUnit">
+   <arg type="s" name="name" direction="in"/>
+  </method>
+  <!-- <method name="SetUnitProperties"> -->
+  <!--  <arg type="s" name="name" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="a(sv)" name="properties" direction="in"/> -->
+  <!-- </method> -->
+  <method name="BindMountUnit">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="s" name="source" direction="in"/>
+   <arg type="s" name="destination" direction="in"/>
+   <arg type="b" name="read_only" direction="in"/>
+   <arg type="b" name="mkdir" direction="in"/>
+  </method>
+  <!-- <method name="MountImageUnit"> -->
+  <!--  <arg type="s" name="name" direction="in"/> -->
+  <!--  <arg type="s" name="source" direction="in"/> -->
+  <!--  <arg type="s" name="destination" direction="in"/> -->
+  <!--  <arg type="b" name="read_only" direction="in"/> -->
+  <!--  <arg type="b" name="mkdir" direction="in"/> -->
+  <!--  <arg type="a(ss)" name="options" direction="in"/> -->
+  <!-- </method> -->
+  <method name="RefUnit">
+   <arg type="s" name="name" direction="in"/>
+  </method>
+  <method name="UnrefUnit">
+   <arg type="s" name="name" direction="in"/>
+  </method>
+  <!-- <method name="StartTransientUnit"> -->
+  <!--  <arg type="s" name="name" direction="in"/> -->
+  <!--  <arg type="s" name="mode" direction="in"/> -->
+  <!--  <arg type="a(sv)" name="properties" direction="in"/> -->
+  <!--  <arg type="a(sa(sv))" name="aux" direction="in"/> -->
+  <!--  <arg type="o" name="job" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="GetUnitProcesses"> -->
+  <!--  <arg type="s" name="name" direction="in"/> -->
+  <!--  <arg type="a(sus)" name="processes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="AttachProcessesToUnit"> -->
+  <!--  <arg type="s" name="unit_name" direction="in"/> -->
+  <!--  <arg type="s" name="subcgroup" direction="in"/> -->
+  <!--  <arg type="au" name="pids" direction="in"/> -->
+  <!-- </method> -->
+  <method name="AbandonScope">
+   <arg type="s" name="name" direction="in"/>
+  </method>
+  <method name="GetJob">
+   <arg type="u" name="id" direction="in"/>
+   <arg type="o" name="job" direction="out"/>
+  </method>
+  <!-- <method name="GetJobAfter"> -->
+  <!--  <arg type="u" name="id" direction="in"/> -->
+  <!--  <arg type="a(usssoo)" name="jobs" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="GetJobBefore"> -->
+  <!--  <arg type="u" name="id" direction="in"/> -->
+  <!--  <arg type="a(usssoo)" name="jobs" direction="out"/> -->
+  <!-- </method> -->
+  <method name="CancelJob">
+   <arg type="u" name="id" direction="in"/>
+  </method>
+  <method name="ClearJobs">
+  </method>
+  <method name="ResetFailed">
+  </method>
+  <method name="SetShowStatus">
+   <arg type="s" name="mode" direction="in"/>
+  </method>
+  <!-- <method name="ListUnits"> -->
+  <!--  <arg type="a(ssssssouso)" name="units" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ListUnitsFiltered"> -->
+  <!--  <arg type="as" name="states" direction="in"/> -->
+  <!--  <arg type="a(ssssssouso)" name="units" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ListUnitsByPatterns"> -->
+  <!--  <arg type="as" name="states" direction="in"/> -->
+  <!--  <arg type="as" name="patterns" direction="in"/> -->
+  <!--  <arg type="a(ssssssouso)" name="units" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ListUnitsByNames"> -->
+  <!--  <arg type="as" name="names" direction="in"/> -->
+  <!--  <arg type="a(ssssssouso)" name="units" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ListJobs"> -->
+  <!--  <arg type="a(usssoo)" name="jobs" direction="out"/> -->
+  <!-- </method> -->
+  <method name="Subscribe">
+  </method>
+  <method name="Unsubscribe">
+  </method>
+  <method name="Dump">
+   <arg type="s" name="output" direction="out"/>
+  </method>
+  <method name="DumpUnitsMatchingPatterns">
+   <arg type="as" name="patterns" direction="in"/>
+   <arg type="s" name="output" direction="out"/>
+  </method>
+  <method name="DumpByFileDescriptor">
+   <arg type="h" name="fd" direction="out"/>
+  </method>
+  <method name="DumpUnitsMatchingPatternsByFileDescriptor">
+   <arg type="as" name="patterns" direction="in"/>
+   <arg type="h" name="fd" direction="out"/>
+  </method>
+  <method name="Reload">
+  </method>
+  <method name="Reexecute">
+   <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+  </method>
+  <method name="Exit">
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </method>
+  <method name="Reboot">
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </method>
+  <method name="SoftReboot">
+   <arg type="s" name="new_root" direction="in"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </method>
+  <method name="PowerOff">
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </method>
+  <method name="Halt">
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </method>
+  <method name="KExec">
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </method>
+  <method name="SwitchRoot">
+   <arg type="s" name="new_root" direction="in"/>
+   <arg type="s" name="init" direction="in"/>
+   <annotation name="org.freedesktop.systemd1.Privileged" value="true"/>
+  </method>
+  <method name="SetEnvironment">
+   <arg type="as" name="assignments" direction="in"/>
+  </method>
+  <method name="UnsetEnvironment">
+   <arg type="as" name="names" direction="in"/>
+  </method>
+  <method name="UnsetAndSetEnvironment">
+   <arg type="as" name="names" direction="in"/>
+   <arg type="as" name="assignments" direction="in"/>
+  </method>
+  <method name="EnqueueMarkedJobs">
+   <arg type="ao" name="jobs" direction="out"/>
+  </method>
+  <!-- <method name="ListUnitFiles"> -->
+  <!--  <arg type="a(ss)" name="unit_files" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ListUnitFilesByPatterns"> -->
+  <!--  <arg type="as" name="states" direction="in"/> -->
+  <!--  <arg type="as" name="patterns" direction="in"/> -->
+  <!--  <arg type="a(ss)" name="unit_files" direction="out"/> -->
+  <!-- </method> -->
+  <method name="GetUnitFileState">
+   <arg type="s" name="file" direction="in"/>
+   <arg type="s" name="state" direction="out"/>
+  </method>
+  <!-- <method name="EnableUnitFiles"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="b" name="force" direction="in"/> -->
+  <!--  <arg type="b" name="carries_install_info" direction="out"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="DisableUnitFiles"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="EnableUnitFilesWithFlags"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="t" name="flags" direction="in"/> -->
+  <!--  <arg type="b" name="carries_install_info" direction="out"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="DisableUnitFilesWithFlags"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="t" name="flags" direction="in"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="DisableUnitFilesWithFlagsAndInstallInfo"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="t" name="flags" direction="in"/> -->
+  <!--  <arg type="b" name="carries_install_info" direction="out"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="ReenableUnitFiles"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="b" name="force" direction="in"/> -->
+  <!--  <arg type="b" name="carries_install_info" direction="out"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="LinkUnitFiles"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="b" name="force" direction="in"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="PresetUnitFiles"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="b" name="force" direction="in"/> -->
+  <!--  <arg type="b" name="carries_install_info" direction="out"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="PresetUnitFilesWithMode"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="s" name="mode" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="b" name="force" direction="in"/> -->
+  <!--  <arg type="b" name="carries_install_info" direction="out"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="MaskUnitFiles"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="b" name="force" direction="in"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="UnmaskUnitFiles"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="RevertUnitFiles"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="SetDefaultTarget"> -->
+  <!--  <arg type="s" name="name" direction="in"/> -->
+  <!--  <arg type="b" name="force" direction="in"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <method name="GetDefaultTarget">
+   <arg type="s" name="name" direction="out"/>
+  </method>
+  <!-- <method name="PresetAllUnitFiles"> -->
+  <!--  <arg type="s" name="mode" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="b" name="force" direction="in"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="AddDependencyUnitFiles"> -->
+  <!--  <arg type="as" name="files" direction="in"/> -->
+  <!--  <arg type="s" name="target" direction="in"/> -->
+  <!--  <arg type="s" name="type" direction="in"/> -->
+  <!--  <arg type="b" name="runtime" direction="in"/> -->
+  <!--  <arg type="b" name="force" direction="in"/> -->
+  <!--  <arg type="a(sss)" name="changes" direction="out"/> -->
+  <!-- </method> -->
+  <method name="GetUnitFileLinks">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="b" name="runtime" direction="in"/>
+   <arg type="as" name="links" direction="out"/>
+  </method>
+  <method name="SetExitCode">
+   <arg type="y" name="number" direction="in"/>
+  </method>
+  <method name="LookupDynamicUserByName">
+   <arg type="s" name="name" direction="in"/>
+   <arg type="u" name="uid" direction="out"/>
+  </method>
+  <method name="LookupDynamicUserByUID">
+   <arg type="u" name="uid" direction="in"/>
+   <arg type="s" name="name" direction="out"/>
+  </method>
+  <!-- <method name="GetDynamicUsers"> -->
+  <!--  <arg type="a(us)" name="users" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="DumpUnitFileDescriptorStore"> -->
+  <!--  <arg type="s" name="name" direction="in"/> -->
+  <!--  <arg type="a(suuutuusu)" name="entries" direction="out"/> -->
+  <!-- </method> -->
+  <!-- <method name="StartAuxiliaryScope"> -->
+  <!--  <arg type="s" name="name" direction="in"/> -->
+  <!--  <arg type="ah" name="pidfds" direction="in"/> -->
+  <!--  <arg type="t" name="flags" direction="in"/> -->
+  <!--  <arg type="a(sv)" name="properties" direction="in"/> -->
+  <!--  <arg type="o" name="job" direction="out"/> -->
+  <!--  <annotation name="org.freedesktop.DBus.Deprecated" value="true"/> -->
+  <!-- </method> -->
+  <signal name="UnitNew">
+   <arg type="s" name="id"/>
+   <arg type="o" name="unit"/>
+  </signal>
+  <signal name="UnitRemoved">
+   <arg type="s" name="id"/>
+   <arg type="o" name="unit"/>
+  </signal>
+  <signal name="JobNew">
+   <arg type="u" name="id"/>
+   <arg type="o" name="job"/>
+   <arg type="s" name="unit"/>
+  </signal>
+  <signal name="JobRemoved">
+   <arg type="u" name="id"/>
+   <arg type="o" name="job"/>
+   <arg type="s" name="unit"/>
+   <arg type="s" name="result"/>
+  </signal>
+  <signal name="StartupFinished">
+   <arg type="t" name="firmware"/>
+   <arg type="t" name="loader"/>
+   <arg type="t" name="kernel"/>
+   <arg type="t" name="initrd"/>
+   <arg type="t" name="userspace"/>
+   <arg type="t" name="total"/>
+  </signal>
+  <signal name="UnitFilesChanged">
+  </signal>
+  <signal name="Reloading">
+   <arg type="b" name="active"/>
+  </signal>
+ </interface>
+ <node name="unit"/>
+ <node name="job"/>
+</node>
+
diff --git a/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml b/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml
new file mode 100644
index 00000000..ac1cbf3a
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml
@@ -0,0 +1,172 @@
+import QtQuick
+import qs.Services
+import Quickshell
+import Quickshell.Widgets
+
+Item {
+  id: activeWindowDisplay
+
+  required property int maxWidth
+  required property var screen
+
+  property var activeWindow: {
+    let currWindowId = Array.from(NiriService.workspaces).find(ws => {
+      return ws.output === screen?.name && ws.is_active;
+    })?.active_window_id;
+
+    return currWindowId ? Array.from(NiriService.windows).find(win => win.id == currWindowId) : null;
+  }
+  property var windowEntry: activeWindow ? DesktopEntries.heuristicLookup(activeWindow.app_id) : null
+
+  anchors.verticalCenter: parent.verticalCenter
+  width: activeWindowDisplayContent.width
+  height: parent.height
+
+  WrapperMouseArea {
+    id: widgetMouseArea
+
+    anchors.fill: parent
+
+    hoverEnabled: true
+
+    Item {
+      anchors.fill: parent
+
+      Row {
+        id: activeWindowDisplayContent
+
+        width: childrenRect.width
+        height: parent.height
+        anchors.verticalCenter: parent.verticalCenter
+        spacing: 8
+
+        IconImage {
+          id: activeWindowIcon
+
+          implicitSize: 14
+
+          anchors.verticalCenter: parent.verticalCenter
+
+          source: {
+            let icon = activeWindowDisplay.windowEntry?.icon
+            if (typeof icon === 'string' || icon instanceof String) {
+              if (icon.includes("?path=")) {
+                const split = icon.split("?path=")
+                if (split.length !== 2)
+                  return icon
+                const name = split[0]
+                const path = split[1]
+                const fileName = name.substring(
+                                 name.lastIndexOf("/") + 1)
+                return `file://${path}/${fileName}`
+              } else
+                icon = Quickshell.iconPath(icon);
+              return icon
+            }
+            return ""
+          }
+          asynchronous: true
+          smooth: true
+          mipmap: true
+        }
+
+        Text {
+          id: windowTitle
+
+          width: Math.min(implicitWidth, activeWindowDisplay.maxWidth - activeWindowIcon.width - activeWindowDisplayContent.spacing)
+
+          property var appAliases: { "Firefox": "Mozilla Firefox", "mpv Media Player": "mpv", "Thunderbird": "Mozilla Thunderbird", "Thunderbird (LMU)": "Mozilla Thunderbird" }
+
+          elide: Text.ElideRight
+          maximumLineCount: 1
+          color: "white"
+          anchors.verticalCenter: parent.verticalCenter
+          text: {
+            if (!activeWindowDisplay.activeWindow)
+              return "";
+
+            var title = activeWindowDisplay.activeWindow.title;
+            var appName = activeWindowDisplay.windowEntry?.name;
+            if (appAliases[appName])
+              appName = appAliases[appName];
+            if (appName && title.endsWith(appName)) {
+              const oldTitle = title;
+              title = title.substring(0, title.length - appName.length);
+              title = title.replace(/\s*(—|-)\s*$/, "");
+              if (!title)
+                title = oldTitle;
+            }
+            return title;
+          }
+        }
+      }
+    }
+  }
+
+  Loader {
+    id: tooltipLoader
+
+    active: false
+
+    Connections {
+      target: widgetMouseArea
+      function onContainsMouseChanged() {
+       if (widgetMouseArea.containsMouse)
+         tooltipLoader.active = true;
+      }
+    }
+
+    PopupWindow {
+      id: tooltip
+
+      property bool nextVisible: widgetMouseArea.containsMouse || tooltipMouseArea.containsMouse
+
+      anchor {
+        item: widgetMouseArea
+        edges: Edges.Bottom | Edges.Left
+      }
+      visible: false
+
+      onNextVisibleChanged: hangTimer.restart()
+
+      Timer {
+        id: hangTimer
+        interval: tooltip.visible ? 100 : 500
+        onTriggered: {
+          tooltip.visible = tooltip.nextVisible;
+          if (!tooltip.visible)
+            tooltipLoader.active = false;
+        }
+      }
+
+      implicitWidth: widgetTooltipText.contentWidth + 16
+      implicitHeight: widgetTooltipText.contentHeight + 16
+      color: "black"
+
+      WrapperMouseArea {
+        id: tooltipMouseArea
+
+        hoverEnabled: true
+        enabled: true
+
+        anchors.fill: parent
+
+        Item {
+          anchors.fill: parent
+
+          Text {
+            id: widgetTooltipText
+
+            anchors.centerIn: parent
+
+            font.pointSize: 10
+            font.family: "Fira Mono"
+            color: "white"
+
+            text: JSON.stringify(Object.assign({}, activeWindowDisplay.activeWindow), null, 2)
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Bar.qml b/accounts/gkleen@sif/shell/quickshell/Bar.qml
new file mode 100644
index 00000000..e8bd6245
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Bar.qml
@@ -0,0 +1,130 @@
+import Quickshell
+import Quickshell.Wayland
+import QtQuick
+import qs.Services
+
+PanelWindow {
+  id: bar
+
+  WlrLayershell.namespace: "bar"
+
+  property bool haveMaximizedWindow: {
+    let currWindowId = Array.from(NiriService.workspaces).find(ws => {
+      return ws.output === bar.screen.name && ws.is_active;
+    })?.active_window_id;
+    let activeWindowTileSize = Array.from(NiriService.windows).find(win => win.id == currWindowId)?.layout?.tile_size;
+
+    if (!activeWindowTileSize)
+      return false;
+    return activeWindowTileSize[0] >= bar.screen.width && activeWindowTileSize[1] >= bar.screen.height - bar.height;
+  }
+
+  anchors {
+    top: true
+    left: true
+    right: true
+  }
+  margins {
+    left: bar.haveMaximizedWindow ? 0 : 26 + 8
+    right: bar.haveMaximizedWindow ? 0 : 26 + 8
+  }
+
+  implicitHeight: 21
+  color: "transparent"
+
+  property bool haveScreenshare: Array.from(NiriService.casts).some(cast => cast.target.Output?.name == bar.screen.name)
+
+  Rectangle {
+    color: {
+      if (bar.haveScreenshare)
+        return bar.haveMaximizedWindow ? Qt.rgba(0.2, 0, 0, 1) : Qt.rgba(0.2, 0, 0, 0.75);
+      return bar.haveMaximizedWindow ? "black" : Qt.rgba(0, 0, 0, 0.75);
+    }
+    anchors.fill: parent
+    // bottomLeftRadius: 8
+    // bottomRightRadius: 8
+  }
+
+  Row {
+    id: left
+
+    height: parent.height
+    width: childrenRect.width
+    anchors.left: parent.left
+    anchors.leftMargin: 8
+    anchors.verticalCenter: parent.verticalCenter
+    spacing: 8
+
+    WorkspaceSwitcher {
+      screen: bar.screen
+    }
+  }
+
+  Row {
+    id: center
+
+    height: parent.height
+    width: childrenRect.width
+    anchors.centerIn: parent
+    spacing: 5
+
+    ActiveWindowDisplay {
+      screen: bar.screen
+      maxWidth: bar.width - 2*Math.max(left.width, right.width) - 2*8
+    }
+  }
+
+  Row {
+    id: right
+
+    height: parent.height
+    width: childrenRect.width
+    anchors.right: parent.right
+    anchors.rightMargin: 8
+    anchors.verticalCenter: parent.verticalCenter
+    spacing: 0
+
+    WorktimeWidget {}
+
+    KeyboardLayout {}
+
+    Item {
+      visible: privacy.visible
+      height: parent.height
+      width: 8 - 4
+    }
+
+    PrivacyWidget {
+      id: privacy
+    }
+
+    Item {
+      visible: privacy.visible
+      height: parent.height
+      width: 8 - 4
+    }
+
+    SystemTray {}
+
+    PipewireWidget {}
+
+    BrightnessWidget {}
+
+    BatteryWidget {}
+
+    WaylandInhibitorWidget {
+      window: bar
+    }
+
+    NotificationInhibitorWidget {}
+
+    LidSwitchInhibitorWidget {}
+
+    Item {
+      height: parent.height
+      width: 8 - 4
+    }
+
+    Clock {}
+  }
+}
\ No newline at end of file
diff --git a/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml b/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml
new file mode 100644
index 00000000..f465fa20
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/BatteryWidget.qml
@@ -0,0 +1,139 @@
+import QtQuick
+import Quickshell
+import Quickshell.Widgets
+import Quickshell.Services.UPower
+
+Item {
+  id: root
+
+  height: parent.height
+  width: batteryIcon.width + 8
+  anchors.verticalCenter: parent.verticalCenter
+
+  property var batteryDevice: Array.from(UPower.devices.values).find(dev => dev.isLaptopBattery)
+
+  WrapperMouseArea {
+    id: widgetMouseArea
+
+    anchors.fill: parent
+
+    hoverEnabled: true
+
+    Item {
+      anchors.fill: parent
+
+      MaterialDesignIcon {
+        id: batteryIcon
+
+        implicitSize: 14
+        anchors.centerIn: parent
+
+        icon: {
+          if (!root.batteryDevice?.ready)
+            return "battery-unknown";
+
+          if (root.batteryDevice.state == UPowerDeviceState.FullyCharged)
+            return "power-plug-battery";
+
+          const perdec = 10 * Math.max(1, Math.ceil(root.batteryDevice.percentage * 10));
+          if (root.batteryDevice.state == UPowerDeviceState.Charging)
+            return `battery-charging-${perdec}`;
+          if (perdec == 100)
+            return "battery";
+          return `battery-${perdec}`;
+        }
+        color: {
+          if (!root.batteryDevice?.ready)
+            return "#555";
+
+          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged && root.batteryDevice.state != UPowerDeviceState.Charging && root.batteryDevice.timeToEmpty < 20 * 60)
+            return "#f2201f";
+          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged && root.batteryDevice.state != UPowerDeviceState.Charging && root.batteryDevice.timeToEmpty < 40 * 60)
+            return "#f28a21";
+          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged)
+            return "#fff";
+          return "#555";
+        }
+      }
+    }
+  }
+
+  PopupWindow {
+    id: tooltip
+
+    property bool nextVisible: widgetMouseArea.containsMouse || tooltipMouseArea.containsMouse
+
+    anchor {
+      item: widgetMouseArea
+      edges: Edges.Bottom | Edges.Left
+    }
+    visible: false
+
+    onNextVisibleChanged: hangTimer.restart()
+
+    Timer {
+      id: hangTimer
+      interval: 100
+      onTriggered: tooltip.visible = tooltip.nextVisible
+    }
+
+    implicitWidth: widgetTooltipText.contentWidth + 16
+    implicitHeight: widgetTooltipText.contentHeight + 16
+    color: "black"
+
+    WrapperMouseArea {
+      id: tooltipMouseArea
+
+      hoverEnabled: true
+      enabled: true
+
+      anchors.fill: parent
+
+      Item {
+        anchors.fill: parent
+
+        Text {
+          id: widgetTooltipText
+
+          anchors.centerIn: parent
+
+          font.pointSize: 10
+          font.family: "Fira Sans"
+          color: "white"
+
+          text: {
+            if (!root.batteryDevice?.ready)
+              return "Not ready";
+
+            const stateStr = UPowerDeviceState.toString(root.batteryDevice.state);
+            var outStr = stateStr;
+            if (root.batteryDevice.state !== UPowerDeviceState.FullyCharged)
+              outStr += ` ${Math.round(root.batteryDevice.percentage * 100)}%`;
+
+            function formatTime(t) {
+              var res = "";
+              for (const unit of [{ "s": "h", "v": 3600 }, { "s": "m", "v": 60 }, { "s": "s", "v": 1 }]) {
+                if (t < unit.v)
+                  continue;
+                res += Math.floor(t / unit.v) + unit.s;
+                t %= unit.v;
+              }
+              return res;
+            }
+            if (root.batteryDevice.timeToEmpty != 0) {
+              const tStr = formatTime(Math.floor(root.batteryDevice.timeToEmpty / 60) * 60);
+              if (tStr)
+                outStr += " " + tStr;
+            } else if (root.batteryDevice.timeToFull != 0) {
+              const tStr = formatTime(Math.ceil(root.batteryDevice.timeToFull / 60) * 60);
+              if (tStr)
+                outStr += " " + tStr;
+            }
+
+            return outStr;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/BrightnessOSD.qml b/accounts/gkleen@sif/shell/quickshell/BrightnessOSD.qml
new file mode 100644
index 00000000..a432179e
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/BrightnessOSD.qml
@@ -0,0 +1,117 @@
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Widgets
+import qs.Services
+
+Scope {
+  id: root
+
+  property bool show: false
+  property bool inhibited: true
+
+  Connections {
+    target: Brightness
+
+    function onCurrBrightnessChanged() {
+      root.show = true;
+      hideTimer.restart();
+    }
+  }
+
+  onShowChanged: {
+    if (show)
+      hideTimer.restart();
+  }
+
+  Timer {
+    id: hideTimer
+    interval: 1000
+    onTriggered: root.show = false
+  }
+
+  Timer {
+    id: startInhibit
+    interval: 100
+    running: true
+    onTriggered: {
+      root.show = false;
+      root.inhibited = false;
+    }
+  }
+
+  LazyLoader {
+    active: root.show && !root.inhibited
+
+    Variants {
+      model: Quickshell.screens
+
+      delegate: Scope {
+        id: screenScope
+
+        required property var modelData
+
+        PanelWindow {
+          id: window
+
+          screen: screenScope.modelData
+
+          anchors.top: true
+          margins.top: screen.height / 2 - 50 + 3.5
+          exclusiveZone: 0
+          exclusionMode: ExclusionMode.Ignore
+
+          implicitWidth: 400
+          implicitHeight: 50
+
+          mask: Region {}
+
+          color: "transparent"
+
+          Rectangle {
+            anchors.fill: parent
+            color: Qt.rgba(0, 0, 0, 0.75)
+          }
+
+          RowLayout {
+            id: layout
+
+            anchors.centerIn: parent
+
+            height: 50 - 8*2
+            width: 400 - 8*2
+
+            MaterialDesignIcon {
+              id: volumeIcon
+
+              implicitWidth: parent.height
+              implicitHeight: parent.height
+
+              icon: `brightness-${Math.min(7, Math.floor(Brightness.currBrightness * 7) + 1)}`
+            }
+
+            Rectangle {
+              Layout.fillWidth: true
+
+              implicitHeight: 10
+
+              color: "#50ffffff"
+
+              Rectangle {
+                anchors {
+                  left: parent.left
+                  top: parent.top
+                  bottom: parent.bottom
+                }
+
+                color: "white"
+
+                implicitWidth: parent.width * Brightness.currBrightness
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/BrightnessWidget.qml b/accounts/gkleen@sif/shell/quickshell/BrightnessWidget.qml
new file mode 100644
index 00000000..3bb5a80e
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/BrightnessWidget.qml
@@ -0,0 +1,84 @@
+import QtQuick
+import Quickshell
+import Quickshell.Widgets
+import qs.Services
+
+Item {
+  height: parent.height
+  width: brightnessIcon.width + 8
+  anchors.verticalCenter: parent.verticalCenter
+
+  WrapperMouseArea {
+    id: widgetMouseArea
+
+    anchors.fill: parent
+
+    hoverEnabled: true
+
+    property real sensitivity: (1 / 50) / 120
+    onWheel: event => Brightness.currBrightness += event.angleDelta.y * sensitivity
+
+    Item {
+      anchors.fill: parent
+
+      MaterialDesignIcon {
+        id: brightnessIcon
+
+        implicitSize: 14
+        anchors.centerIn: parent
+
+        icon: `brightness-${Math.min(7, Math.floor(Brightness.currBrightness * 7) + 1)}`
+        color: "#555"
+      }
+    }
+  }
+
+  PopupWindow {
+    id: tooltip
+
+    property bool nextVisible: widgetMouseArea.containsMouse || tooltipMouseArea.containsMouse
+
+    anchor {
+      item: widgetMouseArea
+      edges: Edges.Bottom | Edges.Left
+    }
+    visible: false
+
+    onNextVisibleChanged: hangTimer.restart()
+
+    Timer {
+      id: hangTimer
+      interval: 100
+      onTriggered: tooltip.visible = tooltip.nextVisible
+    }
+
+    implicitWidth: widgetTooltipText.contentWidth + 16
+    implicitHeight: widgetTooltipText.contentHeight + 16
+    color: "black"
+
+    WrapperMouseArea {
+      id: tooltipMouseArea
+
+      hoverEnabled: true
+      enabled: true
+
+      anchors.fill: parent
+
+      Item {
+        anchors.fill: parent
+
+        Text {
+          id: widgetTooltipText
+
+          anchors.centerIn: parent
+
+          font.pointSize: 10
+          font.family: "Fira Sans"
+          color: "white"
+
+          text: `${Math.round(Brightness.currBrightness * 100)}%`
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
new file mode 100644
index 00000000..b7004528
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -0,0 +1,295 @@
+import QtQml
+import QtQuick
+import Quickshell
+import Custom as Custom
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Widgets
+
+Item {
+  id: clockItem
+
+  property bool calendarPopup: true
+
+  width: clock.contentWidth
+  height: parent.height
+  anchors.verticalCenter: parent.verticalCenter
+
+  WrapperMouseArea {
+    id: clockMouseArea
+
+    anchors.fill: parent
+    hoverEnabled: true
+    enabled: clockItem.calendarPopup
+
+    Item {
+      anchors.fill: parent
+
+      Text {
+        id: clock
+        color: "white"
+
+        anchors.verticalCenter: parent.verticalCenter
+
+        Custom.Chrono {
+          id: chrono
+
+          onDateChanged: clock.text = format("W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}")
+        }
+
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        font.features: { "tnum": 1 }
+      }
+    }
+  }
+
+  Loader {
+    id: tooltipLoader
+
+    active: false
+
+    Connections {
+      target: clockMouseArea
+      function onContainsMouseChanged() {
+       if (clockMouseArea.containsMouse)
+         tooltipLoader.active = true;
+      }
+    }
+
+    sourceComponent: PopupWindow {
+      id: tooltip
+
+      property bool nextVisible: clockMouseArea.containsMouse || tooltipMouseArea.containsMouse
+
+      anchor {
+        item: clockMouseArea
+        edges: Edges.Bottom | Edges.Left
+      }
+      visible: false
+
+      onNextVisibleChanged: hangTimer.restart()
+
+      Timer {
+        id: hangTimer
+        interval: 100
+        onTriggered: {
+          tooltip.visible = tooltip.nextVisible;
+          if (!tooltip.visible)
+            tooltipLoader.active = false;
+        }
+      }
+
+      implicitWidth: tooltipLayout.childrenRect.width + 16
+      implicitHeight: tooltipLayout.childrenRect.height + 16
+      color: "black"
+
+      onVisibleChanged: {
+        yearCalendar.year = chrono.date.getFullYear();
+        yearCalendar.angleRem = 0;
+      }
+
+      WrapperMouseArea {
+        id: tooltipMouseArea
+
+        hoverEnabled: true
+        enabled: true
+
+        onWheel: event => yearCalendar.scrollYear(event)
+
+        anchors.fill: parent
+
+        Item {
+          id: clockTooltipContent
+
+          anchors.fill: parent
+
+          ColumnLayout {
+            id: tooltipLayout
+
+            anchors {
+              left: parent.left
+              top: parent.top
+              leftMargin: 8
+              topMargin: 8
+            }
+
+            Text {
+              id: yearLabel
+
+              horizontalAlignment: Text.AlignHCenter
+
+              font.pointSize: 14
+              font.family: "Fira Sans"
+              font.features: { "tnum": 1 }
+              color: "white"
+
+              text: yearCalendar.year
+
+              Layout.fillWidth: true
+              Layout.bottomMargin: 8
+            }
+
+            GridLayout {
+              property int year: chrono.date.getFullYear()
+
+              id: yearCalendar
+
+              columns: 3
+              columnSpacing: 16
+              rowSpacing: 16
+
+              Layout.alignment: Qt.AlignHCenter
+              Layout.fillWidth: false
+
+              property real angleRem: 0
+              property real sensitivity: 1 / 120
+
+              function scrollYear(event) {
+                angleRem += event.angleDelta.y;
+                const d = Math.round(angleRem * sensitivity);
+                yearCalendar.year += d;
+                angleRem -= d / sensitivity;
+              }
+
+              Connections {
+                target: clockMouseArea
+                function onWheel(event) { yearCalendar.scrollYear(event); }
+              }
+
+              Repeater {
+                model: 12
+
+                GridLayout {
+                  columns: 2
+
+                  required property int index
+                  property int month: index
+
+                  id: monthCalendar
+
+                  Layout.alignment: Qt.AlignTop | Qt.AlignRight
+                  Layout.fillWidth: false
+
+                  Text {
+                    Layout.column: 1
+                    Layout.fillWidth: true
+
+                    horizontalAlignment: Text.AlignHCenter
+
+                    font.pointSize: 10
+                    font.family: "Fira Sans"
+
+                    text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM")
+
+                    color: "#ffead3"
+                  }
+
+                  DayOfWeekRow {
+                    locale: grid.locale
+
+                    Layout.row: 1
+                    Layout.column: 1
+                    Layout.fillWidth: true
+
+                    delegate: WrapperItem {
+                      required property string shortName
+
+                      width: dowLabel.contentWidth + 6
+
+                      Text {
+                        id: dowLabel
+
+                        anchors.fill: parent
+
+                        font.pointSize: 10
+                        font.family: "Fira Sans"
+
+                        text: parent.shortName
+                        color: "#ffcc66"
+
+                        horizontalAlignment: Text.AlignHCenter
+                        verticalAlignment: Text.AlignVCenter
+                      }
+                    }
+                  }
+
+                  WeekNumberColumn {
+                    month: grid.month
+                    year: grid.year
+                    locale: grid.locale
+
+                    Layout.fillHeight: true
+
+                    delegate: Text {
+                      required property int weekNumber
+
+                      opacity: {
+                        const simple = new Date(weekNumber == 1 && monthCalendar.month == 12 ? yearCalendar.year + 1 : yearCalendar.year, 0, 1 + (weekNumber - 1) * 7);
+                        const dayOfWeek = simple.getDay();
+                        const isoWeekStart = simple;
+
+                        isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1);
+                        if (dayOfWeek > 4) {
+                            isoWeekStart.setDate(isoWeekStart.getDate() + 7);
+                        }
+
+                        for (let i = 0; i < 7; i++) {
+                          const dayInWeek = new Date(isoWeekStart);
+                          dayInWeek.setDate(dayInWeek.getDate() + i);
+                          if (dayInWeek.getMonth() == monthCalendar.month)
+                            return 1;
+                        }
+
+                        return 0;
+                      }
+
+                      font.pointSize: 10
+                      font.family: "Fira Sans"
+                      font.features: { "tnum": 1 }
+
+                      text: weekNumber
+                      color: "#99ffdd"
+
+                      horizontalAlignment: Text.AlignRight
+                      verticalAlignment: Text.AlignVCenter
+                    }
+                  }
+
+                  MonthGrid {
+                    id: grid
+
+                    year: yearCalendar.year
+                    month: monthCalendar.month
+                    locale: Qt.locale("en_DK")
+
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+
+                    delegate: Text {
+                        required property var model
+
+                        opacity: model.month === monthCalendar.month ? 1 : 0
+
+                        font.pointSize: 10
+                        font.family: "Fira Sans"
+                        font.features: { "tnum": 1 }
+
+                        property bool today: chrono.date.getFullYear() == model.year && chrono.date.getMonth() == model.month && chrono.date.getDate() == model.day
+
+                        text: model.day
+                        color: today ? "#ff6699" : "white"
+
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
new file mode 100644
index 00000000..46302e54
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
@@ -0,0 +1,112 @@
+import Quickshell
+import QtQuick
+import qs.Services
+import Quickshell.Widgets
+
+Item {
+  width: kbdLabel.contentWidth + 8
+  height: parent.height
+  anchors.verticalCenter: parent.verticalCenter
+
+  WrapperMouseArea {
+    id: kbdMouseArea
+
+    anchors.fill: parent
+
+    hoverEnabled: true
+    cursorShape: Qt.PointingHandCursor
+    enabled: true
+    onClicked: {
+      NiriService.sendCommand({ "Action": { "SwitchLayout": { "layout": "Next" } } }, _ => {})
+    }
+    onWheel: event => {
+      NiriService.sendCommand({ "Action": { "SwitchLayout": { "layout": event.angleDelta > 0 ? "Next" : "Prev" } } }, _ => {})
+    }
+
+    Rectangle {
+      id: kbdWidget
+
+      property var keyboardAbbrev: { "English (programmer Dvorak)": "dvp", "English (US)": "us" }
+
+      anchors.fill: parent
+      color: {
+        if (kbdMouseArea.containsMouse) {
+          return "#33808080";
+        }
+        return "transparent";
+      }
+
+      Text {
+        id: kbdLabel
+
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        color: {
+          if (NiriService.keyboardLayouts?.current_idx === 0)
+            return "#555";
+          return "white";
+        }
+        anchors.centerIn: parent
+
+        text: {
+          const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
+          if (!currentLayout)
+            return "";
+          return kbdWidget.keyboardAbbrev[currentLayout] ? kbdWidget.keyboardAbbrev[currentLayout] : currentLayout;
+        }
+      }
+    }
+  }
+
+  PopupWindow {
+    id: tooltip
+
+    property bool nextVisible: kbdMouseArea.containsMouse || tooltipMouseArea.containsMouse
+
+    anchor {
+      item: kbdMouseArea
+      edges: Edges.Bottom | Edges.Left
+    }
+    visible: false
+
+    onNextVisibleChanged: hangTimer.restart()
+
+    Timer {
+      id: hangTimer
+      interval: 100
+      onTriggered: tooltip.visible = tooltip.nextVisible
+    }
+
+    implicitWidth: kbdTooltipText.contentWidth + 16
+    implicitHeight: kbdTooltipText.contentHeight + 16
+    color: "black"
+
+    WrapperMouseArea {
+      id: tooltipMouseArea
+
+      hoverEnabled: true
+      enabled: true
+
+      anchors.fill: parent
+
+      Item {
+        anchors.fill: parent
+
+        Text {
+          id: kbdTooltipText
+
+          anchors.centerIn: parent
+
+          font.pointSize: 10
+          font.family: "Fira Sans"
+          color: "white"
+
+          text: {
+            const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
+            return currentLayout || "";
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/LidSwitchInhibitorWidget.qml b/accounts/gkleen@sif/shell/quickshell/LidSwitchInhibitorWidget.qml
new file mode 100644
index 00000000..8410dcda
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/LidSwitchInhibitorWidget.qml
@@ -0,0 +1,47 @@
+import Quickshell
+import QtQuick
+import Quickshell.Widgets
+import qs.Services
+
+Item {
+  id: root
+
+  width: icon.width + 8
+  height: parent.height
+  anchors.verticalCenter: parent.verticalCenter
+
+  WrapperMouseArea {
+    id: widgetMouseArea
+
+    anchors.fill: parent
+
+    hoverEnabled: true
+    cursorShape: Qt.PointingHandCursor
+
+    onClicked: InhibitorState.lidSwitchInhibited = !InhibitorState.lidSwitchInhibited
+
+    Rectangle {
+      anchors.fill: parent
+      color: {
+        if (widgetMouseArea.containsMouse) {
+          return "#33808080";
+        }
+        return "transparent";
+      }
+
+      Item {
+        anchors.fill: parent
+
+        MaterialDesignIcon {
+          id: icon
+
+          implicitSize: 14
+          anchors.centerIn: parent
+
+          icon: InhibitorState.lidSwitchInhibited ? "laptop-off" : "laptop"
+          color: InhibitorState.lidSwitchInhibited ? "#f28a21" : "#555"
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/LockSurface.qml b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml
new file mode 100644
index 00000000..f4f8f0cd
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml
@@ -0,0 +1,227 @@
+import Quickshell.Widgets
+import QtQuick.Effects
+import QtQuick.Layouts
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Fusion
+import qs.Services
+import QtQml
+
+Item {
+  id: lockSurface
+
+  property var screen
+  property list<var> messages: []
+  property bool responseRequired: false
+  property bool responseVisible: false
+  property string currentText: ""
+  property bool authRunning: false
+
+  signal response(string responseText)
+
+  anchors.fill: parent
+
+  Item {
+    id: background
+
+    anchors.fill: parent
+
+    property Img current: one
+    property string source: selector.selected
+
+    WallpaperSelector {
+      id: selector
+      seed: lockSurface.screen?.name || ""
+    }
+
+    onSourceChanged: {
+      if (!source)
+        current = null;
+      else if (current === one)
+        two.update()
+      else
+        one.update()
+    }
+
+    Img { id: one }
+    Img { id: two }
+
+    component Img: Item {
+      id: img
+
+      property string source
+
+      function update() {
+        source = background.source || ""
+      }
+
+      anchors.fill: parent
+
+      Image {
+        id: imageSource
+
+        source: img.source
+        sourceSize: Qt.size(parent.width, parent.height)
+        fillMode: Image.PreserveAspectCrop
+        smooth: true
+        visible: false
+        asynchronous: true
+        cache: false
+
+        onStatusChanged: {
+          if (status === Image.Ready) {
+            background.current = img
+          }
+        }
+      }
+
+      MultiEffect {
+        id: imageEffect
+
+        source: imageSource
+        anchors.fill: parent
+        blurEnabled: true
+        blur: 1
+        blurMax: 64
+        blurMultiplier: 2
+
+        opacity: 0
+
+        states: State {
+          name: "visible"
+          when: background.current === img
+
+          PropertyChanges {
+            imageEffect.opacity: 1
+          }
+          StateChangeScript {
+            name: "unloadOther"
+            script: {
+              if (img === one)
+                two.source = ""
+              if (img === two)
+                one.source = ""
+            }
+          }
+        }
+
+        transitions: Transition {
+          SequentialAnimation {
+            NumberAnimation {
+              target: imageEffect
+              properties: "opacity"
+              duration: {
+                if (img === one && two.source == "" || img === two && one.source == "")
+                  return 0;
+                return 5000;
+              }
+              easing.type: Easing.OutCubic
+            }
+            ScriptAction {
+              scriptName: "unloadOther"
+            }
+          }
+        }
+      }
+    }
+  }
+
+  Item {
+    anchors {
+      top: lockSurface.top
+      left: lockSurface.left
+      right: lockSurface.right
+    }
+
+    implicitWidth: lockSurface.width
+    implicitHeight: 21
+
+    Rectangle {
+      anchors.fill: parent
+      color: Qt.rgba(0, 0, 0, 0.75)
+    }
+
+    Clock {
+      anchors.centerIn: parent
+      calendarPopup: false
+    }
+  }
+
+  WrapperRectangle {
+    id: unlockUi
+
+    Keys.onPressed: event => {
+      if (!lockSurface.authRunning) {
+        event.accepted = true;
+        lockSurface.authRunning = true;
+      }
+    }
+    focus: !passwordBox.visible
+
+    visible: lockSurface.authRunning
+
+    color: Qt.rgba(0, 0, 0, 0.75)
+    margin: 8
+
+    anchors.centerIn: parent
+
+    ColumnLayout {
+      spacing: 4
+
+      BusyIndicator {
+        visible: running
+        running: !Array.from(lockSurface.messages).length && !lockSurface.responseRequired
+      }
+
+      Repeater {
+        model: lockSurface.messages
+
+        Text {
+          required property var modelData
+
+          font.pointSize: 10
+          font.family: "Fira Sans"
+          color: modelData.error ? "#f28a21" : "#ffffff"
+
+          text: String(modelData.text).trim()
+
+          Layout.fillWidth: true
+          horizontalAlignment: Text.AlignHCenter
+        }
+      }
+
+      TextField {
+        id: passwordBox
+
+        visible: lockSurface.responseRequired
+        echoMode: lockSurface.responseVisible ? TextInput.Normal : TextInput.Password
+        inputMethodHints: Qt.ImhSensitiveData
+
+        onTextChanged: lockSurface.currentText = passwordBox.text
+        onAccepted: {
+          passwordBox.readOnly = true;
+          lockSurface.response(lockSurface.currentText);
+        }
+
+        Connections {
+          target: lockSurface
+          function onCurrentTextChanged() {
+            passwordBox.text = lockSurface.currentText
+          }
+        }
+        Connections {
+          target: lockSurface
+          function onResponseRequiredChanged() {
+            if (lockSurface.responseRequired)
+              passwordBox.readOnly = false;
+              passwordBox.focus = true;
+              passwordBox.selectAll();
+          }
+        }
+
+        Layout.topMargin: 4
+        Layout.fillWidth: true
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
new file mode 100644
index 00000000..30fa68b5
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
@@ -0,0 +1,128 @@
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Io
+import Quickshell.Services.Pam
+import Quickshell.Services.Mpris
+import Custom as Custom
+import qs.Services
+import QtQml
+
+Scope {
+  id: lockscreen
+
+  property string currentText: ""
+
+  PamContext {
+    id: pam
+
+    property list<var> messages: []
+
+    config: "quickshell"
+    onCompleted: result => {
+      if (result === PamResult.Success) {
+        lock.locked = false;
+      }
+    }
+    onPamMessage: {
+      messages = Array.from(messages).concat([{ "text": pam.message, "error": pam.messageIsError }])
+    }
+    onActiveChanged: {
+      messages = [];
+    }
+  }
+
+  Connections {
+    target: Custom.Systemd
+    function onSleep(before: bool) {
+      console.log(`received prepare for sleep ${before}`);
+      if (before) {
+        lock.locked = true;
+        if (pam.active)
+          pam.abort();
+      }
+    }
+    function onLock() { lock.locked = true; }
+    function onUnlock() { lock.locked = false; }
+  }
+
+  IdleMonitor {
+    id: idleMonitor
+    enabled: !lock.secure
+    timeout: 600
+    respectInhibitors: true
+
+    onIsIdleChanged: {
+      if (idleMonitor.isIdle)
+        lock.locked = true;
+    }
+  }
+
+  Custom.SystemdInhibitor {
+    enabled: !lock.secure
+
+    what: Custom.SystemdInhibitorParams.Sleep
+    who: "quickshell"
+    why: "Lock session"
+    mode: Custom.SystemdInhibitorParams.Delay
+  }
+
+  Binding {
+    target: NotificationManager
+    property: "lockscreenActive"
+    value: lock.locked
+  }
+
+  WlSessionLock {
+    id: lock
+
+    onLockStateChanged: {
+      if (!locked && pam.active)
+        pam.abort();
+
+      if (locked) {
+        NiriService.sendCommand({ "Action": { "PowerOffMonitors": {} } }, _ => {});
+        Custom.KeePassXC.lockAllDatabases();
+        Array.from(MprisProxy.players).forEach(player => {
+          if (player.canPause && player.isPlaying)
+            player.pause();
+        });
+        // Custom.Systemd.stopUserUnit("gpg-agent.service", "replace");
+        GpgAgent.reloadAgent();
+      }
+    }
+    Component.onCompleted: { (_ => {})(MprisProxy.players); }
+
+    onSecureStateChanged: Custom.Systemd.lockedHint = lock.secure
+
+    WlSessionLockSurface {
+      id: lockSurface
+
+      color: "black"
+
+      LockSurface {
+        id: surfaceContent
+
+        onResponse: responseText => pam.respond(responseText)
+        onAuthRunningChanged: {
+          if (authRunning)
+            pam.start();
+        }
+        Connections {
+          target: pam
+          function onMessagesChanged() { surfaceContent.messages = pam.messages; }
+          function onResponseRequiredChanged() { surfaceContent.responseRequired = pam.responseRequired; }
+          function onActiveChanged() { surfaceContent.authRunning = pam.active; }
+        }
+        onCurrentTextChanged: lockscreen.currentText = currentText
+        Connections {
+          target: lockscreen
+          function onCurrentTextChanged() { surfaceContent.currentText = lockscreen.currentText; }
+        }
+        Connections {
+          target: lockSurface
+          function onScreenChanged() { surfaceContent.screen = lockSurface.screen; }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/MaterialDesignIcon.qml b/accounts/gkleen@sif/shell/quickshell/MaterialDesignIcon.qml
new file mode 100644
index 00000000..155a009e
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/MaterialDesignIcon.qml
@@ -0,0 +1,35 @@
+import QtQuick
+import QtQuick.Effects
+
+Item {
+  id: root
+
+  required property string icon
+  property color color: "white"
+
+  property real implicitSize: 0
+
+  readonly property real actualSize: Math.min(root.width, root.height)
+
+  implicitWidth: root.implicitSize
+  implicitHeight: root.implicitSize
+
+  Image {
+    id: sourceImage
+    source: "file://" + @mdi@ + "/svg/" + root.icon + ".svg"
+    anchors.fill: parent
+    fillMode: Image.PreserveAspectFit
+
+    sourceSize.width: root.actualSize
+    sourceSize.height: root.actualSize
+
+    layer.enabled: true
+    layer.effect: MultiEffect {
+      id: effect
+
+      brightness: 1
+      colorization: 1
+      colorizationColor: root.color
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml b/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml
new file mode 100644
index 00000000..beff205c
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/NiriIdle.qml
@@ -0,0 +1,30 @@
+import QtQml
+import Quickshell
+import Quickshell.Wayland
+import qs.Services
+import Custom as Custom
+
+Scope {
+  IdleMonitor {
+    id: idleMonitor30
+    timeout: 30
+
+    onIsIdleChanged: Custom.Systemd.setIdleHint(idleMonitor30.isIdle)
+  }
+  IdleMonitor {
+    id: idleMonitor540
+    timeout: 540
+
+    onIsIdleChanged: {
+      if (idleMonitor540.isIdle)
+        NiriService.sendCommand({ "Action": { "PowerOffMonitors": {} } }, _ => {});
+    }
+  }
+  Connections {
+    target: Custom.Systemd
+    function onSleep(before: bool) {
+      if (!before)
+        NiriService.sendCommand({ "Action": { "PowerOnMonitors": {} } }, _ => {});
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/NotificationDisplay.qml b/accounts/gkleen@sif/shell/quickshell/NotificationDisplay.qml
new file mode 100644
index 00000000..cc0e49b1
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/NotificationDisplay.qml
@@ -0,0 +1,340 @@
+import QtQml
+import QtQml.Models
+import QtQuick
+import Quickshell
+import Quickshell.Widgets
+import Quickshell.Wayland
+import qs.Services
+import QtQuick.Layouts
+import Quickshell.Services.Notifications
+
+Scope {
+  id: root
+
+  property var activeScreen: Array.from(Quickshell.screens).find(screen => screen.name === Array.from(NiriService.workspaces).find(ws => ws.is_focused)?.output) ?? null
+
+  Instantiator {
+    id: notifsRepeater
+
+    model: ScriptModel {
+      values: NotificationManager.groups
+    }
+
+    delegate: PanelWindow {
+      id: notifWindow
+
+      visible: NotificationManager.active
+
+      screen: root.activeScreen
+
+      WlrLayershell.namespace: "notifications"
+
+      required property var modelData
+      required property var index
+
+      property int activeIx: modelData.length - 1
+      onModelDataChanged: {
+        notifWindow.activeIx = modelData.length - 1;
+      }
+
+      property color textColor: {
+        if (notifWindow.modelData?.[notifWindow.activeIx]?.urgency == NotificationUrgency.Low)
+          return "#ff999999";
+        return "white";
+      }
+      property color backgroundColor: {
+        if (notifWindow.modelData?.[notifWindow.activeIx]?.urgency == NotificationUrgency.Critical)
+          return "#dd900000";
+        return "black";
+      }
+
+      anchors {
+        right: true
+        top: true
+      }
+
+      readonly property real spaceAbove: {
+        var res = 0;
+        for (let i = 0; i < notifWindow.index; i++) {
+          (_ => {})(notifsRepeater.objectAt(i).modelData);
+          res += notifsRepeater.objectAt(i).height + 8;
+        }
+        return res;
+      }
+
+      margins {
+        right: 26 + 8
+        top: 8 + spaceAbove
+      }
+
+      color: "transparent"
+
+      implicitHeight: Math.max(notifCount.visible ? notifCount.contentHeight : 0, notifSummary.contentHeight) + (notifBody.visible ? 8 + notifBody.contentHeight : 0) + (notifActions.visible ? 8 + notifActions.height : 0) + (notifTime.visible ? 8 + notifTime.contentHeight : 0) + 16
+      implicitWidth: 400
+
+      WrapperMouseArea {
+        enabled: true
+
+        anchors.fill: parent
+
+        cursorShape: Qt.PointingHandCursor
+
+        onClicked: {
+          for (const notif of notifWindow.modelData)
+            notif.dismiss();
+        }
+
+        property real angleRem: 0
+        property real sensitivity: 1 / 120
+        onWheel: event => {
+          angleRem += event.angleDelta.y;
+          const d = Math.round(angleRem * sensitivity);
+          angleRem -= d / sensitivity;
+          notifWindow.activeIx = ((notifWindow.modelData?.length ?? 1) + notifWindow.activeIx - d) % (notifWindow.modelData?.length ?? 1);
+        }
+
+        Rectangle {
+          color: notifWindow.backgroundColor
+          anchors.fill: parent
+          border {
+            color: Qt.hsla(195/360, 1, 0.45, 1)
+            width: 2
+          }
+
+          GridLayout {
+            id: notifLayout
+
+            width: 400 - 16
+            anchors.fill: parent
+            anchors.margins: 8
+            columnSpacing: 8
+            rowSpacing: 8
+
+            columns: notifImage.visible ? 3 : 2
+            rows: {
+              var res = 1;
+              if (notifBody.visible)
+                res += 1;
+              if (notifActions.visible)
+                res += 1;
+              if (notifTime.visible)
+                res += 1;
+              return res;
+            }
+
+            Text {
+              id: notifCount
+
+              visible: notifWindow.modelData?.length > 1 ?? false
+              text: `${notifWindow.activeIx + 1}/${notifWindow.modelData?.length ?? ""}`
+
+              font.pointSize: 10
+              font.family: "Fira Sans"
+              font.bold: true
+              font.features: { "tnum": 1 }
+              color: notifWindow.textColor
+              maximumLineCount: 1
+
+              Layout.fillWidth: false
+              Layout.row: 0
+              Layout.column: notifImage.visible ? 1 : 0
+            }
+
+            Text {
+              id: notifSummary
+
+              text: notifWindow.modelData?.[notifWindow.activeIx]?.summary ?? ""
+
+              font.pointSize: 10
+              font.family: "Fira Sans"
+              font.italic: true
+              color: notifWindow.textColor
+              maximumLineCount: 1
+              elide: Text.ElideRight
+
+              Layout.fillWidth: true
+              Layout.row: 0
+              Layout.column: (notifCount.visible ? 1 : 0) + (notifImage.visible ? 1 : 0)
+              Layout.columnSpan: notifCount.visible ? 1 : 2
+            }
+
+            Image {
+              id: notifImage
+
+              visible: (notifWindow.modelData?.[notifWindow.activeIx]?.image || notifWindow.modelData?.[notifWindow.activeIx]?.appIcon) ?? false
+
+              onStatusChanged: {
+                if (notifImage.status == Image.Error)
+                  notifImage.visible = false;
+              }
+
+              source: (notifWindow.modelData?.[notifWindow.activeIx]?.image || notifWindow.modelData?.[notifWindow.activeIx]?.appIcon) ?? ""
+              fillMode: Image.PreserveAspectFit
+              asynchronous: true
+              smooth: true
+              mipmap: true
+
+              Layout.maximumWidth: 50
+              Layout.column: 0
+              Layout.row: 0
+              Layout.fillHeight: true
+              Layout.rowSpan: 1 + (notifBody.visible ? 1 : 0) + (notifTime.visible ? 1 : 0)
+            }
+
+            Text {
+              id: notifBody
+
+              visible: notifWindow.modelData?.[notifWindow.activeIx]?.body ?? false
+              text: notifWindow.modelData?.[notifWindow.activeIx]?.body ?? ""
+              textFormat: Text.RichText
+              wrapMode: Text.Wrap
+
+              font.pointSize: 10
+              font.family: "Fira Sans"
+              color: notifWindow.textColor
+
+              Layout.fillWidth: true
+              Layout.row: 1
+              Layout.column: notifImage.visible ? 1 : 0
+              Layout.columnSpan: notifCount.visible ? 2 : 1
+            }
+
+            Text {
+              id: notifTime
+
+              Connections {
+                target: NotificationManager.clock
+                function onDateChanged() {
+                  notifTime.text = NotificationManager.formatTime(notifWindow.modelData?.[notifWindow.activeIx]?.receivedTime);
+                }
+              }
+
+              visible: notifTime.text && notifTime.text !== "now"
+              text: NotificationManager.formatTime(notifWindow.modelData?.[notifWindow.activeIx]?.receivedTime)
+
+              font.pointSize: 8
+              font.family: "Fira Sans"
+              font.italic: true
+              color: "#555"
+              maximumLineCount: 1
+              horizontalAlignment: Text.AlignRight
+
+              Layout.fillWidth: true
+              Layout.row: notifBody.visible ? 2 : 1
+              Layout.column: notifImage.visible ? 1 : 0
+              Layout.columnSpan: 2
+            }
+
+            RowLayout {
+              id: notifActions
+
+              visible: notifWindow.modelData?.[notifWindow.activeIx]?.actions.length > 0 ?? false
+
+              spacing: 8
+              uniformCellSizes: true
+
+              width: 400 - 16
+              Layout.row: 1 + (notifBody.visible ? 1 : 0) + (notifTime.visible ? 1 : 0)
+              Layout.column: 0
+              Layout.columnSpan: 2 + (notifImage.visible ? 1 : 0)
+
+              Repeater {
+                model: ScriptModel {
+                  values: notifWindow.modelData?.[notifWindow.activeIx]?.actions
+                }
+
+                delegate: WrapperMouseArea {
+                  id: actionMouseArea
+
+                  required property var modelData
+
+                  height: actionLabelWrapper.implicitHeight
+                  Layout.fillWidth: true
+                  Layout.horizontalStretchFactor: 1
+
+                  hoverEnabled: true
+                  cursorShape: Qt.PointingHandCursor
+
+                  onClicked: actionMouseArea.modelData?.invoke()
+
+                  Rectangle {
+                    anchors.fill: parent
+
+                    color: actionMouseArea.containsMouse ? "#20ffffff" : "transparent"
+
+                    border {
+                      width: 2
+                      color: "#20ffffff"
+                    }
+
+                    WrapperItem {
+                      id: actionLabelWrapper
+
+                      margin: 8
+                      anchors.centerIn: parent
+
+                      RowLayout {
+                        id: actionLabelLayout
+
+                        spacing: 8
+
+                        IconImage {
+                          id: actionIcon
+
+                          visible: notifWindow.modelData?.[notifWindow.activeIx]?.hasActionIcons
+
+                          onStatusChanged: {
+                            if (actionIcon.status == Image.Error)
+                              actionIcon.visible = false;
+                          }
+
+                          implicitSize: 16
+                          source: {
+                            if (!actionIcon.visible)
+                              return "";
+
+                            let icon = actionMouseArea.modelData?.identifier ?? ""
+                            if (icon.includes("?path=")) {
+                              const split = icon.split("?path=")
+                              if (split.length !== 2)
+                                return icon
+                              const name = split[0]
+                              const path = split[1]
+                              const fileName = name.substring(
+                                               name.lastIndexOf("/") + 1)
+                              return `file://${path}/${fileName}`
+                            }
+                            return icon
+                          }
+                          asynchronous: true
+                          smooth: true
+                          mipmap: true
+
+                          Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+                        }
+
+                        Text {
+                          id: actionLabel
+
+                          visible: actionMouseArea.modelData?.text ?? false
+
+                          text: actionMouseArea.modelData?.text ?? ""
+
+                          font.pointSize: 10
+                          font.family: "Fira Sans"
+                          color: notifWindow.textColor
+                          maximumLineCount: 1
+                          elide: Text.ElideRight
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/NotificationInhibitorWidget.qml b/accounts/gkleen@sif/shell/quickshell/NotificationInhibitorWidget.qml
new file mode 100644
index 00000000..80cbba19
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/NotificationInhibitorWidget.qml
@@ -0,0 +1,266 @@
+import Quickshell
+import QtQuick
+import Quickshell.Widgets
+import qs.Services
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Shapes
+
+Item {
+  id: root
+
+  width: icon.width + 8
+  height: parent.height
+  anchors.verticalCenter: parent.verticalCenter
+
+  WrapperMouseArea {
+    id: widgetMouseArea
+
+    anchors.fill: parent
+
+    hoverEnabled: true
+    cursorShape: Qt.PointingHandCursor
+
+    onClicked: NotificationManager.displayInhibited = !NotificationManager.displayInhibited
+
+    Rectangle {
+      anchors.fill: parent
+      color: {
+        if (widgetMouseArea.containsMouse) {
+          return "#33808080";
+        }
+        return "transparent";
+      }
+
+      Item {
+        anchors.fill: parent
+
+        MaterialDesignIcon {
+          id: icon
+
+          implicitSize: 14
+          anchors.centerIn: parent
+
+          icon: NotificationManager.active ? "message" : "message-off"
+          color: {
+            if (!NotificationManager.active && !NotificationManager.displayInhibited)
+              return "#f28a21";
+            if (NotificationManager.displayInhibited)
+              return "white";
+            return "#555";
+          }
+        }
+      }
+    }
+  }
+
+  Loader {
+    id: tooltipLoader
+
+    active: false
+
+    Connections {
+      target: widgetMouseArea
+      function onContainsMouseChanged() {
+       if (widgetMouseArea.containsMouse)
+         tooltipLoader.active = true;
+      }
+    }
+
+    sourceComponent: PopupWindow {
+      id: tooltip
+
+      property bool nextVisible: NotificationManager.active && NotificationManager.history.length > 0 && (widgetMouseArea.containsMouse || tooltipMouseArea.containsMouse)
+
+      anchor {
+        item: widgetMouseArea
+        edges: Edges.Bottom | Edges.Left
+      }
+      visible: false
+
+      onNextVisibleChanged: hangTimer.restart()
+
+      Timer {
+        id: hangTimer
+        interval: tooltip.visible ? 100 : 500
+        onTriggered: {
+          tooltip.visible = tooltip.nextVisible;
+          if (!tooltip.visible)
+            tooltipLoader.active = false;
+        }
+      }
+
+      implicitWidth: 400
+      implicitHeight: Math.min(tooltip.screen.height * 0.66, Math.max(100, scroll.contentHeight + 16))
+      color: "black"
+
+      WrapperMouseArea {
+        id: tooltipMouseArea
+
+        hoverEnabled: true
+        enabled: true
+
+        anchors.fill: parent
+
+        WrapperItem {
+          margin: 8
+
+          ScrollView {
+            id: scroll
+
+            contentWidth: availableWidth
+            // ScrollBar.vertical.policy: ScrollBar.AlwaysOn
+
+            ColumnLayout {
+              id: historyLayout
+              anchors {
+                left: parent.left
+                right: parent.right
+              }
+
+              spacing: 8
+
+              Repeater {
+                model: ScriptModel {
+                  values: [...NotificationManager.history].reverse().map(o => o.notification)
+                }
+
+                delegate: GridLayout {
+                  id: notif
+
+                  Layout.fillWidth: true
+                  Layout.preferredHeight: notifSummary.contentHeight + (notifBody.visible ? notifBody.contentHeight + 8 : 0) + (notifSep.visible ? notifSep.height + 8 : 0) + notifTime.contentHeight + 8
+
+                  required property var modelData
+                  required property int index
+
+                  columnSpacing: 8
+                  rowSpacing: 8
+
+                  columns: notifImage.visible ? 2 : 1
+                  rows: {
+                    var res = 2;
+                    if (notifBody.visible)
+                      res += 1;
+                    if (notifSep.visible)
+                      res += 1;
+                    return res;
+                  }
+
+                  Shape {
+                    id: notifSep
+
+                    visible: notif.index != 0
+
+                    height: 2
+                    width: 400 - 32
+
+                    ShapePath {
+                      strokeWidth: 2
+                      strokeColor: "#20ffffff"
+                      startX: 0; startY: 0;
+                      PathLine { x: 400 - 32; y: 0; }
+                    }
+
+                    Layout.row: 0
+                    Layout.column: 0
+                    Layout.columnSpan: notifImage.visible ? 2 : 1
+                    Layout.alignment: Qt.AlignHCenter
+                  }
+
+                  Text {
+                    id: notifSummary
+
+                    text: notif.modelData?.summary ?? ""
+
+                    font.pointSize: 10
+                    font.family: "Fira Sans"
+                    font.italic: true
+                    color: "white"
+                    maximumLineCount: 1
+                    elide: Text.ElideRight
+
+                    Layout.fillWidth: true
+                    Layout.row: notifSep.visible ? 1 : 0
+                    Layout.column: notifImage.visible ? 1 : 0
+                  }
+
+                  Image {
+                    id: notifImage
+
+                    visible: (notif.modelData?.image || notif.modelData?.appIcon) ?? false
+
+                    onStatusChanged: {
+                      if (notifImage.status == Image.Error)
+                        notifImage.visible = false;
+                    }
+
+                    source: (notif.modelData?.image || notif.modelData?.appIcon) ?? ""
+                    fillMode: Image.PreserveAspectFit
+                    asynchronous: true
+                    smooth: true
+                    mipmap: true
+
+                    Layout.maximumWidth: 50
+                    Layout.column: 0
+                    Layout.row: notifSep.visible ? 1 : 0
+                    Layout.fillHeight: true
+                    Layout.rowSpan: notifBody.visible ? 3 : 2
+                  }
+
+                  Text {
+                    id: notifBody
+
+                    visible: notif.modelData?.body ?? false
+                    text: notif.modelData?.body ?? ""
+                    textFormat: Text.RichText
+                    wrapMode: Text.Wrap
+
+                    font.pointSize: 10
+                    font.family: "Fira Sans"
+                    color: "white"
+
+                    Layout.fillWidth: true
+                    Layout.row: notifSep.visible ? 2 : 1
+                    Layout.column: notifImage.visible ? 1 : 0
+                  }
+
+                  Text {
+                    id: notifTime
+
+                    Connections {
+                      target: NotificationManager.clock
+                      function onDateChanged() {
+                        notifTime.text = NotificationManager.formatTime(notif.modelData?.receivedTime);
+                      }
+                    }
+
+                    text: NotificationManager.formatTime(notif.modelData?.receivedTime)
+
+                    font.pointSize: 8
+                    font.family: "Fira Sans"
+                    font.italic: true
+                    color: "#555"
+                    maximumLineCount: 1
+                    horizontalAlignment: Text.AlignRight
+
+                    Layout.fillWidth: true
+                    Layout.row: {
+                      var res = 1;
+                      if (notifSep.visible)
+                        res += 1;
+                      if (notifBody.visible)
+                        res += 1;
+                      return res;
+                    }
+                    Layout.column: notifImage.visible ? 1 : 0
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/PipewireWidget.qml b/accounts/gkleen@sif/shell/quickshell/PipewireWidget.qml
new file mode 100644
index 00000000..9c6b65a4
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/PipewireWidget.qml
@@ -0,0 +1,483 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls.Fusion
+import Quickshell
+import Quickshell.Services.Pipewire
+import Quickshell.Widgets
+
+Item {
+  height: parent.height
+  width: volumeIcon.width + 8
+  anchors.verticalCenter: parent.verticalCenter
+
+  PwObjectTracker {
+    objects: [Pipewire.defaultAudioSink]
+  }
+
+  WrapperMouseArea {
+    id: widgetMouseArea
+
+    anchors.fill: parent
+    hoverEnabled: true
+    cursorShape: Qt.PointingHandCursor
+
+    onClicked: {
+      if (!Pipewire.defaultAudioSink)
+        return;
+      Pipewire.defaultAudioSink.audio.muted = !Pipewire.defaultAudioSink.audio.muted;
+    }
+
+    property real sensitivity: (1 / 40) / 120
+    onWheel: event => {
+      if (!Pipewire.defaultAudioSink)
+        return;
+      Pipewire.defaultAudioSink.audio.volume += event.angleDelta.y * sensitivity;
+    }
+
+    Rectangle {
+      id: volumeWidget
+
+      anchors.fill: parent
+      color: {
+        if (widgetMouseArea.containsMouse)
+          return "#33808080";
+        return "transparent";
+      }
+
+      Item {
+        anchors.fill: parent
+
+        MaterialDesignIcon {
+          id: volumeIcon
+
+          implicitSize: 14
+          anchors.centerIn: parent
+
+          icon: {
+            if (!Pipewire.defaultAudioSink || Pipewire.defaultAudioSink.audio.muted)
+              return "volume-off";
+            if (Pipewire.defaultAudioSink.audio.volume <= 0.33)
+              return "volume-low";
+            if (Pipewire.defaultAudioSink.audio.volume <= 0.67)
+              return "volume-medium";
+            return "volume-high";
+          }
+          color: "#555"
+        }
+      }
+    }
+  }
+
+  Loader {
+    id: tooltipLoader
+
+    active: false
+
+    Connections {
+      target: widgetMouseArea
+      function onContainsMouseChanged() {
+        if (widgetMouseArea.containsMouse)
+          tooltipLoader.active = true;
+      }
+    }
+
+    PwObjectTracker {
+      objects: Pipewire.devices
+    }
+    PwObjectTracker {
+      objects: Pipewire.nodes
+    }
+
+    sourceComponent: PopupWindow {
+      id: tooltip
+
+      property bool openPopup: false
+      property bool nextVisible: widgetMouseArea.containsMouse || tooltipMouseArea.containsMouse || openPopup
+
+      anchor {
+        item: widgetMouseArea
+        edges: Edges.Bottom | Edges.Left
+      }
+      visible: false
+
+      onNextVisibleChanged: hangTimer.restart()
+
+      Timer {
+        id: hangTimer
+        interval: 100
+        onTriggered: {
+          tooltip.visible = tooltip.nextVisible;
+          if (!tooltip.visible)
+            tooltipLoader.active = false;
+        }
+      }
+
+      implicitWidth: tooltipContent.width
+      implicitHeight: tooltipContent.height
+      color: "transparent"
+
+      Rectangle {
+        width: tooltip.width
+        height: tooltipLayout.childrenRect.height + 16
+        color: "black"
+      }
+
+      WrapperItem {
+        id: tooltipContent
+
+        bottomMargin: Math.max(0, 200 - tooltipLayout.implicitHeight)
+
+        WrapperMouseArea {
+          id: tooltipMouseArea
+
+          hoverEnabled: true
+          enabled: true
+
+          WrapperItem {
+            margin: 8
+            bottomMargin: 8
+
+            GridLayout {
+              id: tooltipLayout
+
+              columns: 4
+
+              Repeater {
+                model: Array.from(Pipewire.devices.values).filter(dev => dev.type == "Audio/Device")
+
+                Item {
+                  id: descItem
+
+                  required property var modelData
+                  required property int index
+
+                  Layout.column: 0
+                  Layout.row: index
+
+                  implicitWidth: descText.contentWidth
+                  implicitHeight: descText.contentHeight
+
+                  Text {
+                    id: descText
+
+                    color: "white"
+                    font.pointSize: 10
+                    font.family: "Fira Sans"
+
+                    text: descItem.modelData.description
+                  }
+                }
+              }
+
+              Repeater {
+                id: defaultSinkRepeater
+
+                model: {
+                  Array.from(Pipewire.devices.values)
+                    .filter(dev => dev.type == "Audio/Device")
+                    .map(device => Array.from(Pipewire.nodes.values).find(node => node.type == PwNodeType.AudioSink && node.device?.id == device.id ));
+                }
+
+                Item {
+                  id: defaultSinkItem
+
+                  required property var modelData
+                  required property int index
+
+                  visible: Boolean(modelData)
+
+                  PwObjectTracker {
+                    objects: [defaultSinkItem.modelData]
+                  }
+
+                  Layout.column: 1
+                  Layout.row: index
+
+                  Layout.fillHeight: true
+
+                  implicitWidth: 16 + 8
+
+                  WrapperMouseArea {
+                    id: defaultSinkMouseArea
+
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+
+                    onClicked: {
+                      Pipewire.preferredDefaultAudioSink = defaultSinkItem.modelData
+                    }
+
+                    onWheel: event => scrollVolume(event);
+                    property real sensitivity: (1 / 40) / 120
+                    function scrollVolume(event) {
+                      defaultSinkItem.modelData.audio.volume += event.angleDelta.y * sensitivity;
+                    }
+
+                    Rectangle {
+                      id: defaultSinkWidget
+
+                      anchors.fill: parent
+                      color: {
+                        if (defaultSinkMouseArea.containsMouse)
+                          return "#33808080";
+                        return "transparent";
+                      }
+
+                      MaterialDesignIcon {
+                        width: 16
+                        height: 16
+                        anchors.centerIn: parent
+
+                        icon: {
+                          if (defaultSinkItem.modelData?.id == Pipewire.defaultAudioSink?.id)
+                            return "speaker";
+                          return "speaker-off";
+                        }
+                        color: icon == "speaker" ? "white" : "#555"
+                      }
+                    }
+                  }
+
+                  PopupWindow {
+                    id: volumeTooltip
+
+                    property bool nextVisible: defaultSinkMouseArea.containsMouse || volumeTooltipMouseArea.containsMouse
+
+                    anchor {
+                      item: defaultSinkMouseArea
+                      edges: Edges.Bottom | Edges.Left
+                    }
+                    visible: false
+
+                    onNextVisibleChanged: volumeHangTimer.restart()
+
+                    onVisibleChanged: tooltip.openPopup = volumeTooltip.visible
+
+                    Timer {
+                      id: volumeHangTimer
+                      interval: 100
+                      onTriggered: volumeTooltip.visible = volumeTooltip.nextVisible
+                    }
+
+                    implicitWidth: volumeTooltipText.contentWidth + 16
+                    implicitHeight: volumeTooltipText.contentHeight + 16
+                    color: "black"
+
+                    WrapperMouseArea {
+                      id: volumeTooltipMouseArea
+
+                      hoverEnabled: true
+                      enabled: true
+
+                      onWheel: event => defaultSinkMouseArea.scrollVolume(event);
+
+                      anchors.fill: parent
+
+                      Item {
+                        anchors.fill: parent
+
+                        Text {
+                          id: volumeTooltipText
+
+                          anchors.centerIn: parent
+
+                          font.pointSize: 10
+                          font.family: "Fira Sans"
+                          color: "white"
+
+                          text: `${Math.round(defaultSinkItem.modelData?.audio?.volume * 100)}%`
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+
+              Repeater {
+                id: defaultSourceRepeater
+
+                model: {
+                  Array.from(Pipewire.devices.values)
+                    .filter(dev => dev.type == "Audio/Device")
+                    .map(device => Array.from(Pipewire.nodes.values).find(node => node.type == PwNodeType.AudioSource && node.device?.id == device.id ));
+                }
+
+                Item {
+                  id: defaultSourceItem
+
+                  required property var modelData
+                  required property int index
+
+                  visible: Boolean(modelData)
+
+                  PwObjectTracker {
+                    objects: [defaultSourceItem.modelData]
+                  }
+
+                  Layout.column: 2
+                  Layout.row: index
+
+                  Layout.fillHeight: true
+
+                  implicitWidth: 16 + 8
+
+                  WrapperMouseArea {
+                    id: defaultSourceMouseArea
+
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+
+                    onClicked: {
+                      Pipewire.preferredDefaultAudioSource = defaultSourceItem.modelData
+                    }
+
+                    onWheel: event => scrollVolume(event);
+                    property real sensitivity: (1 / 40) / 120
+                    function scrollVolume(event) {
+                      defaultSourceItem.modelData.audio.volume += event.angleDelta.y * sensitivity;
+                    }
+
+                    Rectangle {
+                      id: defaultSourceWidget
+
+                      anchors.fill: parent
+                      color: {
+                        if (defaultSourceMouseArea.containsMouse)
+                          return "#33808080";
+                        return "transparent";
+                      }
+
+                      MaterialDesignIcon {
+                        width: 16
+                        height: 16
+                        anchors.centerIn: parent
+
+                        icon: {
+                          if (defaultSourceItem.modelData?.id == Pipewire.defaultAudioSource?.id)
+                            return "microphone";
+                          return "microphone-off";
+                        }
+                        color: icon == "microphone" ? "white" : "#555"
+                      }
+                    }
+                  }
+
+                  PopupWindow {
+                    id: volumeTooltip
+
+                    property bool nextVisible: defaultSourceMouseArea.containsMouse || volumeTooltipMouseArea.containsMouse
+
+                    anchor {
+                      item: defaultSourceMouseArea
+                      edges: Edges.Bottom | Edges.Left
+                    }
+                    visible: false
+
+                    onNextVisibleChanged: volumeHangTimer.restart()
+
+                    onVisibleChanged: tooltip.openPopup = volumeTooltip.visible
+
+                    Timer {
+                      id: volumeHangTimer
+                      interval: 100
+                      onTriggered: volumeTooltip.visible = volumeTooltip.nextVisible
+                    }
+
+                    implicitWidth: volumeTooltipText.contentWidth + 16
+                    implicitHeight: volumeTooltipText.contentHeight + 16
+                    color: "black"
+
+                    WrapperMouseArea {
+                      id: volumeTooltipMouseArea
+
+                      hoverEnabled: true
+                      enabled: true
+
+                      onWheel: event => defaultSourceMouseArea.scrollVolume(event);
+
+                      anchors.fill: parent
+
+                      Item {
+                        anchors.fill: parent
+
+                        Text {
+                          id: volumeTooltipText
+
+                          anchors.centerIn: parent
+
+                          font.pointSize: 10
+                          font.family: "Fira Sans"
+                          color: "white"
+
+                          text: `${Math.round(defaultSourceItem.modelData?.audio?.volume * 100)}%`
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+
+              Repeater {
+                id: profileRepeater
+
+                model: Array.from(Pipewire.devices.values).filter(dev => dev.type == "Audio/Device")
+
+                Item {
+                  id: profileItem
+
+                  required property var modelData
+                  required property int index
+
+                  PwObjectTracker {
+                    objects: [profileItem.modelData]
+                  }
+
+                  Layout.column: 3
+                  Layout.row: index
+
+                  Layout.fillWidth: true
+
+                  implicitWidth: Math.max(profileBox.implicitWidth, 300)
+                  implicitHeight: profileBox.height
+
+                  ComboBox {
+                    id: profileBox
+
+                    model: profileItem.modelData.profiles
+
+                    textRole: "description"
+                    valueRole: "index"
+                    onActivated: profileItem.modelData.setProfile(currentValue)
+
+                    anchors.fill: parent
+
+                    implicitContentWidthPolicy: ComboBox.WidestText
+
+                    Connections {
+                      target: profileItem.modelData
+                      function onCurrentProfileChanged() {
+                        profileBox.currentIndex = Array.from(profileItem.modelData.profiles).findIndex(profile => profile.index == profileItem.modelData.currentProfile);
+                      }
+                    }
+                    Component.onCompleted: {
+                      profileBox.currentIndex = Array.from(profileItem.modelData.profiles).findIndex(profile => profile.index == profileItem.modelData.currentProfile);
+                    }
+
+                    Connections {
+                      target: profileBox.popup
+                      function onVisibleChanged() {
+                        tooltip.openPopup = profileBox.popup.visible
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml b/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml
new file mode 100644
index 00000000..d7ffadfe
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/PrivacyWidget.qml
@@ -0,0 +1,49 @@
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Widgets
+import qs.Services
+
+Item {
+  height: parent.height
+  width: layout.childrenRect.width
+  anchors.verticalCenter: parent.verticalCenter
+
+  visible: Array.from(Privacy.activeItems).length > 0
+
+  RowLayout {
+    id: layout
+
+    anchors.fill: parent
+
+    spacing: 8
+
+    Repeater {
+      model: Privacy.activeItems
+
+      Item {
+        id: privacyItem
+
+        required property var modelData;
+
+        height: parent.height
+        width: icon.width
+
+        MaterialDesignIcon {
+          id: icon
+
+          implicitSize: 14
+          anchors.centerIn: parent
+
+          icon: {
+            if (privacyItem.modelData == Privacy.Item.Microphone)
+             return "microphone";
+            if (privacyItem.modelData == Privacy.Item.Screensharing)
+             return "monitor-share";
+           }
+          color: "#f2201f"
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml b/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml
new file mode 100644
index 00000000..f3ae6804
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/Brightness.qml
@@ -0,0 +1,107 @@
+pragma Singleton
+
+import QtQml
+import Quickshell
+import Quickshell.Io
+import Custom as Custom
+import qs.Services
+
+Singleton {
+  id: root
+
+  property string subsystem: "backlight"
+  property string device: "intel_backlight"
+
+  property real currBrightness
+  property real exponent: 4
+
+  function calcCurrBrightness() {
+    if (!currFile.loaded || !maxFile.loaded)
+      return undefined;
+    const curr = Number(currFile.text());
+    const max = Number(maxFile.text());
+    const val = Math.pow(curr / max, 1 / root.exponent);
+    return val;
+  }
+
+  Connections {
+    target: currFile
+    function onLoaded() {
+      const b = root.calcCurrBrightness();
+      if (typeof b !== 'undefined')
+        root.currBrightness = b;
+    }
+  }
+  Connections {
+    target: maxFile
+    function onLoaded() {
+      const b = root.calcCurrBrightness();
+      if (typeof b !== 'undefined')
+        root.currBrightness = b;
+    }
+  }
+
+  onCurrBrightnessChanged: {
+    root.currBrightness = Math.max(0, Math.min(1, root.currBrightness));
+
+    const prev = root.calcCurrBrightness();
+    if (typeof prev === 'undefined' || Math.abs(root.currBrightness - prev) < 0.01)
+      return;
+
+    const max = Number(maxFile.text());
+    const actual = Number(currFile.text());
+    let curr = Math.max(0, Math.min(max, Math.pow(root.currBrightness, root.exponent) * max));
+    if (Math.round(curr) == actual && curr < actual)
+      curr = Math.max(0, actual - 1);
+    else if (Math.round(curr) == actual && curr > actual)
+      curr = Math.min(max, actual + 1);
+    // root.currBrightness = Math.pow(curr / max, 1 / root.exponent);
+    Custom.Systemd.setBrightness(root.subsystem, root.device, Math.round(curr));
+  }
+
+  FileView {
+    id: currFile
+    path: `/sys/class/${root.subsystem}/${root.device}/brightness`
+    blockAllReads: true
+    watchChanges: true
+    onFileChanged: reload()
+  }
+  FileView {
+    id: maxFile
+    path: `/sys/class/${root.subsystem}/${root.device}/max_brightness`
+    blockAllReads: true
+    watchChanges: true
+    onFileChanged: reload()
+  }
+
+
+  Timer {
+    id: startupDelay
+    interval: 500
+    running: true
+    repeat: false
+  }
+  property bool onlyInternal: true
+  Connections {
+    target: NiriService
+    function onOutputsChanged() {
+      root.onlyInternal = Object.keys(NiriService.outputs).every(oname => oname == "eDP-1");
+    }
+  }
+  onOnlyInternalChanged: {
+    if (startupDelay.running)
+      return;
+
+    if (!root.onlyInternal)
+      root.currBrightness = 1
+  }
+
+
+  IpcHandler {
+    target: "Brightness"
+
+    function set(brightness: real): void {
+      root.currBrightness = brightness;
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/GpgAgent.qml b/accounts/gkleen@sif/shell/quickshell/Services/GpgAgent.qml
new file mode 100644
index 00000000..3de69535
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/GpgAgent.qml
@@ -0,0 +1,18 @@
+pragma Singleton
+
+import Quickshell
+import Quickshell.Io
+
+Singleton {
+  id: root
+
+  Socket {
+    id: agentSocket
+    connected: true
+    path: `${Quickshell.env("XDG_RUNTIME_DIR")}/gnupg/S.gpg-agent`
+  }
+
+  function reloadAgent() {
+    agentSocket.write("RELOADAGENT\n")
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/InhibitorState.qml b/accounts/gkleen@sif/shell/quickshell/Services/InhibitorState.qml
new file mode 100644
index 00000000..fe48fd7f
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/InhibitorState.qml
@@ -0,0 +1,22 @@
+pragma Singleton
+
+import Quickshell
+import Custom as Custom
+
+Singleton {
+  id: inhibitorState
+
+  property bool waylandIdleInhibited: false
+  property alias lidSwitchInhibited: lidSwitchInhibitor.enabled
+
+  Custom.SystemdInhibitor {
+    id: lidSwitchInhibitor
+
+    enabled: false
+
+    what: Custom.SystemdInhibitorParams.HandleLidSwitch
+    who: "quickshell"
+    why: "User request"
+    mode: Custom.SystemdInhibitorParams.BlockWeak
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/MprisProxy.qml b/accounts/gkleen@sif/shell/quickshell/Services/MprisProxy.qml
new file mode 100644
index 00000000..e3ab9755
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/MprisProxy.qml
@@ -0,0 +1,8 @@
+pragma Singleton
+
+import Quickshell
+import Quickshell.Services.Mpris
+
+Scope {
+  property list<var> players: Mpris.players.values
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
new file mode 100644
index 00000000..cd4ed125
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
@@ -0,0 +1,216 @@
+pragma Singleton
+
+import Quickshell
+import Quickshell.Io
+import QtQuick
+
+Singleton {
+  id: root
+
+  property var workspaces: []
+  property var outputs: {}
+  property var keyboardLayouts: {}
+  property var windows: []
+  property var casts: []
+  readonly property string socketPath: Quickshell.env("NIRI_SOCKET")
+
+  function refreshOutputs() {
+    commandSocket.sendCommand("Outputs", data => {
+      outputs = data.Ok.Outputs;
+    });
+  }
+
+  function sendCommand(command, callback) {
+    commandSocket.sendCommand(command, callback);
+  }
+
+  Socket {
+    id: eventStreamSocket
+    path: root.socketPath
+    connected: true
+
+    property bool acked: false
+
+    onConnectionStateChanged: {
+      if (connected) {
+        acked = false;
+        write('"EventStream"\n');
+      }
+    }
+
+    parser: SplitParser {
+      onRead: line => {
+        try {
+          const event = JSON.parse(line)
+
+          // console.log(JSON.stringify(event))
+
+          if (event.WorkspacesChanged) {
+            root.workspaces = event.WorkspacesChanged.workspaces
+            root.refreshOutputs();
+          } else if (event.WorkspaceActivated)
+            eventWorkspaceActivated(event.WorkspaceActivated);
+          else if (event.WorkspaceUrgencyChanged)
+            eventWorkspaceUrgencyChanged(event.WorkspaceUrgencyChanged);
+          else if (event.WorkspaceActiveWindowChanged)
+            eventWorkspaceActiveWindowChanged(event.WorkspaceActiveWindowChanged);
+          else if (event.KeyboardLayoutsChanged)
+            root.keyboardLayouts = event.KeyboardLayoutsChanged.keyboard_layouts;
+          else if (event.KeyboardLayoutSwitched)
+            root.keyboardLayouts = Object.assign({}, root.keyboardLayouts, {"current_idx": event.KeyboardLayoutSwitched.idx });
+          else if (event.WindowsChanged)
+            root.windows = event.WindowsChanged.windows
+          else if (event.WindowOpenedOrChanged)
+            eventWindowOpenedOrChanged(event.WindowOpenedOrChanged);
+          else if (event.WindowClosed)
+            eventWindowClosed(event.WindowClosed);
+          else if (event.WindowFocusChanged)
+            eventWindowFocusChanged(event.WindowFocusChanged);
+          else if (event.WindowUrgencyChanged)
+            eventWindowUrgencyChanged(event.WindowUrgencyChanged);
+          else if (event.WindowLayoutsChanged)
+            eventWindowLayoutsChanged(event.WindowLayoutsChanged);
+          else if (event.WindowFocusTimestampChanged)
+            eventWindowFocusTimestampChanged(event.WindowFocusTimestampChanged);
+          else if (event.CastsChanged)
+            root.casts = event.CastsChanged.casts
+          else if (event.CastStartedOrChanged)
+            eventCastStartedOrChanged(event.CastStartedOrChanged);
+          else if (event.CastStopped)
+            eventCastStopped(event.CastStopped);
+          else if (event.Ok && !eventStreamSocket.acked) { eventStreamSocket.acked = true; }
+          else if (event.OverviewOpenedOrClosed) {}
+          else if (event.ConfigLoaded) {}
+          else
+            console.log(JSON.stringify(event));
+        } catch (e) {
+          console.warn("NiriService: Failed to parse event:", line, e)
+        }
+      }
+    }
+  }
+
+  Socket {
+    id: commandSocket
+    path: root.socketPath
+    connected: true
+
+    property var awaitingAnswer: null
+    property var cmdQueue: []
+
+    parser: SplitParser {
+      onRead: line => {
+        if (commandSocket.awaitingAnswer === null)
+          return;
+
+        try {
+          const response = JSON.parse(line);
+          commandSocket.awaitingAnswer.callback(response);
+          commandSocket.awaitingAnswer = null;
+        } catch (e) {
+          console.warn("NiriService: Failed to parse response:", line, e)
+        }
+        commandSocket._handleQueue();
+      }
+    }
+
+    onCmdQueueChanged: {
+      _handleQueue();
+    }
+    onAwaitingAnswerChanged: {
+      _handleQueue();
+    }
+
+    function _handleQueue() {
+      if (cmdQueue.length <= 0 || awaitingAnswer !== null)
+        return;
+
+      let localQueue = Array.from(cmdQueue);
+      awaitingAnswer = localQueue.shift();
+      cmdQueue = localQueue;
+      write(JSON.stringify(awaitingAnswer.command) + '\n');
+    }
+
+    function sendCommand(command, callback) {
+      cmdQueue = Array.from(cmdQueue).concat([{ "command": command, "callback": callback }])
+    }
+  }
+
+  function eventWorkspaceActivated(data) {
+    let relevant_output = null;
+    Array.from(root.workspaces).forEach(ws => {
+      if (data.id === ws.id)
+        relevant_output = ws.output;
+    });
+    root.workspaces = Array.from(root.workspaces).map(ws => {
+      if (data.focused)
+        ws.is_focused = false;
+      if (ws.output === relevant_output)
+        ws.is_active = false;
+      if (data.id === ws.id) {
+        ws.is_active = true;
+        ws.is_focused = data.focused;
+      }
+      return ws;
+    });
+  }
+  function eventWorkspaceUrgencyChanged(data) {
+    root.workspaces = Array.from(root.workspaces).map(ws => {
+      if (data.id == ws.id)
+        ws.is_urgent = data.urgent;
+      return ws;
+    });
+  }
+  function eventWorkspaceActiveWindowChanged(data) {
+    root.workspaces = Array.from(root.workspaces).map(ws => {
+      if (data.workspace_id === ws.id)
+        ws.active_window_id = data.active_window_id;
+      return ws;
+    });
+  }
+  function eventWindowOpenedOrChanged(data) {
+    root.windows = Array.from(root.windows).map(win => {
+      if (data.window.is_focused)
+        win.is_focused = false;
+      return win;
+    }).filter(win => win.id !== data.window.id).concat([data.window]);
+  }
+  function eventWindowClosed(data) {
+    root.windows = Array.from(root.windows).filter(win => win.id !== data.id);
+  }
+  function eventWindowFocusChanged(data) {
+    root.windows = Array.from(root.windows).map(win => {
+      win.is_focused = win.id === data.id;
+      return win;
+    });
+  }
+  function eventWindowUrgencyChanged(data) {
+    root.windows = Array.from(root.windows).map(win => {
+      if (win.id === data.id)
+        win.is_urgent = data.urgent;
+      return win;
+    });
+  }
+  function eventWindowLayoutsChanged(data) {
+    root.windows = Array.from(root.windows).map(win => {
+      Array.from(data.changes).forEach(change => {
+        if (win.id === change[0])
+          win.layout = change[1];
+      });
+      return win;
+    });
+  }
+  function eventWindowFocusTimestampChanged(data) {
+    root.windows = Array.from(root.windows).map(win => {
+      if (win.id === data.id)
+        win.focus_timestamp = data.focus_timestamp;
+      return win;
+    });
+  }
+  function eventCastStartedOrChanged(data) {
+    root.casts = [...Array.from(root.casts).filter(cast => cast.stream_id !== data.cast.stream_id), data.cast];
+  }
+  function eventCastStopped(data) {
+    root.casts = Array.from(root.casts).filter(cast => cast.stream_id !== data.stream_id);
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml b/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml
new file mode 100644
index 00000000..5f8ff419
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NotificationManager.qml
@@ -0,0 +1,162 @@
+pragma Singleton
+
+import QtQml
+import Quickshell
+import Quickshell.Services.Notifications
+
+Singleton {
+  id: root
+
+  readonly property bool active: !root.lockscreenActive && !root.displayInhibited
+  property bool lockscreenActive: false
+  property bool displayInhibited: false
+  property alias trackedNotifications: server.trackedNotifications
+  readonly property var groups: {
+    function matchesGroupKey(notif, groupKey) {
+      var matches = true;
+      for (const prop in groupKey.test) {
+        if (notif[prop] !== groupKey.test[prop]) {
+          matches = false;
+          break;
+        }
+      }
+      return matches;
+    }
+
+    var groups = new Map();
+    var notifs = new Array();
+    for (const [ix, notif] of server.trackedNotifications.values.entries()) {
+      var didGroup = false;
+      for (const groupKey of root.groupKeys) {
+        if (!matchesGroupKey(notif, groupKey))
+          continue;
+
+        const key = JSON.stringify({
+          "key": groupKey,
+          "values": Object.assign({}, ...(Array.from(groupKey["group-by"]).map(prop => {
+            var res = {};
+            res[prop] = notif[prop];
+            return res;
+          })))
+        });
+        if (!groups.has(key))
+          groups.set(key, new Array());
+        groups.get(key).push({ "ix": ix, "notif": notif });
+        didGroup = true;
+        break;
+      }
+
+      if (!didGroup)
+        notifs.push([{ "ix": ix, "notif": notif }]);
+    }
+    notifs.push(...groups.values());
+    notifs.sort((as, bs) => Math.min(...(as.map(o => o.ix))) - Math.min(...(bs.map(o => o.ix))));
+    return notifs.map(ns => ns.map(n => n.notif));
+  }
+
+  property var groupKeys: [
+    { "test": { "appName": "Element" }, "group-by": [ "summary" ] }
+  ];
+
+  property int historyLimit: 100
+  property var history: []
+
+  Component {
+    id: expirationTimer
+
+    QtObject {
+      id: timer
+
+      required property QtObject parent
+      required property int expirationTime
+
+      property list<QtObject> data: [
+        Timer {
+          running: root.active && !timer.expired
+          interval: timer.expirationTime
+          onTriggered: {
+            timer.parent.expirationTimer.destroy();
+            timer.parent.expirationTimer = null;
+            timer.parent.expire();
+          }
+        }
+      ]
+    }
+  }
+
+  Component {
+    id: notificationLock
+
+    RetainableLock {}
+  }
+
+  readonly property SystemClock clock: SystemClock {
+    precision: SystemClock.Minutes
+  }
+
+  function formatTime(time) {
+    const now = root.clock.date;
+    const diff = now - time;
+    const minutes = Math.ceil(diff / 60000);
+    const hours = Math.floor(minutes / 60);
+
+    if (hours < 1) {
+      if (minutes < 1)
+        return "now";
+      if (minutes == 1)
+        return "1 minute";
+      return `${minutes} minutes`;
+    }
+
+    const nowDate = new Date(now.getFullYear(), now.getMonth(), now.getDate())
+    const timeDate = new Date(time.getFullYear(), time.getMonth(), time.getDate())
+    const days = Math.floor((nowDate - timeDate) / (1000 * 86400))
+
+    const timeStr = time.toLocaleTimeString(Qt.locale(), "HH:mm");
+
+    if (days === 0)
+      return timeStr;
+    if (days === 1)
+      return `yesterday ${timeStr}`;
+
+    const dateStr = time.toLocaleDateString(Qt.locale(), "YYYY-MM-DD");
+    return `${dateStr} ${timeStr}`;
+  }
+
+  NotificationServer {
+    id: server
+
+    bodySupported: true
+    actionsSupported: true
+    actionIconsSupported: true
+    imageSupported: true
+    bodyMarkupSupported: true
+    bodyImagesSupported: true
+
+    onNotification: notification => {
+      var timeout = notification.expireTimeout * 1000;
+      if (notification.appName == "poweralertd")
+        timeout = 2000;
+      if (timeout > 0) {
+        Object.defineProperty(notification, "expirationTimer", { configurable: true, enumerable: true, writable: true });
+        notification.expirationTimer = expirationTimer.createObject(notification, { parent: notification, expirationTime: timeout });
+      }
+      Object.defineProperty(notification, "receivedTime", { configurable: true, enumerable: true, writable: true });
+      notification.receivedTime = root.clock.date;
+      notification.closed.connect((reason) => server.onNotificationClosed(notification, reason));
+      notification.tracked = true;
+    }
+
+    function onNotificationClosed(notification, reason) {
+      while (root.history.length >= root.historyLimit) {
+        root.history[0].lock.locked = false;
+        root.history.shift();
+      }
+
+      root.history.push({
+        lock: notificationLock.createObject(root, { locked: true, object: notification }),
+        notification: notification
+      });
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/Privacy.qml b/accounts/gkleen@sif/shell/quickshell/Services/Privacy.qml
new file mode 100644
index 00000000..9c813e49
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/Privacy.qml
@@ -0,0 +1,63 @@
+pragma Singleton
+
+import QtQml
+import Quickshell
+import Quickshell.Services.Pipewire
+
+Singleton {
+  id: root
+
+  PwObjectTracker {
+    objects: Pipewire.nodes.values
+  }
+
+  enum Item {
+    Microphone,
+    Screensharing
+  }
+
+  readonly property list<var> activeItems: {
+    var items = [];
+    if (microphoneActive)
+      items.push(Privacy.Item.Microphone);
+    if (screensharingActive)
+      items.push(Privacy.Item.Screensharing);
+    return items;
+  }
+
+  readonly property bool microphoneActive: {
+    if (!Pipewire.ready || !Pipewire.nodes?.values) {
+      return false
+    }
+
+    for (const node of Pipewire.nodes.values) {
+      if (!node || (node.type & PwNodeType.AudioInStream) != PwNodeType.AudioInStream)
+        continue;
+
+      if (node.properties?.["stream.monitor"] === "true")
+        continue;
+
+      if (node.audio?.muted)
+        continue;
+
+      return true;
+    }
+
+    return false;
+  }
+
+  readonly property bool screensharingActive: {
+    if (!Pipewire.ready || !Pipewire.nodes?.values) {
+      return false
+    }
+
+    for (const node of Pipewire.nodes.values) {
+      if (!node || (node.type & PwNodeType.VideoInStream) != PwNodeType.VideoInStream)
+        continue;
+
+      return true;
+    }
+
+    return false;
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/ScreenRecord.qml b/accounts/gkleen@sif/shell/quickshell/Services/ScreenRecord.qml
new file mode 100644
index 00000000..eb415452
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/ScreenRecord.qml
@@ -0,0 +1,63 @@
+pragma Singleton
+
+import Quickshell
+import Quickshell.Io
+
+Singleton {
+  id: root
+  property bool active: false
+  property bool slurpSuccess: false
+
+  onActiveChanged: {
+    if (!active) {
+      slurp.running = false;
+      screenRecorder.running = false;
+    }
+    if (active)
+      slurp.running = true;
+  }
+
+  Process {
+    id: screenRecorder
+    running: false
+    onRunningChanged: {
+      console.log("wf-recorder running: ", screenRecorder.running);
+
+      if (!screenRecorder.running && !slurp.running)
+        root.active = false;
+    }
+    stderr: SplitParser {
+      onRead: line => console.log("wf-recorder stderr: ", line)
+    }
+    stdout: SplitParser {
+      onRead: line => console.log("wf-recorder stdout: ", line)
+    }
+  }
+
+  Process {
+    id: slurp
+    running: false
+    command: [ @slurp@, "-o", "-d" ]
+    stdout: StdioCollector {}
+    stderr: SplitParser {
+      onRead: line => console.log("slurp stderr: ", line)
+    }
+    onExited: exitCode => {
+      if (exitCode !== 0) {
+        console.log("slurp failed: ", exitCode);
+        root.active = false;
+        return;
+      }
+      console.log("slurp succeeded: ", slurp.stdout.text);
+
+      const nowDate = new Date();
+
+      screenRecorder.command = [
+        @wf-recorder@,
+        "-g", slurp.stdout.text,
+        "-f", `${Quickshell.env("HOME")}/screenshots/${nowDate.toLocaleString(Qt.locale(), "yyyy-MM-ddThh:mm:ss")}.mkv`,
+      ];
+      screenRecorder.running = true;
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
new file mode 100644
index 00000000..c71a9cca
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
@@ -0,0 +1,8 @@
+import Custom as Custom
+
+Custom.FileSelector {
+  id: root
+
+  directory: @wallpapers@
+  epoch: 79200000
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/Worktime.qml b/accounts/gkleen@sif/shell/quickshell/Services/Worktime.qml
new file mode 100644
index 00000000..d98378f1
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/Worktime.qml
@@ -0,0 +1,84 @@
+pragma Singleton
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import QtQml
+
+Singleton {
+  id: root
+
+  property alias time: timeState
+  property alias today: todayState
+
+  CommandState {
+    id: timeState
+    command: "time"
+  }
+  CommandState {
+    id: todayState
+    command: "today"
+  }
+
+  IpcHandler {
+    target: "Worktime"
+
+    function refresh(): void {
+      time.running = true;
+      today.running = true;
+    }
+  }
+
+  component CommandState : Scope {
+    id: commandState
+
+    required property string command
+    property var state: null
+
+    property bool strikeout: !strikeoutTimer.running
+    property alias running: process.running
+    property alias updating: updateTimer.running
+
+    Process {
+      id: process
+      running: true
+      command: [ @worktime@, commandState.command, "--waybar" ]
+      stdout: StdioCollector {
+        id: processCollector
+        onStreamFinished: {
+          try {
+            commandState.state = JSON.parse(processCollector.text);
+            strikeoutTimer.restart();
+          } catch (e) {
+            console.warn("Worktime: Failed to parse output:", processCollector.text, e);
+          }
+        }
+      }
+    }
+
+    Timer {
+      id: updateTimer
+      running: commandState.state?.class == "running" || commandState.state?.class == "over"
+      interval: 60000
+      repeat: true
+      onTriggered: process.running = true
+    }
+
+    Timer {
+      id: strikeoutTimer
+      running: false
+      interval: 5 * updateTimer.interval
+      repeat: false
+    }
+  }
+
+  Timer {
+    running: Boolean(timeState.state) && Boolean(todayState.state) && timeState.strikeout && todayState.strikeout
+    interval: 1000
+    repeat: false
+    onTriggered: {
+      timeState.state = null;
+      todayState.state = null;
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
new file mode 100644
index 00000000..f0c50632
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
@@ -0,0 +1,201 @@
+import QtQuick
+import QtQuick.Effects
+import Quickshell
+import Quickshell.Widgets
+import Quickshell.Services.SystemTray
+
+Item {
+  anchors.verticalCenter: parent.verticalCenter
+  width: systemTrayRow.childrenRect.width
+  height: parent.height
+  clip: true
+
+  Row {
+    id: systemTrayRow
+    anchors.centerIn: parent
+    width: childrenRect.width
+    height: parent.height
+    spacing: 0
+
+    Repeater {
+      model: ScriptModel {
+        values: {
+          var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive && !(["Fcitx"].includes(item.id)));
+          trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
+          return trayItems;
+        }
+      }
+
+      delegate: Item {
+        id: trayItemWrapper
+
+        required property var modelData
+        required property int index
+
+        property var trayItem: modelData
+        property string iconSource: {
+          let icon = trayItem && trayItem.icon
+          if (typeof icon === 'string' || icon instanceof String) {
+            if (icon.includes("?path=")) {
+              const split = icon.split("?path=")
+              if (split.length !== 2)
+                return icon
+              const name = split[0]
+              const path = split[1]
+              const fileName = name.substring(
+                               name.lastIndexOf("/") + 1)
+              return `file://${path}/${fileName}`
+            }
+            return icon
+          }
+          return ""
+        }
+
+        width: icon.width + 6
+        height: parent.height
+        anchors.verticalCenter: parent.verticalCenter
+
+        WrapperMouseArea {
+          id: trayItemArea
+
+          anchors.fill: parent
+          acceptedButtons: Qt.LeftButton | Qt.RightButton
+          hoverEnabled: true
+          cursorShape: trayItem.onlyMenu ? Qt.ArrowCursor : Qt.PointingHandCursor
+          onClicked: mouse => {
+            if (!trayItem)
+              return
+
+            if (mouse.button === Qt.LeftButton
+              && !trayItem.onlyMenu) {
+              trayItem.activate()
+              return
+            }
+
+            if (trayItem.hasMenu) {
+              var globalPos = mapToGlobal(0, 0)
+              var currentScreen = screen || Screen
+              var screenX = currentScreen.x || 0
+              var relativeX = globalPos.x - screenX
+              menuAnchor.menu = trayItem.menu
+              menuAnchor.anchor.window = bar
+              menuAnchor.anchor.rect = Qt.rect(
+                  relativeX,
+                  21,
+                  parent.width, 1)
+              menuAnchor.open()
+            }
+          }
+
+          Rectangle {
+            anchors.fill: parent
+            color: {
+              if (trayItemArea.containsMouse)
+                return "#33808080";
+              return "transparent";
+            }
+
+            Item {
+              anchors.fill: parent
+
+              layer.enabled: true
+              layer.effect: MultiEffect {
+                colorization: 1
+                colorizationColor: "#555"
+              }
+
+              IconImage {
+                id: icon
+
+                anchors.centerIn: parent
+                implicitSize: 16
+                source: trayItemWrapper.iconSource
+                asynchronous: true
+                smooth: true
+                mipmap: true
+
+                layer.enabled: true
+                layer.effect: MultiEffect {
+                  id: effect
+
+                  brightness: 1
+                }
+              }
+            }
+          }
+        }
+
+        PopupWindow {
+          id: tooltip
+
+          property bool nextVisible: (trayItem.tooltipTitle || trayItem.tooltipDescription) && (trayItemArea.containsMouse || tooltipMouseArea.containsMouse) && !menuAnchor.visible
+
+          anchor {
+            item: trayItemArea
+            edges: Edges.Bottom
+          }
+
+          visible: false
+          onNextVisibleChanged: hangTimer.restart()
+
+          Timer {
+            id: hangTimer
+            interval: 100
+            onTriggered: tooltip.visible = tooltip.nextVisible
+          }
+
+          color: "black"
+
+          implicitWidth: Math.max(tooltipTitle.contentWidth, tooltipDescription.contentWidth) + 16
+          implicitHeight: (trayItem.tooltipTitle ? tooltipTitle.contentHeight : 0) + (trayItem.tooltipDescription ? tooltipDescription.contentHeight : 0) + 16
+
+          WrapperMouseArea {
+            id: tooltipMouseArea
+
+            hoverEnabled: true
+            enabled: true
+
+            margin: 4
+
+            anchors.fill: parent
+
+            Item {
+              anchors.fill: parent
+
+              Column {
+                anchors.centerIn: parent
+                Text {
+                  id: tooltipTitle
+
+                  enabled: trayItem.tooltipTitle
+
+                  font.pointSize: 10
+                  font.family: "Fira Sans"
+                  font.bold: true
+                  color: "white"
+
+                  text: trayItem.tooltipTitle
+                }
+
+                Text {
+                  id: tooltipDescription
+
+                  enabled: trayItem.tooltipDescription
+
+                  font.pointSize: 10
+                  font.family: "Fira Sans"
+                  color: "white"
+
+                  text: trayItem.tooltipDescription
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  QsMenuAnchor {
+    id: menuAnchor
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/UnixIPC.qml b/accounts/gkleen@sif/shell/quickshell/UnixIPC.qml
new file mode 100644
index 00000000..3d950031
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/UnixIPC.qml
@@ -0,0 +1,106 @@
+import Quickshell
+import Quickshell.Io
+import Quickshell.Services.Pipewire
+import Quickshell.Services.Mpris
+import qs.Services
+import Custom as Custom
+import QtQml
+
+Scope {
+  id: root
+
+  SocketServer {
+    active: true
+    path: `${Quickshell.env("XDG_RUNTIME_DIR")}/shell.sock`
+    handler: Socket {
+      parser: SplitParser {
+        onRead: line => {
+          const command = (() => {
+            try {
+              return JSON.parse(line);
+            } catch (e) {
+              console.warn("UnixIPC: Failed to parse command:", line, e);
+            }
+          })();
+          if (!command)
+            return;
+
+          if (command.Volume)
+            root.onCommandVolume(command.Volume);
+          else if (command.Brightness)
+            root.onCommandBrightness(command.Brightness);
+          else if (command.LockSession)
+            Custom.Systemd.lockSession();
+          else if (command.Suspend)
+            Custom.Systemd.suspend();
+          else if (command.Hibernate)
+            Custom.Systemd.hibernate();
+          else if (command.Mpris)
+            root.onCommandMpris(command.Mpris);
+          else if (command.Notifications)
+            root.onCommandNotifications(command.Notifications);
+          else if (command.ScreenRecord)
+            root.onCommandScreenRecord(command.ScreenRecord);
+          else
+            console.warn("UnixIPC: Command not handled:", JSON.stringify(command));
+        }
+      }
+
+      onError: e => {
+        if (e == 1)
+          return;
+        console.warn("QLocalSocket::LocalSocketError", e);
+      }
+    }
+  }
+
+  PwObjectTracker {
+    objects: [ Pipewire.defaultAudioSink, Pipewire.defaultAudioSource ]
+  }
+  function onCommandVolume(command) {
+    if (command.muted === "toggle")
+      Pipewire.defaultAudioSink.audio.muted = !Pipewire.defaultAudioSink.audio.muted;
+    if (command.volume === "up")
+      Pipewire.defaultAudioSink.audio.volume += 0.02;
+    if (command.volume === "down")
+      Pipewire.defaultAudioSink.audio.volume -= 0.02;
+
+    if (command["mic-muted"] === "toggle")
+      Pipewire.defaultAudioSource.audio.muted = !Pipewire.defaultAudioSource.audio.muted;
+  }
+
+  function onCommandBrightness(command) {
+    if (command === "up")
+      Brightness.currBrightness += 0.02
+    if (command === "down")
+      Brightness.currBrightness -= 0.02
+  }
+
+  function onCommandMpris(command) {
+    if (command.PauseAll)
+      Array.from(MprisProxy.players).forEach(player => {
+        if (player.canPause && player.isPlaying)
+          player.pause();
+      });
+  }
+  Component.onCompleted: { (_ => {})(MprisProxy.players); }
+
+  function onCommandNotifications(command) {
+    if (command.DismissGroup && NotificationManager.active) {
+      if (NotificationManager.groups.length > 0)
+        for (const notif of [...NotificationManager.groups[0]])
+          notif.dismiss();
+    }
+    if (command.DismissAll && NotificationManager.active) {
+      for (const notif of [...NotificationManager.trackedNotifications.values])
+        notif.dismiss();
+    }
+  }
+
+  function onCommandScreenRecord(command) {
+    if (command.Toggle)
+      ScreenRecord.active = !ScreenRecord.active;
+    else
+      console.warn("UnixIPC.ScreenRecord: Command not handled:", JSON.stringify(command));
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml b/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml
new file mode 100644
index 00000000..91dc9591
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/VolumeOSD.qml
@@ -0,0 +1,163 @@
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Services.Pipewire
+import Quickshell.Widgets
+
+Scope {
+  id: root
+
+  property string show: ""
+  property bool inhibited: true
+
+  PwObjectTracker {
+    objects: [ Pipewire.defaultAudioSink, Pipewire.defaultAudioSource ]
+  }
+
+  Connections {
+    enabled: Pipewire.defaultAudioSink
+    target: Pipewire.defaultAudioSink?.audio || null
+
+    function onVolumeChanged() {
+      root.show = "sink";
+      hideTimer.restart();
+    }
+    function onMutedChanged() {
+      root.show = "sink";
+      hideTimer.restart();
+    }
+  }
+
+  Connections {
+    enabled: Pipewire.defaultAudioSource
+    target: Pipewire.defaultAudioSource?.audio || null
+
+    function onVolumeChanged() {
+      root.show = "source";
+      hideTimer.restart();
+    }
+    function onMutedChanged() {
+      root.show = "source";
+      hideTimer.restart();
+    }
+  }
+
+  onShowChanged: {
+    if (show)
+      hideTimer.restart();
+  }
+
+  Timer {
+    id: hideTimer
+    interval: 1000
+    onTriggered: root.show = ""
+  }
+
+  Timer {
+    id: startInhibit
+    interval: 100
+    running: true
+    onTriggered: {
+      root.show = "";
+      root.inhibited = false;
+    }
+  }
+
+  LazyLoader {
+    active: root.show && !root.inhibited
+
+    Variants {
+      model: Quickshell.screens
+
+      delegate: Scope {
+        id: screenScope
+
+        required property var modelData
+
+        PanelWindow {
+          id: window
+
+          screen: screenScope.modelData
+
+          anchors.top: true
+          margins.top: screen.height / 2 - 50 + 3.5
+          exclusiveZone: 0
+          exclusionMode: ExclusionMode.Ignore
+
+          implicitWidth: 400
+          implicitHeight: 50
+
+          mask: Region {}
+
+          color: "transparent"
+
+          Rectangle {
+            anchors.fill: parent
+            color: Qt.rgba(0, 0, 0, 0.75)
+          }
+
+          RowLayout {
+            id: layout
+
+            anchors.centerIn: parent
+
+            height: 50 - 8*2
+            width: 400 - 8*2
+
+            MaterialDesignIcon {
+              id: volumeIcon
+
+              implicitWidth: parent.height
+              implicitHeight: parent.height
+
+              icon: {
+                if (root.show == "sink") {
+                  if (!Pipewire.defaultAudioSink || Pipewire.defaultAudioSink.audio.muted)
+                    return "volume-off";
+                  if (Pipewire.defaultAudioSink.audio.volume <= 0.33)
+                    return "volume-low";
+                  if (Pipewire.defaultAudioSink.audio.volume <= 0.67)
+                    return "volume-medium";
+                  return "volume-high";
+                } else if (root.show == "source") {
+                  if (!Pipewire.defaultAudioSource || Pipewire.defaultAudioSource.audio.muted)
+                    return "microphone-off";
+                  if (Pipewire.defaultAudioSource.audio.volume > 1)
+                    return "microphone-plus";
+                  return "microphone";
+                }
+              return "volume-high";
+              }
+            }
+
+            Rectangle {
+              Layout.fillWidth: true
+
+              implicitHeight: 10
+
+              color: "#50ffffff"
+
+              Rectangle {
+                anchors {
+                  left: parent.left
+                  top: parent.top
+                  bottom: parent.bottom
+                }
+
+                color: Pipewire.defaultAudioSink?.audio.muted ? "#70ffffff" : "white"
+
+                implicitWidth: {
+                  if (root.show == "sink")
+                    return parent.width * (Pipewire.defaultAudioSink?.audio.volume ?? 0);
+                  else if (root.show == "source")
+                    return parent.width * Math.min(1, (Pipewire.defaultAudioSource?.audio.volume ?? 0));
+                  return 0;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
new file mode 100644
index 00000000..4f85a900
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
@@ -0,0 +1,89 @@
+import QtQuick
+import Quickshell
+import qs.Services
+
+Item {
+  id: root
+
+  anchors.fill: parent
+
+  required property string screen
+
+  property Img current: one
+  property string source: selector.selected
+
+  WallpaperSelector {
+    id: selector
+    seed: screen
+  }
+
+  onSourceChanged: {
+    if (!source)
+      current = null;
+    else if (current === one)
+      two.update()
+    else
+      one.update()
+  }
+
+  Img { id: one }
+  Img { id: two }
+
+  component Img: Image {
+    id: img
+
+    function update() {
+      source = root.source || ""
+    }
+
+    anchors.fill: parent
+    fillMode: Image.PreserveAspectCrop
+    smooth: true
+    asynchronous: true
+    cache: false
+
+    opacity: 0
+
+    onStatusChanged: {
+      if (status === Image.Ready) {
+        root.current = this
+      }
+    }
+
+    states: State {
+      name: "visible"
+      when: root.current === img
+
+      PropertyChanges {
+        img.opacity: 1
+      }
+      StateChangeScript {
+        name: "unloadOther"
+        script: {
+          if (img === one)
+            two.source = ""
+          if (img === two)
+            one.source = ""
+        }
+      }
+    }
+
+    transitions: Transition {
+      SequentialAnimation {
+        NumberAnimation {
+          target: img
+          properties: "opacity"
+          duration: {
+            if (img === one && two.source == "" || img === two && one.source == "")
+              return 0;
+            return 5000;
+          }
+          easing.type: Easing.OutCubic
+        }
+        ScriptAction {
+          scriptName: "unloadOther"
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/WaylandInhibitorWidget.qml b/accounts/gkleen@sif/shell/quickshell/WaylandInhibitorWidget.qml
new file mode 100644
index 00000000..0512ff51
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/WaylandInhibitorWidget.qml
@@ -0,0 +1,56 @@
+import Quickshell
+import QtQuick
+import Quickshell.Widgets
+import Quickshell.Wayland
+import qs.Services
+
+Item {
+  id: root
+
+  required property var window
+
+  width: icon.width + 8
+  height: parent.height
+  anchors.verticalCenter: parent.verticalCenter
+
+  IdleInhibitor {
+    id: inhibitor
+    enabled: InhibitorState.waylandIdleInhibited
+    window: root.window
+  }
+
+  WrapperMouseArea {
+    id: widgetMouseArea
+
+    anchors.fill: parent
+
+    hoverEnabled: true
+    cursorShape: Qt.PointingHandCursor
+
+    onClicked: InhibitorState.waylandIdleInhibited = !InhibitorState.waylandIdleInhibited
+
+    Rectangle {
+      anchors.fill: parent
+      color: {
+        if (widgetMouseArea.containsMouse) {
+          return "#33808080";
+        }
+        return "transparent";
+      }
+
+      Item {
+        anchors.fill: parent
+
+        MaterialDesignIcon {
+          id: icon
+
+          implicitSize: 14
+          anchors.centerIn: parent
+
+          icon: inhibitor.enabled ? "eye" : "eye-off"
+          color: inhibitor.enabled ? "white" : "#555"
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
new file mode 100644
index 00000000..d0595b3d
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
@@ -0,0 +1,204 @@
+import Quickshell
+import QtQuick
+import qs.Services
+import Quickshell.Widgets
+import QtQuick.Layouts
+
+Row {
+  id: workspaces
+
+  required property var screen
+
+  property var ignoreWorkspaces: @ignore_workspaces@
+
+  height: parent.height
+  anchors.verticalCenter: parent.verticalCenter
+  spacing: 0
+
+  Repeater {
+    model: ScriptModel {
+      values: {
+        let currWorkspaces = NiriService.workspaces;
+        const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
+        currWorkspaces = currWorkspaces.filter(ws => ws.output == workspaces.screen?.name).filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
+        currWorkspaces.sort((a, b) => {
+          if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
+            return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
+          if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
+            return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
+          return a.idx - b.idx;
+        });
+        return currWorkspaces;
+      }
+    }
+
+    Item {
+      id: wsItem
+
+      property var workspaceData: modelData
+
+      width: wsLabel.contentWidth + 8
+      height: parent.height
+      anchors.verticalCenter: parent.verticalCenter
+
+      WrapperMouseArea {
+        id: mouseArea
+
+        anchors.fill: parent
+
+        hoverEnabled: true
+        cursorShape: Qt.PointingHandCursor
+        enabled: true
+        onClicked: {
+          NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {});
+        }
+
+        Rectangle {
+          anchors.fill: parent
+
+          color: {
+            if (mouseArea.containsMouse) {
+              return "#33808080";
+            }
+            return "transparent";
+          }
+
+          Text {
+            id: wsLabel
+
+            anchors.centerIn: parent
+
+            font.pointSize: 10
+            font.family: "Fira Sans"
+            color: {
+              if (workspaceData.is_active)
+                return "#23fd00";
+              if (workspaceData.active_window_id === null)
+                return "#555";
+              return "white";
+            }
+
+            text: workspaceData.name ? workspaceData.name : workspaceData.idx
+          }
+        }
+      }
+
+      PopupWindow {
+        id: tooltip
+
+        property bool nextVisible: (mouseArea.containsMouse || tooltipMouseArea.containsMouse) && [...windowsModel.values].length > 0
+
+        anchor {
+          item: mouseArea
+          edges: Edges.Bottom | Edges.Left
+        }
+        visible: false
+
+        onNextVisibleChanged: hangTimer.restart()
+
+        Timer {
+          id: hangTimer
+          interval: 100
+          onTriggered: tooltip.visible = tooltip.nextVisible
+        }
+
+        implicitWidth: tooltipContent.implicitWidth
+        implicitHeight: tooltipContent.implicitHeight
+        color: "black"
+
+        WrapperMouseArea {
+          id: tooltipMouseArea
+
+          hoverEnabled: true
+          enabled: true
+
+          anchors.fill: parent
+
+          WrapperItem {
+            id: tooltipContent
+
+            margin: 0
+
+            ColumnLayout  {
+              spacing: 0
+
+              Repeater {
+                model: ScriptModel {
+                  id: windowsModel
+
+                  values: {
+                    let currWindows = Array.from(NiriService.windows).filter(win => win.workspace_id == wsItem.workspaceData.id);
+                    currWindows.sort((a, b) => {
+                      if (a.is_floating !== b.is_floating)
+                        return b.is_floating - a.is_floating;
+                      if (a.layout.tile_pos_in_workspace_view?.[0] !== b.layout.tile_pos_in_workspace_view?.[0])
+                        return a.layout.tile_pos_in_workspace_view?.[0] - b.layout.tile_pos_in_workspace_view?.[0]
+                      if (a.layout.tile_pos_in_workspace_view?.[1] !== b.layout.tile_pos_in_workspace_view?.[1])
+                        return a.layout.tile_pos_in_workspace_view?.[1] - b.layout.tile_pos_in_workspace_view?.[1]
+                      if (a.layout.pos_in_scrolling_layout?.[0] !== b.layout.pos_in_scrolling_layout?.[0])
+                        return a.layout.pos_in_scrolling_layout?.[0] - b.layout.pos_in_scrolling_layout?.[0]
+                      if (a.layout.pos_in_scrolling_layout?.[1] !== b.layout.pos_in_scrolling_layout?.[1])
+                        return a.layout.pos_in_scrolling_layout?.[1] - b.layout.pos_in_scrolling_layout?.[1]
+                      if (a.app_id !== b.app_id)
+                        return a.app_id?.localeCompare(b.app_id);
+
+                      return a.title.localeCompare(b.title);
+                    });
+                    return currWindows;
+                  }
+                }
+
+                WrapperMouseArea {
+                  id: windowMouseArea
+
+                  required property int index
+                  required property var modelData
+                  property var windowData: modelData
+
+                  hoverEnabled: true
+                  cursorShape: Qt.PointingHandCursor
+                  enabled: true
+
+                  Layout.fillWidth: true
+
+                  onClicked: {
+                    NiriService.sendCommand({ "Action": { "FocusWindow": { "id": windowData.id } } }, _ => {})
+                  }
+
+                  WrapperRectangle {
+                    color: windowMouseArea.containsMouse ? "#33808080" : "transparent";
+
+                    WrapperItem {
+                      rightMargin: 8
+                      leftMargin: 8
+                      topMargin: windowMouseArea.index == 0 ? 8 : 4
+                      bottomMargin: windowMouseArea.index == windowsModel.values.length - 1 ? 8 : 4
+
+                      Text {
+                        id: windowLabel
+
+                        font.pointSize: 10
+                        font.family: "Fira Sans"
+                        color: {
+                          if (windowData.is_focused)
+                            return "#23fd00";
+                          if (NiriService.workspaces.find(ws => ws.id == windowData.workspace_id)?.active_window_id == windowData.id)
+                            return "white";
+                          return "#555";
+                        }
+
+                        text: windowData.title
+
+                        horizontalAlignment: Text.AlignLeft
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/WorktimeWidget.qml b/accounts/gkleen@sif/shell/quickshell/WorktimeWidget.qml
new file mode 100644
index 00000000..b7baee34
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/WorktimeWidget.qml
@@ -0,0 +1,212 @@
+import QtQml
+import Quickshell
+import QtQuick
+import Quickshell.Widgets
+import qs.Services
+
+Item {
+  id: root
+
+  height: parent.height
+  width: (timeWidget.visible ? timeWidget.label.contentWidth + 8 : 0) + (todayWidget.visible ? todayWidget.label.contentWidth + 8 : 0) + (icon.visible ? icon.implicitWidth + 8 : 0)
+  anchors.verticalCenter: parent.verticalCenter
+
+  component TextWidget : Item {
+    id: textWidget
+
+    visible: textWidget.state.state?.text ?? false
+
+    required property var state
+    property alias label: label
+    property alias mouseArea: mouseArea
+
+    anchors.verticalCenter: parent.verticalCenter
+    implicitWidth: label.contentWidth + 8
+    height: parent.height
+
+    WrapperMouseArea {
+      id: mouseArea
+
+      anchors.fill: parent
+
+      enabled: true
+      hoverEnabled: true
+      acceptedButtons: Qt.NoButton
+      cursorShape: Qt.PointingHandCursor
+
+      Item {
+        anchors.fill: parent
+
+        Text {
+          id: label
+
+          anchors.centerIn: parent
+
+          text: textWidget.state.state?.text ?? ""
+
+          font.pointSize: 10
+          font.family: "Fira Sans"
+          font.strikeout: textWidget.state.strikeout
+          color: {
+            if (textWidget.state.state?.class == "running")
+              return "white";
+            if (textWidget.state.state?.class == "over")
+              return "#f28a21";
+            return "#555";
+          }
+        }
+      }
+    }
+  }
+
+  WrapperMouseArea {
+    id: mouseArea
+
+    anchors.fill: parent
+    hoverEnabled: true
+
+    cursorShape: Qt.PointingHandCursor
+    onClicked: {
+      Worktime.time.running = true;
+      Worktime.today.running = true;
+    }
+
+    Rectangle {
+      anchors.fill: parent
+      color: {
+        if (mouseArea.containsMouse)
+          return "#33808080";
+        return "transparent";
+      }
+
+      Row {
+        height: parent.height
+        anchors.centerIn: parent
+        spacing: 0
+
+        TextWidget {
+          id: timeWidget
+          state: Worktime.time
+        }
+
+        TextWidget {
+          id: todayWidget
+          state: Worktime.today
+        }
+
+        MaterialDesignIcon {
+          id: icon
+
+          anchors.verticalCenter: parent.verticalCenter
+
+          implicitSize: 14
+
+          visible: !timeWidget.visible && !todayWidget.visible
+
+          icon: (Worktime.time.running || Worktime.today.running) ? "update" : "timer-off"
+          color: "#555"
+        }
+      }
+    }
+  }
+
+  component WorktimePopup : PopupWindow {
+    id: tooltip
+
+    required property var state
+    required property var mouseArea
+
+    property bool iconVisible: tooltip.state.running || !tooltip.state.updating
+    property bool tooltipVisible: tooltip.state.state?.tooltip ?? false
+
+    property bool nextVisible: (tooltip.tooltipVisible || tooltip.iconVisible) && (tooltip.mouseArea.containsMouse || tooltipMouseArea.containsMouse)
+
+    anchor {
+      item: tooltip.mouseArea
+      edges: Edges.Bottom | Edges.Left
+    }
+    visible: false
+
+    onNextVisibleChanged: hangTimer.restart()
+
+    Timer {
+      id: hangTimer
+      interval: 100
+      onTriggered: tooltip.visible = tooltip.nextVisible
+    }
+
+    implicitWidth: (tooltipIcon.visible ? tooltipIcon.implicitWidth : 0) + (tooltipIcon.visible && tooltipText.visible ? 8 : 0) + (tooltipText.visible ? tooltipText.implicitWidth : 0) + 16
+    implicitHeight: tooltipText.implicitHeight + 16
+    color: "black"
+
+    WrapperMouseArea {
+      id: tooltipMouseArea
+
+      enabled: true
+      hoverEnabled: true
+
+      anchors.fill: parent
+
+      Item {
+        anchors.fill: parent
+
+        Row {
+          id: tooltipLayout
+
+          anchors {
+            left: parent.left
+            top: parent.top
+            leftMargin: 8
+            topMargin: 8
+            verticalCenter: parent.verticalCenter
+          }
+
+          height: parent.height
+          width: childrenRect.width
+
+          spacing: 0
+
+          MaterialDesignIcon {
+            id: tooltipIcon
+
+            implicitSize: 14
+            anchors.verticalCenter: parent.verticalCenter
+
+            visible: tooltip.iconVisible
+
+            icon: tooltip.state.running ? "update" : "timer-off"
+          }
+
+          Item {
+            visible: tooltipIcon.visible && tooltipText.visible
+            height: parent.height
+            width: 8
+          }
+
+          Text {
+            id: tooltipText
+
+            visible: tooltip.tooltipVisible
+
+            anchors.verticalCenter: parent.verticalCenter
+
+            font.pointSize: 10
+            font.family: "Fira Sans"
+            color: "white"
+
+            text: tooltip.state.state?.tooltip ?? ""
+          }
+        }
+      }
+    }
+  }
+
+  WorktimePopup {
+    state: Worktime.time
+    mouseArea: timeWidget.mouseArea
+  }
+  WorktimePopup {
+    state: Worktime.today
+    mouseArea: todayWidget.mouseArea
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/displaymanager.qml b/accounts/gkleen@sif/shell/quickshell/displaymanager.qml
new file mode 100644
index 00000000..b452c03d
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/displaymanager.qml
@@ -0,0 +1,115 @@
+//@ pragma UseQApplication
+
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Io
+import Quickshell.Services.Greetd
+import QtQml
+
+
+ShellRoot {
+  id: displaymanager
+
+  settings.watchFiles: false
+
+  property string currentText: ""
+  property string username: @username@
+  property list<string> command: @niri_session@
+  property list<var> messages: []
+  property bool responseRequired: false
+  property bool responseVisible: false
+
+  signal startAuth()
+
+  onStartAuth: {
+    if (Greetd.state !== GreetdState.Inactive)
+      Greetd.cancelSession();
+    displaymanager.messages = [];
+    Greetd.createSession(displaymanager.username);
+  }
+
+  Connections {
+    target: Greetd
+    function onStateChanged() {
+      console.log("greetd state: ", GreetdState.toString(Greetd.state));
+      if (Greetd.state === GreetdState.ReadyToLaunch)
+        Greetd.launch(displaymanager.command);
+    }
+    function onAuthMessage(message: string, error: bool, responseRequired: bool, echoResponse: bool) {
+      displaymanager.responseVisible = echoResponse;
+      displaymanager.responseRequired = responseRequired;
+      displaymanager.messages = Array.from(displaymanager.messages).concat([{ "text": message, "error": error }]);
+    }
+    function onAuthFailure(message: string) {
+      displaymanager.responseRequired = false;
+      displaymanager.messages = Array.from(displaymanager.messages).concat([{ "text": message, "error": true }]);
+    }
+  }
+
+  Component.onCompleted: {
+    if (Greetd.state !== GreetdState.Inactive)
+      Greetd.cancelSession();
+  }
+
+  Variants {
+    model: Quickshell.screens
+
+    delegate: Scope {
+      id: screenScope
+
+      required property var modelData
+
+      PanelWindow {
+        color: "black"
+
+        screen: screenScope.modelData
+
+        WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+
+        anchors.top: true
+        anchors.bottom: true
+        anchors.left: true
+        anchors.right: true
+
+        LockSurface {
+          id: surfaceContent
+
+          screen: screenScope.modelData
+
+          onCurrentTextChanged: displaymanager.currentText = currentText
+          Connections {
+            target: displaymanager
+            function onCurrentTextChanged() { surfaceContent.currentText = displaymanager.currentText; }
+            function onMessagesChanged() { surfaceContent.messages = Array.from(displaymanager.messages); }
+            function onResponseRequiredChanged() { surfaceContent.responseRequired = displaymanager.responseRequired; }
+            function onResponseVisibleChanged() { surfaceContent.responseVisible = displaymanager.responseVisible; }
+          }
+
+          onResponse: responseText => Greetd.respond(responseText);
+          Connections {
+            target: Greetd
+            function onStateChanged() {
+              if (Greetd.state === GreetdState.Authenticating) {
+                surfaceContent.authRunning = true;
+              } else {
+                surfaceContent.authRunning = false;
+              }
+            }
+          }
+
+          onAuthRunningChanged: {
+            if (surfaceContent.authRunning && Greetd.state !== GreetdState.Authenticating)
+              displaymanager.startAuth();
+          }
+          Component.onCompleted: {
+            surfaceContent.authRunning = Greetd.state === GreetdState.Authenticating
+            surfaceContent.messages = Array.from(displaymanager.messages);
+            surfaceContent.responseVisible = displaymanager.responseVisible;
+            surfaceContent.responseRequired = displaymanager.responseRequired;
+            surfaceContent.currentText = displaymanager.currentText;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/shell.qml b/accounts/gkleen@sif/shell/quickshell/shell.qml
new file mode 100644
index 00000000..1a5875f0
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/shell.qml
@@ -0,0 +1,53 @@
+//@ pragma UseQApplication
+
+import Quickshell
+import Quickshell.Wayland
+
+ShellRoot {
+  settings.watchFiles: false
+
+  Variants {
+    model: Quickshell.screens
+
+    delegate: Scope {
+      id: screenScope
+
+      required property var modelData
+
+      PanelWindow {
+        id: bgWindow
+
+        screen: screenScope.modelData
+
+        WlrLayershell.layer: WlrLayer.Background
+        WlrLayershell.namespace: "background"
+        exclusionMode: ExclusionMode.Ignore
+
+        anchors.top: true
+        anchors.bottom: true
+        anchors.left: true
+        anchors.right: true
+
+        color: "black"
+
+        WallpaperBackground {
+          screen: bgWindow.screen.name
+        }
+      }
+
+      Bar {
+        screen: screenScope.modelData
+      }
+    }
+  }
+
+  Lockscreen {}
+  NiriIdle {}
+
+  VolumeOSD {}
+  BrightnessOSD {}
+
+  NotificationDisplay {}
+
+  UnixIPC {}
+}
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 107f1e76..0b49f385 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -1,5 +1,13 @@
-{ pkgs, ... }:
-{
+{ lib, pkgs, ... }:
+let
+  autosshProxyPorts = {
+    "ssh.math.lmu.de" = 8118;
+    "mathw0h" = 8122;
+    "mathw0e" = 8124;
+    "cip04" = 8126;
+  };
+  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 +298,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 +314,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 +325,27 @@
     };
   "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";
+        ServerAliveCountMax = "15";
+        ServerAliveInterval = "2";
+      };
+    };
+  "proxy.cip04" =
+    { hostname = "cip04.cipmath.loc";
+      proxyCommand = autosshProxy "mathw0h";
       extraOptions = {
         ControlPath = "none";
         ExitOnForwardFailure = "yes";
@@ -327,7 +355,7 @@
     };
   "vrt-kvm06" =
     { hostname = "vrt-kvm06";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -336,7 +364,7 @@
     };
   "vrt-kvm05" =
     { hostname = "vrt-kvm05";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -345,7 +373,7 @@
     };
   "vrt-kvm04" =
     { hostname = "vrt-kvm04";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -354,7 +382,7 @@
     };
   "vrt-kvm02" =
     { hostname = "vrt-kvm02";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -363,7 +391,7 @@
     };
   "vrt-kvm03" =
     { hostname = "vrt-kvm03";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -372,7 +400,7 @@
     };
   "vrt-kvm01" =
     { hostname = "vrt-kvm01";
-      proxyJump = "mathw0e";
+      proxyCommand = autosshProxy "mathw0e";
       user = "root";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -381,39 +409,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 +472,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 +504,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 +579,7 @@
       user = "root";
     };
   "nas*" =
-    { proxyJump = "mathw0e";
+    { proxyCommand = autosshProxy "mathw0e";
       user = "admin";
       extraOptions = {
         PasswordAuthentication = "yes";
@@ -554,9 +587,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 cefcf4ea..2ccbaea0 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,13 +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"];
+        After = [ "graphical-session.target" ];
+        BindsTo = [ "graphical-session.target" ];
       };
     };
     keepassxc = {
@@ -135,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 = {
@@ -145,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";
@@ -153,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;
@@ -172,11 +171,56 @@ in {
       };
       Unit = {
         StopWhenUnneeded = true;
+        StartLimitInterval = "2s";
+        StartLimitBurst = 25;
       };
     };
-    swayidle = {
+    "autossh-socks@proxy.mathw0h:8123" = {
       Service = {
-        RuntimeDirectory = "swayidle";
+        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;
+      };
+    };
+    "autossh-socks@proxy.cip04:8127" = {
+      Service = {
+        Type = "notify";
+        NotifyAccess = "all";
+        WorkingDirectory = "~";
+        Restart = "always";
+        RestartSec = "23s";
+        ExecStart = "${autossh-socks-script} \"%I\"";
+        Environment = [ "SSHPASS_SECRET=gkleen@cip04.cipmath.loc" ];
+      };
+      Unit = {
+        StopWhenUnneeded = true;
+        StartLimitInterval = "180s";
+        StartLimitBurst = 7;
       };
     };
     psi-notify = {
@@ -184,8 +228,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;
@@ -198,6 +242,7 @@ in {
     gtklock = {
       Unit = {
         Requisite = ["graphical-session.target"];
+        After = [ "graphical-session.target" ];
         PartOf = ["graphical-session.target"];
       };
       Service = {
@@ -205,53 +250,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"
+          "-${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
 
-            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
         ''}'';
       };
     };
@@ -299,38 +346,101 @@ in {
         ExecStopPost = "${pkgs.coreutils}/bin/rm -rfv \"$CACHE_DIRECTORY\"";
       };
     };
-    wpaperd = {
+    # 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"];
+      };
+    };
+    poweralertd = {
+      Unit = {
+        After = ["graphical-session.target"];
+      };
+    };
+    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 = ["graphical-session.target"];
+        WantedBy = lib.mkForce ["tray.target"];
       };
+    };
+    alacritty = {
       Unit = {
-        BindsTo = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
+        Requisite = ["graphical-session.target"];
+        After = [ "graphical-session.target" ];
       };
       Service = {
-        ExecStart = lib.getExe cfg.programs.wpaperd.package;
-        Type = "simple";
-        Restart = "always";
-        RestartSec = "2s";
+        ExecStart = "${lib.getExe pkgs.alacritty} --daemon --socket %t/alacritty-activated.sock";
+      };
+    };
+    alacritty-proxy = {
+      Unit = {
+        Requires = ["alacritty.service" "alacritty-proxy.socket"];
+        After = ["alacritty.service" "alacritty-proxy.socket"];
+      };
+      Service = {
+        Type = "notify";
+        ExecStart = "${config.systemd.package}/lib/systemd/systemd-socket-proxyd %t/alacritty-activated.sock";
       };
     };
   } // 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)}";
+        Restart = "always";
+        RestartSec = "23s";
       };
-  }) [{ 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; } { host = "proxy.cip04"; port = 8126; }]);
   sockets = listToAttrs (map (port: nameValuePair "proxy-to-autossh-socks@${toString port}" {
     Socket = {
       ListenStream = "%I";
+      TriggerLimitIntervalSec = 0;
+      PollLimitIntervalSec = "180s";
+      PollLimitBurst = 6;
     };
     Install = {
       WantedBy = ["default.target"];
     };
-  }) [8118 8120]) // {
+  }) [8118 8122 8124 8126]) // {
+    "proxy-to-autossh-socks@8120" = {
+      Socket = {
+        ListenStream = "%I";
+        TriggerLimitIntervalSec = 0;
+        PollLimitIntervalSec = "2s";
+        PollLimitBurst = 20;
+      };
+      Install = {
+        WantedBy = ["default.target"];
+      };
+    };
     "yt-dlp" = {
       Socket = {
         SocketMode = "0600";
@@ -342,9 +452,18 @@ in {
         WantedBy = ["sockets.target"];
       };
     };
+    "alacritty-proxy" = {
+      Socket = {
+        SocketMode = "0600";
+        ListenStream = "%t/alacritty.sock";
+      };
+      Install = {
+        WantedBy = ["sockets.target"];
+      };
+    };
   };
   timers = {
-    sync-keepass = {
+    "sync-keepass@store.kdbx" = {
       Timer = {
         OnActiveSec = "1m";
         OnUnitActiveSec = "1m";
@@ -354,6 +473,16 @@ in {
         WantedBy = ["default.target"];
       };
     };
+    "sync-keepass@rz.kdbx" = {
+      Timer = {
+        OnActiveSec = "1d";
+        OnUnitActiveSec = "1d";
+      };
+
+      Install = {
+        WantedBy = ["default.target"];
+      };
+    };
   };
   targets = {
     graphical-session = {
@@ -364,6 +493,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/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/ldif2json/conf.patch b/accounts/gkleen@sif/utils/ldif2json/conf.patch
new file mode 100644
index 00000000..e253e5f7
--- /dev/null
+++ b/accounts/gkleen@sif/utils/ldif2json/conf.patch
@@ -0,0 +1,12 @@
+diff --git i/src/conf.cr w/src/conf.cr
+index b29ca84..eb7e0b4 100644
+--- i/src/conf.cr
++++ w/src/conf.cr
+@@ -89,7 +89,6 @@ module Ldif2json
+         
+       end.parse
+ 
+-      puts "@coercions #{@coercions.inspect} @can_be_coerced #{@can_be_coerced.inspect} @can_be_coerced[\"foobar\"] #{@can_be_coerced["foobar"].inspect} @can_be_flattened #{@can_be_flattened.inspect} @can_be_flattened[\"foobar\"] #{@can_be_flattened["foobar"].inspect}"
+       raise NormalError.new("cannot set types in join mode") if @mode == Mode::Join && @coercions.size > 0
+       
+     end
diff --git a/accounts/gkleen@sif/utils/ldif2json/default.nix b/accounts/gkleen@sif/utils/ldif2json/default.nix
new file mode 100644
index 00000000..548ae9b1
--- /dev/null
+++ b/accounts/gkleen@sif/utils/ldif2json/default.nix
@@ -0,0 +1,20 @@
+{ crystal, sources, ... }:
+crystal.buildCrystalPackage {
+  inherit (sources.ldif2json) pname version src;
+
+  patches = [
+    ./conf.patch
+  ];
+
+  buildPhase = ''
+    make bin/ldif2json
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    install -m 0555 -t $out/bin bin/ldif2json
+    install -m 0444 -t $out/share/man/man1 doc/ldif2json.1.gz
+  '';
+
+  doCheck = false;
+}
diff --git a/accounts/gkleen@sif/utils/nixpkgs-pr-watch/.envrc b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/.envrc
new file mode 100644
index 00000000..2c909235
--- /dev/null
+++ b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/.envrc
@@ -0,0 +1,4 @@
+use flake
+
+[[ -d ".venv" ]] || ( uv venv && uv sync )
+. .venv/bin/activate
diff --git a/accounts/gkleen@sif/utils/nixpkgs-pr-watch/.gitignore b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/.gitignore
new file mode 100644
index 00000000..4ccfae70
--- /dev/null
+++ b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/.gitignore
@@ -0,0 +1,2 @@
+.venv
+**/__pycache__
diff --git a/accounts/gkleen@sif/utils/nixpkgs-pr-watch/default.nix b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/default.nix
new file mode 100644
index 00000000..64ee4623
--- /dev/null
+++ b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, flake, flakeInputs, ... }:
+
+let
+  workspace = flakeInputs.uv2nix.lib.workspace.loadWorkspace { workspaceRoot = ./.; };
+  pythonSet = flake.lib.pythonSet {
+    inherit pkgs;
+    python = pkgs.python3;
+    overlay = workspace.mkPyprojectOverlay {
+      sourcePreference = "wheel";
+    };
+  };
+  package = "nixpkgs-pr-watch";
+  venv = pythonSet.mkVirtualEnv package workspace.deps.default;
+  inherit (pkgs.callPackages flakeInputs.pyproject-nix.build.util {}) mkApplication;
+in (mkApplication {
+  inherit venv;
+  package = pythonSet.${package};
+}).overrideAttrs (oldAttrs: {
+  meta = (oldAttrs.meta or {}) // {
+    mainProgram = "nixpkgs-pr-watch";
+  };
+})
diff --git a/accounts/gkleen@sif/utils/nixpkgs-pr-watch/nixpkgs_pr_watch/__init__.py b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/nixpkgs_pr_watch/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/nixpkgs_pr_watch/__init__.py
diff --git a/accounts/gkleen@sif/utils/nixpkgs-pr-watch/nixpkgs_pr_watch/__main__.py b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/nixpkgs_pr_watch/__main__.py
new file mode 100644
index 00000000..09bb8651
--- /dev/null
+++ b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/nixpkgs_pr_watch/__main__.py
@@ -0,0 +1,73 @@
+import argparse
+import re
+import requests
+from urllib.parse import urljoin
+from xdg_base_dirs import xdg_config_home, xdg_config_dirs
+import toml
+import sys
+
+from github import Github
+
+class ApiKeyAuth(requests.auth.AuthBase):
+    def __init__(self, token):
+        self.token = token
+    def __call__(self, r):
+        r.headers["x-api-key"] = self.token
+        return r
+
+class ChangeDetectionSession(requests.Session):
+    def __init__(self, base_url: str, api_token: str):
+        super().__init__()
+        self.base_url = base_url
+        self.auth = ApiKeyAuth(api_token)
+
+    def request(self, method, url, *args, **kwargs):
+        joined_url = urljoin(urljoin(self.base_url, '/api/v1/'), url)
+        return super().request(method, joined_url, *args, **kwargs)
+
+def main():
+    def pr_number(s):
+        if m := re.fullmatch(r'(?:https?://github\.com/NixOS/nixpkgs/pull/)?(?P<pr>[0-9]+)(?:[^0-9].*)?', s, flags=re.I):
+            return int(m.group('pr'))
+        else:
+            raise ValueError
+
+    parser = argparse.ArgumentParser(prog = "nixpkgs-pr-watch")
+    parser.add_argument('prs', metavar = 'PR', type = pr_number, nargs = '+')
+
+    args = parser.parse_args()
+
+    config = None
+    for d in [xdg_config_home(), *xdg_config_dirs()]:
+        try:
+            config = toml.load(d / 'nixpkgs-pr-watch.toml')
+            break
+        except FileNotFoundError:
+            pass
+
+    for pr in args.prs:
+        pr_title = None
+        with Github() as g:
+            pr_title = g.get_repo('NixOS/nixpkgs').get_pull(pr).title
+
+        api = ChangeDetectionSession(
+            base_url = config.get("BaseUrl"),
+            api_token = config.get("ApiToken"),
+        )
+        try:
+            api.post(
+                "watch",
+                headers = {
+                    'Content-Type': 'application/json',
+                },
+                json = {
+                    "url": urljoin("https://nixpkgs.molybdenum.software/api/v2/landings/", str(pr)),
+                    **({ "title": pr_title } if pr_title else {}),
+                    "time_between_check_use_default": False,
+                    "time_between_check": { "hours": 1 },
+                    "fetch_backend": "html_requests",
+                },
+            ).raise_for_status()
+        except requests.HTTPError as e:
+            print(e.response.text, file=sys.stderr)
+            raise e
diff --git a/accounts/gkleen@sif/utils/nixpkgs-pr-watch/pyproject.toml b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/pyproject.toml
new file mode 100644
index 00000000..593c1dc7
--- /dev/null
+++ b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/pyproject.toml
@@ -0,0 +1,17 @@
+[project]
+name = "nixpkgs-pr-watch"
+version = "0.1.0"
+requires-python = ">=3.13"
+dependencies = [
+    "pygithub>=2.8.1",
+    "requests>=2.32.5",
+    "toml>=0.10.2",
+    "xdg-base-dirs>=6.0.2",
+]
+
+[project.scripts]
+nixpkgs-pr-watch = "nixpkgs_pr_watch.__main__:main"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
diff --git a/accounts/gkleen@sif/utils/nixpkgs-pr-watch/uv.lock b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/uv.lock
new file mode 100644
index 00000000..65537049
--- /dev/null
+++ b/accounts/gkleen@sif/utils/nixpkgs-pr-watch/uv.lock
@@ -0,0 +1,309 @@
+version = 1
+revision = 3
+requires-python = ">=3.13"
+
+[[package]]
+name = "certifi"
+version = "2025.11.12"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a2/8c/58f469717fa48465e4a50c014a0400602d3c437d7c0c468e17ada824da3a/certifi-2025.11.12.tar.gz", hash = "sha256:d8ab5478f2ecd78af242878415affce761ca6bc54a22a27e026d7c25357c3316", size = 160538, upload-time = "2025-11-12T02:54:51.517Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/70/7d/9bc192684cea499815ff478dfcdc13835ddf401365057044fb721ec6bddb/certifi-2025.11.12-py3-none-any.whl", hash = "sha256:97de8790030bbd5c2d96b7ec782fc2f7820ef8dba6db909ccf95449f2d062d4b", size = 159438, upload-time = "2025-11-12T02:54:49.735Z" },
+]
+
+[[package]]
+name = "cffi"
+version = "2.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pycparser", marker = "implementation_name != 'PyPy'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/4b/8d/a0a47a0c9e413a658623d014e91e74a50cdd2c423f7ccfd44086ef767f90/cffi-2.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:00bdf7acc5f795150faa6957054fbbca2439db2f775ce831222b66f192f03beb", size = 185230, upload-time = "2025-09-08T23:23:00.879Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/d2/a6c0296814556c68ee32009d9c2ad4f85f2707cdecfd7727951ec228005d/cffi-2.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:45d5e886156860dc35862657e1494b9bae8dfa63bf56796f2fb56e1679fc0bca", size = 181043, upload-time = "2025-09-08T23:23:02.231Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/1e/d22cc63332bd59b06481ceaac49d6c507598642e2230f201649058a7e704/cffi-2.0.0-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:07b271772c100085dd28b74fa0cd81c8fb1a3ba18b21e03d7c27f3436a10606b", size = 212446, upload-time = "2025-09-08T23:23:03.472Z" },
+    { url = "https://files.pythonhosted.org/packages/a9/f5/a2c23eb03b61a0b8747f211eb716446c826ad66818ddc7810cc2cc19b3f2/cffi-2.0.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d48a880098c96020b02d5a1f7d9251308510ce8858940e6fa99ece33f610838b", size = 220101, upload-time = "2025-09-08T23:23:04.792Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/7f/e6647792fc5850d634695bc0e6ab4111ae88e89981d35ac269956605feba/cffi-2.0.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f93fd8e5c8c0a4aa1f424d6173f14a892044054871c771f8566e4008eaa359d2", size = 207948, upload-time = "2025-09-08T23:23:06.127Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/1e/a5a1bd6f1fb30f22573f76533de12a00bf274abcdc55c8edab639078abb6/cffi-2.0.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:dd4f05f54a52fb558f1ba9f528228066954fee3ebe629fc1660d874d040ae5a3", size = 206422, upload-time = "2025-09-08T23:23:07.753Z" },
+    { url = "https://files.pythonhosted.org/packages/98/df/0a1755e750013a2081e863e7cd37e0cdd02664372c754e5560099eb7aa44/cffi-2.0.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c8d3b5532fc71b7a77c09192b4a5a200ea992702734a2e9279a37f2478236f26", size = 219499, upload-time = "2025-09-08T23:23:09.648Z" },
+    { url = "https://files.pythonhosted.org/packages/50/e1/a969e687fcf9ea58e6e2a928ad5e2dd88cc12f6f0ab477e9971f2309b57c/cffi-2.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:d9b29c1f0ae438d5ee9acb31cadee00a58c46cc9c0b2f9038c6b0b3470877a8c", size = 222928, upload-time = "2025-09-08T23:23:10.928Z" },
+    { url = "https://files.pythonhosted.org/packages/36/54/0362578dd2c9e557a28ac77698ed67323ed5b9775ca9d3fe73fe191bb5d8/cffi-2.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6d50360be4546678fc1b79ffe7a66265e28667840010348dd69a314145807a1b", size = 221302, upload-time = "2025-09-08T23:23:12.42Z" },
+    { url = "https://files.pythonhosted.org/packages/eb/6d/bf9bda840d5f1dfdbf0feca87fbdb64a918a69bca42cfa0ba7b137c48cb8/cffi-2.0.0-cp313-cp313-win32.whl", hash = "sha256:74a03b9698e198d47562765773b4a8309919089150a0bb17d829ad7b44b60d27", size = 172909, upload-time = "2025-09-08T23:23:14.32Z" },
+    { url = "https://files.pythonhosted.org/packages/37/18/6519e1ee6f5a1e579e04b9ddb6f1676c17368a7aba48299c3759bbc3c8b3/cffi-2.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:19f705ada2530c1167abacb171925dd886168931e0a7b78f5bffcae5c6b5be75", size = 183402, upload-time = "2025-09-08T23:23:15.535Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/0e/02ceeec9a7d6ee63bb596121c2c8e9b3a9e150936f4fbef6ca1943e6137c/cffi-2.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:256f80b80ca3853f90c21b23ee78cd008713787b1b1e93eae9f3d6a7134abd91", size = 177780, upload-time = "2025-09-08T23:23:16.761Z" },
+    { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" },
+    { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/89/76799151d9c2d2d1ead63c2429da9ea9d7aac304603de0c6e8764e6e8e70/cffi-2.0.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:12873ca6cb9b0f0d3a0da705d6086fe911591737a59f28b7936bdfed27c0d47c", size = 207793, upload-time = "2025-09-08T23:23:22.08Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/dd/3465b14bb9e24ee24cb88c9e3730f6de63111fffe513492bf8c808a3547e/cffi-2.0.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:d9b97165e8aed9272a6bb17c01e3cc5871a594a446ebedc996e2397a1c1ea8ef", size = 206300, upload-time = "2025-09-08T23:23:23.314Z" },
+    { url = "https://files.pythonhosted.org/packages/47/d9/d83e293854571c877a92da46fdec39158f8d7e68da75bf73581225d28e90/cffi-2.0.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:afb8db5439b81cf9c9d0c80404b60c3cc9c3add93e114dcae767f1477cb53775", size = 219244, upload-time = "2025-09-08T23:23:24.541Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/0f/1f177e3683aead2bb00f7679a16451d302c436b5cbf2505f0ea8146ef59e/cffi-2.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:737fe7d37e1a1bffe70bd5754ea763a62a066dc5913ca57e957824b72a85e205", size = 222828, upload-time = "2025-09-08T23:23:26.143Z" },
+    { url = "https://files.pythonhosted.org/packages/c6/0f/cafacebd4b040e3119dcb32fed8bdef8dfe94da653155f9d0b9dc660166e/cffi-2.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:38100abb9d1b1435bc4cc340bb4489635dc2f0da7456590877030c9b3d40b0c1", size = 220926, upload-time = "2025-09-08T23:23:27.873Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/aa/df335faa45b395396fcbc03de2dfcab242cd61a9900e914fe682a59170b1/cffi-2.0.0-cp314-cp314-win32.whl", hash = "sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f", size = 175328, upload-time = "2025-09-08T23:23:44.61Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/92/882c2d30831744296ce713f0feb4c1cd30f346ef747b530b5318715cc367/cffi-2.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25", size = 185650, upload-time = "2025-09-08T23:23:45.848Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/2c/98ece204b9d35a7366b5b2c6539c350313ca13932143e79dc133ba757104/cffi-2.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad", size = 180687, upload-time = "2025-09-08T23:23:47.105Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/61/c768e4d548bfa607abcda77423448df8c471f25dbe64fb2ef6d555eae006/cffi-2.0.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:9a67fc9e8eb39039280526379fb3a70023d77caec1852002b4da7e8b270c4dd9", size = 188773, upload-time = "2025-09-08T23:23:29.347Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/ea/5f76bce7cf6fcd0ab1a1058b5af899bfbef198bea4d5686da88471ea0336/cffi-2.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7a66c7204d8869299919db4d5069a82f1561581af12b11b3c9f48c584eb8743d", size = 185013, upload-time = "2025-09-08T23:23:30.63Z" },
+    { url = "https://files.pythonhosted.org/packages/be/b4/c56878d0d1755cf9caa54ba71e5d049479c52f9e4afc230f06822162ab2f/cffi-2.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7cc09976e8b56f8cebd752f7113ad07752461f48a58cbba644139015ac24954c", size = 221593, upload-time = "2025-09-08T23:23:31.91Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/0d/eb704606dfe8033e7128df5e90fee946bbcb64a04fcdaa97321309004000/cffi-2.0.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:92b68146a71df78564e4ef48af17551a5ddd142e5190cdf2c5624d0c3ff5b2e8", size = 209354, upload-time = "2025-09-08T23:23:33.214Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/19/3c435d727b368ca475fb8742ab97c9cb13a0de600ce86f62eab7fa3eea60/cffi-2.0.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b1e74d11748e7e98e2f426ab176d4ed720a64412b6a15054378afdb71e0f37dc", size = 208480, upload-time = "2025-09-08T23:23:34.495Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/44/681604464ed9541673e486521497406fadcc15b5217c3e326b061696899a/cffi-2.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:28a3a209b96630bca57cce802da70c266eb08c6e97e5afd61a75611ee6c64592", size = 221584, upload-time = "2025-09-08T23:23:36.096Z" },
+    { url = "https://files.pythonhosted.org/packages/25/8e/342a504ff018a2825d395d44d63a767dd8ebc927ebda557fecdaca3ac33a/cffi-2.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7553fb2090d71822f02c629afe6042c299edf91ba1bf94951165613553984512", size = 224443, upload-time = "2025-09-08T23:23:37.328Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/5e/b666bacbbc60fbf415ba9988324a132c9a7a0448a9a8f125074671c0f2c3/cffi-2.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6c6c373cfc5c83a975506110d17457138c8c63016b563cc9ed6e056a82f13ce4", size = 223437, upload-time = "2025-09-08T23:23:38.945Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/1d/ec1a60bd1a10daa292d3cd6bb0b359a81607154fb8165f3ec95fe003b85c/cffi-2.0.0-cp314-cp314t-win32.whl", hash = "sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e", size = 180487, upload-time = "2025-09-08T23:23:40.423Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/41/4c1168c74fac325c0c8156f04b6749c8b6a8f405bbf91413ba088359f60d/cffi-2.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6", size = 191726, upload-time = "2025-09-08T23:23:41.742Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/3a/dbeec9d1ee0844c679f6bb5d6ad4e9f198b1224f4e7a32825f47f6192b0c/cffi-2.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9", size = 184195, upload-time = "2025-09-08T23:23:43.004Z" },
+]
+
+[[package]]
+name = "charset-normalizer"
+version = "3.4.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/13/69/33ddede1939fdd074bce5434295f38fae7136463422fe4fd3e0e89b98062/charset_normalizer-3.4.4.tar.gz", hash = "sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a", size = 129418, upload-time = "2025-10-14T04:42:32.879Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/97/45/4b3a1239bbacd321068ea6e7ac28875b03ab8bc0aa0966452db17cd36714/charset_normalizer-3.4.4-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:e1f185f86a6f3403aa2420e815904c67b2f9ebc443f045edd0de921108345794", size = 208091, upload-time = "2025-10-14T04:41:13.346Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/62/73a6d7450829655a35bb88a88fca7d736f9882a27eacdca2c6d505b57e2e/charset_normalizer-3.4.4-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b39f987ae8ccdf0d2642338faf2abb1862340facc796048b604ef14919e55ed", size = 147936, upload-time = "2025-10-14T04:41:14.461Z" },
+    { url = "https://files.pythonhosted.org/packages/89/c5/adb8c8b3d6625bef6d88b251bbb0d95f8205831b987631ab0c8bb5d937c2/charset_normalizer-3.4.4-cp313-cp313-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:3162d5d8ce1bb98dd51af660f2121c55d0fa541b46dff7bb9b9f86ea1d87de72", size = 144180, upload-time = "2025-10-14T04:41:15.588Z" },
+    { url = "https://files.pythonhosted.org/packages/91/ed/9706e4070682d1cc219050b6048bfd293ccf67b3d4f5a4f39207453d4b99/charset_normalizer-3.4.4-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:81d5eb2a312700f4ecaa977a8235b634ce853200e828fbadf3a9c50bab278328", size = 161346, upload-time = "2025-10-14T04:41:16.738Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/0d/031f0d95e4972901a2f6f09ef055751805ff541511dc1252ba3ca1f80cf5/charset_normalizer-3.4.4-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5bd2293095d766545ec1a8f612559f6b40abc0eb18bb2f5d1171872d34036ede", size = 158874, upload-time = "2025-10-14T04:41:17.923Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/83/6ab5883f57c9c801ce5e5677242328aa45592be8a00644310a008d04f922/charset_normalizer-3.4.4-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a8a8b89589086a25749f471e6a900d3f662d1d3b6e2e59dcecf787b1cc3a1894", size = 153076, upload-time = "2025-10-14T04:41:19.106Z" },
+    { url = "https://files.pythonhosted.org/packages/75/1e/5ff781ddf5260e387d6419959ee89ef13878229732732ee73cdae01800f2/charset_normalizer-3.4.4-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc7637e2f80d8530ee4a78e878bce464f70087ce73cf7c1caf142416923b98f1", size = 150601, upload-time = "2025-10-14T04:41:20.245Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/57/71be810965493d3510a6ca79b90c19e48696fb1ff964da319334b12677f0/charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f8bf04158c6b607d747e93949aa60618b61312fe647a6369f88ce2ff16043490", size = 150376, upload-time = "2025-10-14T04:41:21.398Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/d5/c3d057a78c181d007014feb7e9f2e65905a6c4ef182c0ddf0de2924edd65/charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:554af85e960429cf30784dd47447d5125aaa3b99a6f0683589dbd27e2f45da44", size = 144825, upload-time = "2025-10-14T04:41:22.583Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/8c/d0406294828d4976f275ffbe66f00266c4b3136b7506941d87c00cab5272/charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:74018750915ee7ad843a774364e13a3db91682f26142baddf775342c3f5b1133", size = 162583, upload-time = "2025-10-14T04:41:23.754Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/24/e2aa1f18c8f15c4c0e932d9287b8609dd30ad56dbe41d926bd846e22fb8d/charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:c0463276121fdee9c49b98908b3a89c39be45d86d1dbaa22957e38f6321d4ce3", size = 150366, upload-time = "2025-10-14T04:41:25.27Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/5b/1e6160c7739aad1e2df054300cc618b06bf784a7a164b0f238360721ab86/charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:362d61fd13843997c1c446760ef36f240cf81d3ebf74ac62652aebaf7838561e", size = 160300, upload-time = "2025-10-14T04:41:26.725Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/10/f882167cd207fbdd743e55534d5d9620e095089d176d55cb22d5322f2afd/charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9a26f18905b8dd5d685d6d07b0cdf98a79f3c7a918906af7cc143ea2e164c8bc", size = 154465, upload-time = "2025-10-14T04:41:28.322Z" },
+    { url = "https://files.pythonhosted.org/packages/89/66/c7a9e1b7429be72123441bfdbaf2bc13faab3f90b933f664db506dea5915/charset_normalizer-3.4.4-cp313-cp313-win32.whl", hash = "sha256:9b35f4c90079ff2e2edc5b26c0c77925e5d2d255c42c74fdb70fb49b172726ac", size = 99404, upload-time = "2025-10-14T04:41:29.95Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/26/b9924fa27db384bdcd97ab83b4f0a8058d96ad9626ead570674d5e737d90/charset_normalizer-3.4.4-cp313-cp313-win_amd64.whl", hash = "sha256:b435cba5f4f750aa6c0a0d92c541fb79f69a387c91e61f1795227e4ed9cece14", size = 107092, upload-time = "2025-10-14T04:41:31.188Z" },
+    { url = "https://files.pythonhosted.org/packages/af/8f/3ed4bfa0c0c72a7ca17f0380cd9e4dd842b09f664e780c13cff1dcf2ef1b/charset_normalizer-3.4.4-cp313-cp313-win_arm64.whl", hash = "sha256:542d2cee80be6f80247095cc36c418f7bddd14f4a6de45af91dfad36d817bba2", size = 100408, upload-time = "2025-10-14T04:41:32.624Z" },
+    { url = "https://files.pythonhosted.org/packages/2a/35/7051599bd493e62411d6ede36fd5af83a38f37c4767b92884df7301db25d/charset_normalizer-3.4.4-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:da3326d9e65ef63a817ecbcc0df6e94463713b754fe293eaa03da99befb9a5bd", size = 207746, upload-time = "2025-10-14T04:41:33.773Z" },
+    { url = "https://files.pythonhosted.org/packages/10/9a/97c8d48ef10d6cd4fcead2415523221624bf58bcf68a802721a6bc807c8f/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8af65f14dc14a79b924524b1e7fffe304517b2bff5a58bf64f30b98bbc5079eb", size = 147889, upload-time = "2025-10-14T04:41:34.897Z" },
+    { url = "https://files.pythonhosted.org/packages/10/bf/979224a919a1b606c82bd2c5fa49b5c6d5727aa47b4312bb27b1734f53cd/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:74664978bb272435107de04e36db5a9735e78232b85b77d45cfb38f758efd33e", size = 143641, upload-time = "2025-10-14T04:41:36.116Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/33/0ad65587441fc730dc7bd90e9716b30b4702dc7b617e6ba4997dc8651495/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:752944c7ffbfdd10c074dc58ec2d5a8a4cd9493b314d367c14d24c17684ddd14", size = 160779, upload-time = "2025-10-14T04:41:37.229Z" },
+    { url = "https://files.pythonhosted.org/packages/67/ed/331d6b249259ee71ddea93f6f2f0a56cfebd46938bde6fcc6f7b9a3d0e09/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d1f13550535ad8cff21b8d757a3257963e951d96e20ec82ab44bc64aeb62a191", size = 159035, upload-time = "2025-10-14T04:41:38.368Z" },
+    { url = "https://files.pythonhosted.org/packages/67/ff/f6b948ca32e4f2a4576aa129d8bed61f2e0543bf9f5f2b7fc3758ed005c9/charset_normalizer-3.4.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ecaae4149d99b1c9e7b88bb03e3221956f68fd6d50be2ef061b2381b61d20838", size = 152542, upload-time = "2025-10-14T04:41:39.862Z" },
+    { url = "https://files.pythonhosted.org/packages/16/85/276033dcbcc369eb176594de22728541a925b2632f9716428c851b149e83/charset_normalizer-3.4.4-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:cb6254dc36b47a990e59e1068afacdcd02958bdcce30bb50cc1700a8b9d624a6", size = 149524, upload-time = "2025-10-14T04:41:41.319Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/f2/6a2a1f722b6aba37050e626530a46a68f74e63683947a8acff92569f979a/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c8ae8a0f02f57a6e61203a31428fa1d677cbe50c93622b4149d5c0f319c1d19e", size = 150395, upload-time = "2025-10-14T04:41:42.539Z" },
+    { url = "https://files.pythonhosted.org/packages/60/bb/2186cb2f2bbaea6338cad15ce23a67f9b0672929744381e28b0592676824/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:47cc91b2f4dd2833fddaedd2893006b0106129d4b94fdb6af1f4ce5a9965577c", size = 143680, upload-time = "2025-10-14T04:41:43.661Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/a5/bf6f13b772fbb2a90360eb620d52ed8f796f3c5caee8398c3b2eb7b1c60d/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:82004af6c302b5d3ab2cfc4cc5f29db16123b1a8417f2e25f9066f91d4411090", size = 162045, upload-time = "2025-10-14T04:41:44.821Z" },
+    { url = "https://files.pythonhosted.org/packages/df/c5/d1be898bf0dc3ef9030c3825e5d3b83f2c528d207d246cbabe245966808d/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:2b7d8f6c26245217bd2ad053761201e9f9680f8ce52f0fcd8d0755aeae5b2152", size = 149687, upload-time = "2025-10-14T04:41:46.442Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/42/90c1f7b9341eef50c8a1cb3f098ac43b0508413f33affd762855f67a410e/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:799a7a5e4fb2d5898c60b640fd4981d6a25f1c11790935a44ce38c54e985f828", size = 160014, upload-time = "2025-10-14T04:41:47.631Z" },
+    { url = "https://files.pythonhosted.org/packages/76/be/4d3ee471e8145d12795ab655ece37baed0929462a86e72372fd25859047c/charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:99ae2cffebb06e6c22bdc25801d7b30f503cc87dbd283479e7b606f70aff57ec", size = 154044, upload-time = "2025-10-14T04:41:48.81Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/6f/8f7af07237c34a1defe7defc565a9bc1807762f672c0fde711a4b22bf9c0/charset_normalizer-3.4.4-cp314-cp314-win32.whl", hash = "sha256:f9d332f8c2a2fcbffe1378594431458ddbef721c1769d78e2cbc06280d8155f9", size = 99940, upload-time = "2025-10-14T04:41:49.946Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/51/8ade005e5ca5b0d80fb4aff72a3775b325bdc3d27408c8113811a7cbe640/charset_normalizer-3.4.4-cp314-cp314-win_amd64.whl", hash = "sha256:8a6562c3700cce886c5be75ade4a5db4214fda19fede41d9792d100288d8f94c", size = 107104, upload-time = "2025-10-14T04:41:51.051Z" },
+    { url = "https://files.pythonhosted.org/packages/da/5f/6b8f83a55bb8278772c5ae54a577f3099025f9ade59d0136ac24a0df4bde/charset_normalizer-3.4.4-cp314-cp314-win_arm64.whl", hash = "sha256:de00632ca48df9daf77a2c65a484531649261ec9f25489917f09e455cb09ddb2", size = 100743, upload-time = "2025-10-14T04:41:52.122Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/4c/925909008ed5a988ccbb72dcc897407e5d6d3bd72410d69e051fc0c14647/charset_normalizer-3.4.4-py3-none-any.whl", hash = "sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f", size = 53402, upload-time = "2025-10-14T04:42:31.76Z" },
+]
+
+[[package]]
+name = "cryptography"
+version = "46.0.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cffi", marker = "platform_python_implementation != 'PyPy'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/9f/33/c00162f49c0e2fe8064a62cb92b93e50c74a72bc370ab92f86112b33ff62/cryptography-46.0.3.tar.gz", hash = "sha256:a8b17438104fed022ce745b362294d9ce35b4c2e45c1d958ad4a4b019285f4a1", size = 749258, upload-time = "2025-10-15T23:18:31.74Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1d/42/9c391dd801d6cf0d561b5890549d4b27bafcc53b39c31a817e69d87c625b/cryptography-46.0.3-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:109d4ddfadf17e8e7779c39f9b18111a09efb969a301a31e987416a0191ed93a", size = 7225004, upload-time = "2025-10-15T23:16:52.239Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/67/38769ca6b65f07461eb200e85fc1639b438bdc667be02cf7f2cd6a64601c/cryptography-46.0.3-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:09859af8466b69bc3c27bdf4f5d84a665e0f7ab5088412e9e2ec49758eca5cbc", size = 4296667, upload-time = "2025-10-15T23:16:54.369Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/49/498c86566a1d80e978b42f0d702795f69887005548c041636df6ae1ca64c/cryptography-46.0.3-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:01ca9ff2885f3acc98c29f1860552e37f6d7c7d013d7334ff2a9de43a449315d", size = 4450807, upload-time = "2025-10-15T23:16:56.414Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/0a/863a3604112174c8624a2ac3c038662d9e59970c7f926acdcfaed8d61142/cryptography-46.0.3-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:6eae65d4c3d33da080cff9c4ab1f711b15c1d9760809dad6ea763f3812d254cb", size = 4299615, upload-time = "2025-10-15T23:16:58.442Z" },
+    { url = "https://files.pythonhosted.org/packages/64/02/b73a533f6b64a69f3cd3872acb6ebc12aef924d8d103133bb3ea750dc703/cryptography-46.0.3-cp311-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:e5bf0ed4490068a2e72ac03d786693adeb909981cc596425d09032d372bcc849", size = 4016800, upload-time = "2025-10-15T23:17:00.378Z" },
+    { url = "https://files.pythonhosted.org/packages/25/d5/16e41afbfa450cde85a3b7ec599bebefaef16b5c6ba4ec49a3532336ed72/cryptography-46.0.3-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:5ecfccd2329e37e9b7112a888e76d9feca2347f12f37918facbb893d7bb88ee8", size = 4984707, upload-time = "2025-10-15T23:17:01.98Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/56/e7e69b427c3878352c2fb9b450bd0e19ed552753491d39d7d0a2f5226d41/cryptography-46.0.3-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a2c0cd47381a3229c403062f764160d57d4d175e022c1df84e168c6251a22eec", size = 4482541, upload-time = "2025-10-15T23:17:04.078Z" },
+    { url = "https://files.pythonhosted.org/packages/78/f6/50736d40d97e8483172f1bb6e698895b92a223dba513b0ca6f06b2365339/cryptography-46.0.3-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:549e234ff32571b1f4076ac269fcce7a808d3bf98b76c8dd560e42dbc66d7d91", size = 4299464, upload-time = "2025-10-15T23:17:05.483Z" },
+    { url = "https://files.pythonhosted.org/packages/00/de/d8e26b1a855f19d9994a19c702fa2e93b0456beccbcfe437eda00e0701f2/cryptography-46.0.3-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:c0a7bb1a68a5d3471880e264621346c48665b3bf1c3759d682fc0864c540bd9e", size = 4950838, upload-time = "2025-10-15T23:17:07.425Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/29/798fc4ec461a1c9e9f735f2fc58741b0daae30688f41b2497dcbc9ed1355/cryptography-46.0.3-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:10b01676fc208c3e6feeb25a8b83d81767e8059e1fe86e1dc62d10a3018fa926", size = 4481596, upload-time = "2025-10-15T23:17:09.343Z" },
+    { url = "https://files.pythonhosted.org/packages/15/8d/03cd48b20a573adfff7652b76271078e3045b9f49387920e7f1f631d125e/cryptography-46.0.3-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:0abf1ffd6e57c67e92af68330d05760b7b7efb243aab8377e583284dbab72c71", size = 4426782, upload-time = "2025-10-15T23:17:11.22Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/b1/ebacbfe53317d55cf33165bda24c86523497a6881f339f9aae5c2e13e57b/cryptography-46.0.3-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a04bee9ab6a4da801eb9b51f1b708a1b5b5c9eb48c03f74198464c66f0d344ac", size = 4698381, upload-time = "2025-10-15T23:17:12.829Z" },
+    { url = "https://files.pythonhosted.org/packages/96/92/8a6a9525893325fc057a01f654d7efc2c64b9de90413adcf605a85744ff4/cryptography-46.0.3-cp311-abi3-win32.whl", hash = "sha256:f260d0d41e9b4da1ed1e0f1ce571f97fe370b152ab18778e9e8f67d6af432018", size = 3055988, upload-time = "2025-10-15T23:17:14.65Z" },
+    { url = "https://files.pythonhosted.org/packages/7e/bf/80fbf45253ea585a1e492a6a17efcb93467701fa79e71550a430c5e60df0/cryptography-46.0.3-cp311-abi3-win_amd64.whl", hash = "sha256:a9a3008438615669153eb86b26b61e09993921ebdd75385ddd748702c5adfddb", size = 3514451, upload-time = "2025-10-15T23:17:16.142Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/af/9b302da4c87b0beb9db4e756386a7c6c5b8003cd0e742277888d352ae91d/cryptography-46.0.3-cp311-abi3-win_arm64.whl", hash = "sha256:5d7f93296ee28f68447397bf5198428c9aeeab45705a55d53a6343455dcb2c3c", size = 2928007, upload-time = "2025-10-15T23:17:18.04Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/e2/a510aa736755bffa9d2f75029c229111a1d02f8ecd5de03078f4c18d91a3/cryptography-46.0.3-cp314-cp314t-macosx_10_9_universal2.whl", hash = "sha256:00a5e7e87938e5ff9ff5447ab086a5706a957137e6e433841e9d24f38a065217", size = 7158012, upload-time = "2025-10-15T23:17:19.982Z" },
+    { url = "https://files.pythonhosted.org/packages/73/dc/9aa866fbdbb95b02e7f9d086f1fccfeebf8953509b87e3f28fff927ff8a0/cryptography-46.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c8daeb2d2174beb4575b77482320303f3d39b8e81153da4f0fb08eb5fe86a6c5", size = 4288728, upload-time = "2025-10-15T23:17:21.527Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/fd/bc1daf8230eaa075184cbbf5f8cd00ba9db4fd32d63fb83da4671b72ed8a/cryptography-46.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:39b6755623145ad5eff1dab323f4eae2a32a77a7abef2c5089a04a3d04366715", size = 4435078, upload-time = "2025-10-15T23:17:23.042Z" },
+    { url = "https://files.pythonhosted.org/packages/82/98/d3bd5407ce4c60017f8ff9e63ffee4200ab3e23fe05b765cab805a7db008/cryptography-46.0.3-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:db391fa7c66df6762ee3f00c95a89e6d428f4d60e7abc8328f4fe155b5ac6e54", size = 4293460, upload-time = "2025-10-15T23:17:24.885Z" },
+    { url = "https://files.pythonhosted.org/packages/26/e9/e23e7900983c2b8af7a08098db406cf989d7f09caea7897e347598d4cd5b/cryptography-46.0.3-cp314-cp314t-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:78a97cf6a8839a48c49271cdcbd5cf37ca2c1d6b7fdd86cc864f302b5e9bf459", size = 3995237, upload-time = "2025-10-15T23:17:26.449Z" },
+    { url = "https://files.pythonhosted.org/packages/91/15/af68c509d4a138cfe299d0d7ddb14afba15233223ebd933b4bbdbc7155d3/cryptography-46.0.3-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:dfb781ff7eaa91a6f7fd41776ec37c5853c795d3b358d4896fdbb5df168af422", size = 4967344, upload-time = "2025-10-15T23:17:28.06Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/e3/8643d077c53868b681af077edf6b3cb58288b5423610f21c62aadcbe99f4/cryptography-46.0.3-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:6f61efb26e76c45c4a227835ddeae96d83624fb0d29eb5df5b96e14ed1a0afb7", size = 4466564, upload-time = "2025-10-15T23:17:29.665Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/43/c1e8726fa59c236ff477ff2b5dc071e54b21e5a1e51aa2cee1676f1c986f/cryptography-46.0.3-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:23b1a8f26e43f47ceb6d6a43115f33a5a37d57df4ea0ca295b780ae8546e8044", size = 4292415, upload-time = "2025-10-15T23:17:31.686Z" },
+    { url = "https://files.pythonhosted.org/packages/42/f9/2f8fefdb1aee8a8e3256a0568cffc4e6d517b256a2fe97a029b3f1b9fe7e/cryptography-46.0.3-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:b419ae593c86b87014b9be7396b385491ad7f320bde96826d0dd174459e54665", size = 4931457, upload-time = "2025-10-15T23:17:33.478Z" },
+    { url = "https://files.pythonhosted.org/packages/79/30/9b54127a9a778ccd6d27c3da7563e9f2d341826075ceab89ae3b41bf5be2/cryptography-46.0.3-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:50fc3343ac490c6b08c0cf0d704e881d0d660be923fd3076db3e932007e726e3", size = 4466074, upload-time = "2025-10-15T23:17:35.158Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/68/b4f4a10928e26c941b1b6a179143af9f4d27d88fe84a6a3c53592d2e76bf/cryptography-46.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:22d7e97932f511d6b0b04f2bfd818d73dcd5928db509460aaf48384778eb6d20", size = 4420569, upload-time = "2025-10-15T23:17:37.188Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/49/3746dab4c0d1979888f125226357d3262a6dd40e114ac29e3d2abdf1ec55/cryptography-46.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:d55f3dffadd674514ad19451161118fd010988540cee43d8bc20675e775925de", size = 4681941, upload-time = "2025-10-15T23:17:39.236Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/30/27654c1dbaf7e4a3531fa1fc77986d04aefa4d6d78259a62c9dc13d7ad36/cryptography-46.0.3-cp314-cp314t-win32.whl", hash = "sha256:8a6e050cb6164d3f830453754094c086ff2d0b2f3a897a1d9820f6139a1f0914", size = 3022339, upload-time = "2025-10-15T23:17:40.888Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/30/640f34ccd4d2a1bc88367b54b926b781b5a018d65f404d409aba76a84b1c/cryptography-46.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:760f83faa07f8b64e9c33fc963d790a2edb24efb479e3520c14a45741cd9b2db", size = 3494315, upload-time = "2025-10-15T23:17:42.769Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/8b/88cc7e3bd0a8e7b861f26981f7b820e1f46aa9d26cc482d0feba0ecb4919/cryptography-46.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:516ea134e703e9fe26bcd1277a4b59ad30586ea90c365a87781d7887a646fe21", size = 2919331, upload-time = "2025-10-15T23:17:44.468Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/23/45fe7f376a7df8daf6da3556603b36f53475a99ce4faacb6ba2cf3d82021/cryptography-46.0.3-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:cb3d760a6117f621261d662bccc8ef5bc32ca673e037c83fbe565324f5c46936", size = 7218248, upload-time = "2025-10-15T23:17:46.294Z" },
+    { url = "https://files.pythonhosted.org/packages/27/32/b68d27471372737054cbd34c84981f9edbc24fe67ca225d389799614e27f/cryptography-46.0.3-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:4b7387121ac7d15e550f5cb4a43aef2559ed759c35df7336c402bb8275ac9683", size = 4294089, upload-time = "2025-10-15T23:17:48.269Z" },
+    { url = "https://files.pythonhosted.org/packages/26/42/fa8389d4478368743e24e61eea78846a0006caffaf72ea24a15159215a14/cryptography-46.0.3-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:15ab9b093e8f09daab0f2159bb7e47532596075139dd74365da52ecc9cb46c5d", size = 4440029, upload-time = "2025-10-15T23:17:49.837Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/eb/f483db0ec5ac040824f269e93dd2bd8a21ecd1027e77ad7bdf6914f2fd80/cryptography-46.0.3-cp38-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:46acf53b40ea38f9c6c229599a4a13f0d46a6c3fa9ef19fc1a124d62e338dfa0", size = 4297222, upload-time = "2025-10-15T23:17:51.357Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/cf/da9502c4e1912cb1da3807ea3618a6829bee8207456fbbeebc361ec38ba3/cryptography-46.0.3-cp38-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:10ca84c4668d066a9878890047f03546f3ae0a6b8b39b697457b7757aaf18dbc", size = 4012280, upload-time = "2025-10-15T23:17:52.964Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/8f/9adb86b93330e0df8b3dcf03eae67c33ba89958fc2e03862ef1ac2b42465/cryptography-46.0.3-cp38-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:36e627112085bb3b81b19fed209c05ce2a52ee8b15d161b7c643a7d5a88491f3", size = 4978958, upload-time = "2025-10-15T23:17:54.965Z" },
+    { url = "https://files.pythonhosted.org/packages/d1/a0/5fa77988289c34bdb9f913f5606ecc9ada1adb5ae870bd0d1054a7021cc4/cryptography-46.0.3-cp38-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:1000713389b75c449a6e979ffc7dcc8ac90b437048766cef052d4d30b8220971", size = 4473714, upload-time = "2025-10-15T23:17:56.754Z" },
+    { url = "https://files.pythonhosted.org/packages/14/e5/fc82d72a58d41c393697aa18c9abe5ae1214ff6f2a5c18ac470f92777895/cryptography-46.0.3-cp38-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:b02cf04496f6576afffef5ddd04a0cb7d49cf6be16a9059d793a30b035f6b6ac", size = 4296970, upload-time = "2025-10-15T23:17:58.588Z" },
+    { url = "https://files.pythonhosted.org/packages/78/06/5663ed35438d0b09056973994f1aec467492b33bd31da36e468b01ec1097/cryptography-46.0.3-cp38-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:71e842ec9bc7abf543b47cf86b9a743baa95f4677d22baa4c7d5c69e49e9bc04", size = 4940236, upload-time = "2025-10-15T23:18:00.897Z" },
+    { url = "https://files.pythonhosted.org/packages/fc/59/873633f3f2dcd8a053b8dd1d38f783043b5fce589c0f6988bf55ef57e43e/cryptography-46.0.3-cp38-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:402b58fc32614f00980b66d6e56a5b4118e6cb362ae8f3fda141ba4689bd4506", size = 4472642, upload-time = "2025-10-15T23:18:02.749Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/39/8e71f3930e40f6877737d6f69248cf74d4e34b886a3967d32f919cc50d3b/cryptography-46.0.3-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:ef639cb3372f69ec44915fafcd6698b6cc78fbe0c2ea41be867f6ed612811963", size = 4423126, upload-time = "2025-10-15T23:18:04.85Z" },
+    { url = "https://files.pythonhosted.org/packages/cd/c7/f65027c2810e14c3e7268353b1681932b87e5a48e65505d8cc17c99e36ae/cryptography-46.0.3-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:3b51b8ca4f1c6453d8829e1eb7299499ca7f313900dd4d89a24b8b87c0a780d4", size = 4686573, upload-time = "2025-10-15T23:18:06.908Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/6e/1c8331ddf91ca4730ab3086a0f1be19c65510a33b5a441cb334e7a2d2560/cryptography-46.0.3-cp38-abi3-win32.whl", hash = "sha256:6276eb85ef938dc035d59b87c8a7dc559a232f954962520137529d77b18ff1df", size = 3036695, upload-time = "2025-10-15T23:18:08.672Z" },
+    { url = "https://files.pythonhosted.org/packages/90/45/b0d691df20633eff80955a0fc7695ff9051ffce8b69741444bd9ed7bd0db/cryptography-46.0.3-cp38-abi3-win_amd64.whl", hash = "sha256:416260257577718c05135c55958b674000baef9a1c7d9e8f306ec60d71db850f", size = 3501720, upload-time = "2025-10-15T23:18:10.632Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/cb/2da4cc83f5edb9c3257d09e1e7ab7b23f049c7962cae8d842bbef0a9cec9/cryptography-46.0.3-cp38-abi3-win_arm64.whl", hash = "sha256:d89c3468de4cdc4f08a57e214384d0471911a3830fcdaf7a8cc587e42a866372", size = 2918740, upload-time = "2025-10-15T23:18:12.277Z" },
+]
+
+[[package]]
+name = "idna"
+version = "3.11"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/6f/6d/0703ccc57f3a7233505399edb88de3cbd678da106337b9fcde432b65ed60/idna-3.11.tar.gz", hash = "sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902", size = 194582, upload-time = "2025-10-12T14:55:20.501Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0e/61/66938bbb5fc52dbdf84594873d5b51fb1f7c7794e9c0f5bd885f30bc507b/idna-3.11-py3-none-any.whl", hash = "sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea", size = 71008, upload-time = "2025-10-12T14:55:18.883Z" },
+]
+
+[[package]]
+name = "nixpkgs-pr-watch"
+version = "0.1.0"
+source = { editable = "." }
+dependencies = [
+    { name = "pygithub" },
+    { name = "requests" },
+    { name = "toml" },
+    { name = "xdg-base-dirs" },
+]
+
+[package.metadata]
+requires-dist = [
+    { name = "pygithub", specifier = ">=2.8.1" },
+    { name = "requests", specifier = ">=2.32.5" },
+    { name = "toml", specifier = ">=0.10.2" },
+    { name = "xdg-base-dirs", specifier = ">=6.0.2" },
+]
+
+[[package]]
+name = "pycparser"
+version = "2.23"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/fe/cf/d2d3b9f5699fb1e4615c8e32ff220203e43b248e1dfcc6736ad9057731ca/pycparser-2.23.tar.gz", hash = "sha256:78816d4f24add8f10a06d6f05b4d424ad9e96cfebf68a4ddc99c65c0720d00c2", size = 173734, upload-time = "2025-09-09T13:23:47.91Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a0/e3/59cd50310fc9b59512193629e1984c1f95e5c8ae6e5d8c69532ccc65a7fe/pycparser-2.23-py3-none-any.whl", hash = "sha256:e5c6e8d3fbad53479cab09ac03729e0a9faf2bee3db8208a550daf5af81a5934", size = 118140, upload-time = "2025-09-09T13:23:46.651Z" },
+]
+
+[[package]]
+name = "pygithub"
+version = "2.8.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pyjwt", extra = ["crypto"] },
+    { name = "pynacl" },
+    { name = "requests" },
+    { name = "typing-extensions" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c1/74/e560bdeffea72ecb26cff27f0fad548bbff5ecc51d6a155311ea7f9e4c4c/pygithub-2.8.1.tar.gz", hash = "sha256:341b7c78521cb07324ff670afd1baa2bf5c286f8d9fd302c1798ba594a5400c9", size = 2246994, upload-time = "2025-09-02T17:41:54.674Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/07/ba/7049ce39f653f6140aac4beb53a5aaf08b4407b6a3019aae394c1c5244ff/pygithub-2.8.1-py3-none-any.whl", hash = "sha256:23a0a5bca93baef082e03411bf0ce27204c32be8bfa7abc92fe4a3e132936df0", size = 432709, upload-time = "2025-09-02T17:41:52.947Z" },
+]
+
+[[package]]
+name = "pyjwt"
+version = "2.10.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e7/46/bd74733ff231675599650d3e47f361794b22ef3e3770998dda30d3b63726/pyjwt-2.10.1.tar.gz", hash = "sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953", size = 87785, upload-time = "2024-11-28T03:43:29.933Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/61/ad/689f02752eeec26aed679477e80e632ef1b682313be70793d798c1d5fc8f/PyJWT-2.10.1-py3-none-any.whl", hash = "sha256:dcdd193e30abefd5debf142f9adfcdd2b58004e644f25406ffaebd50bd98dacb", size = 22997, upload-time = "2024-11-28T03:43:27.893Z" },
+]
+
+[package.optional-dependencies]
+crypto = [
+    { name = "cryptography" },
+]
+
+[[package]]
+name = "pynacl"
+version = "1.6.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cffi", marker = "platform_python_implementation != 'PyPy'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b2/46/aeca065d227e2265125aea590c9c47fbf5786128c9400ee0eb7c88931f06/pynacl-1.6.1.tar.gz", hash = "sha256:8d361dac0309f2b6ad33b349a56cd163c98430d409fa503b10b70b3ad66eaa1d", size = 3506616, upload-time = "2025-11-10T16:02:13.195Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/75/d6/4b2dca33ed512de8f54e5c6074aa06eaeb225bfbcd9b16f33a414389d6bd/pynacl-1.6.1-cp314-cp314t-macosx_10_10_universal2.whl", hash = "sha256:7d7c09749450c385301a3c20dca967a525152ae4608c0a096fe8464bfc3df93d", size = 389109, upload-time = "2025-11-10T16:01:28.79Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/30/e8dbb8ff4fa2559bbbb2187ba0d0d7faf728d17cb8396ecf4a898b22d3da/pynacl-1.6.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fc734c1696ffd49b40f7c1779c89ba908157c57345cf626be2e0719488a076d3", size = 808254, upload-time = "2025-11-10T16:01:37.839Z" },
+    { url = "https://files.pythonhosted.org/packages/44/f9/f5449c652f31da00249638dbab065ad4969c635119094b79b17c3a4da2ab/pynacl-1.6.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3cd787ec1f5c155dc8ecf39b1333cfef41415dc96d392f1ce288b4fe970df489", size = 1407365, upload-time = "2025-11-10T16:01:40.454Z" },
+    { url = "https://files.pythonhosted.org/packages/eb/2f/9aa5605f473b712065c0a193ebf4ad4725d7a245533f0cd7e5dcdbc78f35/pynacl-1.6.1-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b35d93ab2df03ecb3aa506be0d3c73609a51449ae0855c2e89c7ed44abde40b", size = 843842, upload-time = "2025-11-10T16:01:30.524Z" },
+    { url = "https://files.pythonhosted.org/packages/32/8d/748f0f6956e207453da8f5f21a70885fbbb2e060d5c9d78e0a4a06781451/pynacl-1.6.1-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dece79aecbb8f4640a1adbb81e4aa3bfb0e98e99834884a80eb3f33c7c30e708", size = 1445559, upload-time = "2025-11-10T16:01:33.663Z" },
+    { url = "https://files.pythonhosted.org/packages/78/d0/2387f0dcb0e9816f38373999e48db4728ed724d31accdd4e737473319d35/pynacl-1.6.1-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:c2228054f04bf32d558fb89bb99f163a8197d5a9bf4efa13069a7fa8d4b93fc3", size = 825791, upload-time = "2025-11-10T16:01:34.823Z" },
+    { url = "https://files.pythonhosted.org/packages/18/3d/ef6fb7eb072aaf15f280bc66f26ab97e7fc9efa50fb1927683013ef47473/pynacl-1.6.1-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:2b12f1b97346f177affcdfdc78875ff42637cb40dcf79484a97dae3448083a78", size = 1410843, upload-time = "2025-11-10T16:01:36.401Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/fb/23824a017526850ee7d8a1cc4cd1e3e5082800522c10832edbbca8619537/pynacl-1.6.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e735c3a1bdfde3834503baf1a6d74d4a143920281cb724ba29fb84c9f49b9c48", size = 801140, upload-time = "2025-11-10T16:01:42.013Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/d1/ebc6b182cb98603a35635b727d62f094bc201bf610f97a3bb6357fe688d2/pynacl-1.6.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:3384a454adf5d716a9fadcb5eb2e3e72cd49302d1374a60edc531c9957a9b014", size = 1371966, upload-time = "2025-11-10T16:01:43.297Z" },
+    { url = "https://files.pythonhosted.org/packages/64/f4/c9d7b6f02924b1f31db546c7bd2a83a2421c6b4a8e6a2e53425c9f2802e0/pynacl-1.6.1-cp314-cp314t-win32.whl", hash = "sha256:d8615ee34d01c8e0ab3f302dcdd7b32e2bcf698ba5f4809e7cc407c8cdea7717", size = 230482, upload-time = "2025-11-10T16:01:47.688Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/2c/942477957fba22da7bf99131850e5ebdff66623418ab48964e78a7a8293e/pynacl-1.6.1-cp314-cp314t-win_amd64.whl", hash = "sha256:5f5b35c1a266f8a9ad22525049280a600b19edd1f785bccd01ae838437dcf935", size = 243232, upload-time = "2025-11-10T16:01:45.208Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/0c/bdbc0d04a53b96a765ab03aa2cf9a76ad8653d70bf1665459b9a0dedaa1c/pynacl-1.6.1-cp314-cp314t-win_arm64.whl", hash = "sha256:d984c91fe3494793b2a1fb1e91429539c6c28e9ec8209d26d25041ec599ccf63", size = 187907, upload-time = "2025-11-10T16:01:46.328Z" },
+    { url = "https://files.pythonhosted.org/packages/49/41/3cfb3b4f3519f6ff62bf71bf1722547644bcfb1b05b8fdbdc300249ba113/pynacl-1.6.1-cp38-abi3-macosx_10_10_universal2.whl", hash = "sha256:a6f9fd6d6639b1e81115c7f8ff16b8dedba1e8098d2756275d63d208b0e32021", size = 387591, upload-time = "2025-11-10T16:01:49.1Z" },
+    { url = "https://files.pythonhosted.org/packages/18/21/b8a6563637799f617a3960f659513eccb3fcc655d5fc2be6e9dc6416826f/pynacl-1.6.1-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e49a3f3d0da9f79c1bec2aa013261ab9fa651c7da045d376bd306cf7c1792993", size = 798866, upload-time = "2025-11-10T16:01:55.688Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/6c/dc38033bc3ea461e05ae8f15a81e0e67ab9a01861d352ae971c99de23e7c/pynacl-1.6.1-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7713f8977b5d25f54a811ec9efa2738ac592e846dd6e8a4d3f7578346a841078", size = 1398001, upload-time = "2025-11-10T16:01:57.101Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/05/3ec0796a9917100a62c5073b20c4bce7bf0fea49e99b7906d1699cc7b61b/pynacl-1.6.1-cp38-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5a3becafc1ee2e5ea7f9abc642f56b82dcf5be69b961e782a96ea52b55d8a9fc", size = 834024, upload-time = "2025-11-10T16:01:50.228Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/b7/ae9982be0f344f58d9c64a1c25d1f0125c79201634efe3c87305ac7cb3e3/pynacl-1.6.1-cp38-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4ce50d19f1566c391fedc8dc2f2f5be265ae214112ebe55315e41d1f36a7f0a9", size = 1436766, upload-time = "2025-11-10T16:01:51.886Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/51/b2ccbf89cf3025a02e044dd68a365cad593ebf70f532299f2c047d2b7714/pynacl-1.6.1-cp38-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:543f869140f67d42b9b8d47f922552d7a967e6c116aad028c9bfc5f3f3b3a7b7", size = 817275, upload-time = "2025-11-10T16:01:53.351Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/6c/dd9ee8214edf63ac563b08a9b30f98d116942b621d39a751ac3256694536/pynacl-1.6.1-cp38-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:a2bb472458c7ca959aeeff8401b8efef329b0fc44a89d3775cffe8fad3398ad8", size = 1401891, upload-time = "2025-11-10T16:01:54.587Z" },
+    { url = "https://files.pythonhosted.org/packages/0f/c1/97d3e1c83772d78ee1db3053fd674bc6c524afbace2bfe8d419fd55d7ed1/pynacl-1.6.1-cp38-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3206fa98737fdc66d59b8782cecc3d37d30aeec4593d1c8c145825a345bba0f0", size = 772291, upload-time = "2025-11-10T16:01:58.111Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/ca/691ff2fe12f3bb3e43e8e8df4b806f6384593d427f635104d337b8e00291/pynacl-1.6.1-cp38-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:53543b4f3d8acb344f75fd4d49f75e6572fce139f4bfb4815a9282296ff9f4c0", size = 1370839, upload-time = "2025-11-10T16:01:59.252Z" },
+    { url = "https://files.pythonhosted.org/packages/30/27/06fe5389d30391fce006442246062cc35773c84fbcad0209fbbf5e173734/pynacl-1.6.1-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:319de653ef84c4f04e045eb250e6101d23132372b0a61a7acf91bac0fda8e58c", size = 791371, upload-time = "2025-11-10T16:02:01.075Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/7a/e2bde8c9d39074a5aa046c7d7953401608d1f16f71e237f4bef3fb9d7e49/pynacl-1.6.1-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:262a8de6bba4aee8a66f5edf62c214b06647461c9b6b641f8cd0cb1e3b3196fe", size = 1363031, upload-time = "2025-11-10T16:02:02.656Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/b6/63fd77264dae1087770a1bb414bc604470f58fbc21d83822fc9c76248076/pynacl-1.6.1-cp38-abi3-win32.whl", hash = "sha256:9fd1a4eb03caf8a2fe27b515a998d26923adb9ddb68db78e35ca2875a3830dde", size = 226585, upload-time = "2025-11-10T16:02:07.116Z" },
+    { url = "https://files.pythonhosted.org/packages/12/c8/b419180f3fdb72ab4d45e1d88580761c267c7ca6eda9a20dcbcba254efe6/pynacl-1.6.1-cp38-abi3-win_amd64.whl", hash = "sha256:a569a4069a7855f963940040f35e87d8bc084cb2d6347428d5ad20550a0a1a21", size = 238923, upload-time = "2025-11-10T16:02:04.401Z" },
+    { url = "https://files.pythonhosted.org/packages/35/76/c34426d532e4dce7ff36e4d92cb20f4cbbd94b619964b93d24e8f5b5510f/pynacl-1.6.1-cp38-abi3-win_arm64.whl", hash = "sha256:5953e8b8cfadb10889a6e7bd0f53041a745d1b3d30111386a1bb37af171e6daf", size = 183970, upload-time = "2025-11-10T16:02:05.786Z" },
+]
+
+[[package]]
+name = "requests"
+version = "2.32.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "charset-normalizer" },
+    { name = "idna" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c9/74/b3ff8e6c8446842c3f5c837e9c3dfcfe2018ea6ecef224c710c85ef728f4/requests-2.32.5.tar.gz", hash = "sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf", size = 134517, upload-time = "2025-08-18T20:46:02.573Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl", hash = "sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6", size = 64738, upload-time = "2025-08-18T20:46:00.542Z" },
+]
+
+[[package]]
+name = "toml"
+version = "0.10.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/be/ba/1f744cdc819428fc6b5084ec34d9b30660f6f9daaf70eead706e3203ec3c/toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f", size = 22253, upload-time = "2020-11-01T01:40:22.204Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", size = 16588, upload-time = "2020-11-01T01:40:20.672Z" },
+]
+
+[[package]]
+name = "typing-extensions"
+version = "4.15.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" },
+]
+
+[[package]]
+name = "urllib3"
+version = "2.6.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/1e/24/a2a2ed9addd907787d7aa0355ba36a6cadf1768b934c652ea78acbd59dcd/urllib3-2.6.2.tar.gz", hash = "sha256:016f9c98bb7e98085cb2b4b17b87d2c702975664e4f060c6532e64d1c1a5e797", size = 432930, upload-time = "2025-12-11T15:56:40.252Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/6d/b9/4095b668ea3678bf6a0af005527f39de12fb026516fb3df17495a733b7f8/urllib3-2.6.2-py3-none-any.whl", hash = "sha256:ec21cddfe7724fc7cb4ba4bea7aa8e2ef36f607a4bab81aa6ce42a13dc3f03dd", size = 131182, upload-time = "2025-12-11T15:56:38.584Z" },
+]
+
+[[package]]
+name = "xdg-base-dirs"
+version = "6.0.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/bf/d0/bbe05a15347538aaf9fa5b51ac3b97075dfb834931fcb77d81fbdb69e8f6/xdg_base_dirs-6.0.2.tar.gz", hash = "sha256:950504e14d27cf3c9cb37744680a43bf0ac42efefc4ef4acf98dc736cab2bced", size = 4085, upload-time = "2024-10-19T14:35:08.114Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fc/03/030b47fd46b60fc87af548e57ff59c2ca84b2a1dadbe721bb0ce33896b2e/xdg_base_dirs-6.0.2-py3-none-any.whl", hash = "sha256:3c01d1b758ed4ace150ac960ac0bd13ce4542b9e2cdf01312dcda5012cfebabe", size = 4747, upload-time = "2024-10-19T14:35:05.931Z" },
+]
diff --git a/accounts/gkleen@sif/utils/pdf2pdf.nix b/accounts/gkleen@sif/utils/pdf2pdf.nix
new file mode 100644
index 00000000..7305a201
--- /dev/null
+++ b/accounts/gkleen@sif/utils/pdf2pdf.nix
@@ -0,0 +1,8 @@
+pkgs@{ lib, resholve, zsh, ghostscript_headless, ... }:
+
+resholve.writeScriptBin "pdf2pdf" {
+  inputs = with pkgs; [ghostscript_headless];
+  interpreter = lib.getExe zsh;
+} ''
+  exec gs -dPDFSETTINGS=/prepress -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -dSAFER -dPreserveAnnots=false "-sOutputFile=''${2:-''${1:r}_pdf2pdf.pdf}" "''${1}"
+''
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/zshrc b/accounts/gkleen@sif/zshrc
index e3f675a1..df0fe1d6 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[@]}" $(mktemp --tmpdir=${modifyPDF:h} ${modifyPDF:t:r}_XXXXXXXXXX.${modifyPDF:e})
+           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,23 +90,23 @@ dir() {
                 }
                 trap cleanup EXIT
 
-                if ${curlArchive}; then
+                if [[ $curlArchive = "true" ]]; then
                     archiveFile=$(mktemp -t "archive.XXXXXXXXXX.${templateArchive:t}")
 
-                    curl -L -o ${archiveFile} ${templateArchive}
+                    curl -SfL -o ${archiveFile} ${templateArchive}
 
                     templateArchive=${archiveFile}
                 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,15 +123,19 @@ 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
                         ;;
+                        application/x-iso9660-image)
+                          7z x ${templateArchive}
+                          unpack=false
+                        ;;
                         *)
                             tar -xvaf ${templateArchive}
                             unpack=false
@@ -134,25 +146,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 +174,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 +184,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 +215,8 @@ tmpdir() {
     done
 
     (
+        set -o localoptions -o localtraps
+        trap 'return 1' INT TERM
         trap cleanup EXIT
 
 
@@ -231,17 +235,7 @@ clock() {
 }
 
 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 ${@}"
+    curl -sSf -H 'Accept: application/json' $@ ifconfig.co | jq -r '.ip'
 }
 
 swap() {
@@ -271,14 +265,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 +292,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 = {