55 files changed, 1465 insertions, 2528 deletions
diff --git a/.sops.yaml b/.sops.yaml
index 7b0507ee..948383b2 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -26,3 +26,6 @@ creation_rules:
  - path_regex: ^hosts/sif/
    key_groups:
      - age: [ *admin_gkleen, *machine_sif ]
+  - path_regex: ^modules/nix-access-tokens/
+    key_groups:
+      - age: [ *admin_gkleen, *machine_sif, *machine_surtr, *machine_vidhar ]
diff --git a/_sources/generated.json b/_sources/generated.json
index 47e088c4..72f913ec 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -20,20 +20,6 @@
        },
        "version": "8ef9a5b73e5d1063cf912c70027c655fb19d1109"
    },
-    "batman-adv": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "batman-adv",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "sha256": "sha256-VYyIkH5IFfKN6EOHZxSx6AaepD3a22/hhmLhqkle5Z0=",
-            "type": "tarball",
-            "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.4.tar.gz"
-        },
-        "version": "2024.4"
-    },
    "bpf-examples": {
        "cargoLocks": null,
        "date": "2025-01-03",
@@ -111,6 +97,26 @@
        },
        "version": "2.17"
    },
+    "mako": {
+        "cargoLocks": null,
+        "date": "2025-01-19",
+        "extract": null,
+        "name": "mako",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "rev": "57a258c1f8861200e0623153f1b79065d4ddabd8",
+            "sha256": "sha256-9PcZLpIfGR8SmZf5e2rDZhF+y3kfSaFw5DneDXHMGTc=",
+            "sparseCheckout": [],
+            "type": "git",
+            "url": "https://github.com/emersion/mako"
+        },
+        "version": "57a258c1f8861200e0623153f1b79065d4ddabd8"
+    },
    "mpv-autosave": {
        "cargoLocks": null,
        "date": "2020-10-22",
@@ -359,6 +365,26 @@
        },
        "version": "0.2.1"
    },
+    "swayosd": {
+        "cargoLocks": null,
+        "date": "2025-01-27",
+        "extract": null,
+        "name": "swayosd",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "rev": "993180b5e7db1dfc453a556bf208f05b04283c8f",
+            "sha256": "sha256-qwtGkRJlCYu+dO3xCmnRexX+E4QvXRAHXUslLO7mrAI=",
+            "sparseCheckout": [],
+            "type": "git",
+            "url": "https://github.com/ErikReider/SwayOSD"
+        },
+        "version": "993180b5e7db1dfc453a556bf208f05b04283c8f"
+    },
    "tomorrow-night-paradise-theme": {
        "cargoLocks": null,
        "date": "2012-06-04",
@@ -381,7 +407,7 @@
    },
    "v4l2loopback": {
        "cargoLocks": null,
-        "date": "2024-11-26",
+        "date": "2025-01-18",
        "extract": null,
        "name": "v4l2loopback",
        "passthru": null,
@@ -393,12 +419,12 @@
            "name": null,
            "owner": "umlaeute",
            "repo": "v4l2loopback",
-            "rev": "e750af9eb17d729b8c5257a4bcd2faba2b28029c",
+            "rev": "39ad8a43522c18b5e4f4363ce053f604312fc413",
-            "sha256": "sha256-ePA1LcxQInrLLpbZ7Wljv75lWl6V6s9KkdMp0tF1vhk=",
+            "sha256": "sha256-A1p5ZfoMlw6/J3vBdQcXMvERdyBnqs9Ca+0LcLnu7b8=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "e750af9eb17d729b8c5257a4bcd2faba2b28029c"
+        "version": "39ad8a43522c18b5e4f4363ce053f604312fc413"
    },
    "xcompose": {
        "cargoLocks": null,
@@ -430,10 +456,10 @@
        "pinned": false,
        "src": {
            "name": null,
-            "sha256": "sha256-rA5ytakBe6EEtCWFRiAafO3DjovSByfgxjt3yCm0Jek=",
+            "sha256": "sha256-HJc4JmkhrUPFaK0BrDNi+3x69Uknb77JK9cvFA2hYkA=",
            "type": "url",
-            "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2024.12.23.tar.gz"
+            "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.1.26.tar.gz"
        },
-        "version": "2024.12.23"
+        "version": "2025.1.26"
    }
 }
 \ No newline at end of file
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 161dc4e1..e25f1bda 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -16,14 +16,6 @@
    };
    date = "2021-05-30";
  };
-  batman-adv = {
-    pname = "batman-adv";
-    version = "2024.4";
-    src = fetchTarball {
-      url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.4.tar.gz";
-      sha256 = "sha256-VYyIkH5IFfKN6EOHZxSx6AaepD3a22/hhmLhqkle5Z0=";
-    };
-  };
  bpf-examples = {
    pname = "bpf-examples";
    version = "8d53e6fc46ae625bd16b38eb1007ece99460eada";
@@ -67,6 +59,20 @@
      sha256 = "sha256-afJuTByGUMU6kFqGGa3pbPaFVdYGcJYiR0RfDNYNgDk=";
    };
  };
+  mako = {
+    pname = "mako";
+    version = "57a258c1f8861200e0623153f1b79065d4ddabd8";
+    src = fetchgit {
+      url = "https://github.com/emersion/mako";
+      rev = "57a258c1f8861200e0623153f1b79065d4ddabd8";
+      fetchSubmodules = false;
+      deepClone = false;
+      leaveDotGit = false;
+      sparseCheckout = [ ];
+      sha256 = "sha256-9PcZLpIfGR8SmZf5e2rDZhF+y3kfSaFw5DneDXHMGTc=";
+    };
+    date = "2025-01-19";
+  };
  mpv-autosave = {
    pname = "mpv-autosave";
    version = "744c3ee61d2f0a8e9bb4e308dec6897215ae4704";
@@ -218,6 +224,20 @@
      sha256 = "sha256-7d/0fepOvdswuBGJCCMULB2kXOFBLP78yqX4NmByCF8=";
    };
  };
+  swayosd = {
+    pname = "swayosd";
+    version = "993180b5e7db1dfc453a556bf208f05b04283c8f";
+    src = fetchgit {
+      url = "https://github.com/ErikReider/SwayOSD";
+      rev = "993180b5e7db1dfc453a556bf208f05b04283c8f";
+      fetchSubmodules = false;
+      deepClone = false;
+      leaveDotGit = false;
+      sparseCheckout = [ ];
+      sha256 = "sha256-qwtGkRJlCYu+dO3xCmnRexX+E4QvXRAHXUslLO7mrAI=";
+    };
+    date = "2025-01-27";
+  };
  tomorrow-night-paradise-theme = {
    pname = "tomorrow-night-paradise-theme";
    version = "70225a5bf90d495e13a9260bfdc268632ece0801";
@@ -234,15 +254,15 @@
  };
  v4l2loopback = {
    pname = "v4l2loopback";
-    version = "e750af9eb17d729b8c5257a4bcd2faba2b28029c";
+    version = "39ad8a43522c18b5e4f4363ce053f604312fc413";
    src = fetchFromGitHub {
      owner = "umlaeute";
      repo = "v4l2loopback";
-      rev = "e750af9eb17d729b8c5257a4bcd2faba2b28029c";
+      rev = "39ad8a43522c18b5e4f4363ce053f604312fc413";
      fetchSubmodules = true;
-      sha256 = "sha256-ePA1LcxQInrLLpbZ7Wljv75lWl6V6s9KkdMp0tF1vhk=";
+      sha256 = "sha256-A1p5ZfoMlw6/J3vBdQcXMvERdyBnqs9Ca+0LcLnu7b8=";
    };
-    date = "2024-11-26";
+    date = "2025-01-18";
  };
  xcompose = {
    pname = "xcompose";
@@ -258,10 +278,10 @@
  };
  yt-dlp = {
    pname = "yt-dlp";
-    version = "2024.12.23";
+    version = "2025.1.26";
    src = fetchurl {
-      url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2024.12.23.tar.gz";
+      url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.1.26.tar.gz";
-      sha256 = "sha256-rA5ytakBe6EEtCWFRiAafO3DjovSByfgxjt3yCm0Jek=";
+      sha256 = "sha256-HJc4JmkhrUPFaK0BrDNi+3x69Uknb77JK9cvFA2hYkA=";
    };
  };
 }
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index bcfd1224..58cfb425 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -80,7 +80,7 @@ let
    ];
  };
-  lockCommand = "${config.systemd.package}/bin/systemctl --user start gtklock.service";
+  lockCommand = "${lib.getExe' config.systemd.package "systemctl"} --user start gtklock.service";
 in {
  imports = with flake.nixosModules.userProfiles.${userName}; [
    mpv yt-dlp (args: import ./xcompose.nix (inputs // args))
@@ -185,7 +185,12 @@ in {
          };
        };
-        zathura.enable = true;
+        zathura = {
+          enable = true;
+          options = {
+            scroll-page-aware = true;
+          };
+        };
        imv.enable = true;
        mpv.config = {
@@ -285,14 +290,6 @@ in {
      };
      services = {
-        dunst = {
-          settings = import ./dunst-settings.nix inputs;
-          iconTheme = {
-            package = pkgs.paper-icon-theme;
-            name = "Paper";
-          };
-          enable = true;
-        };
        emacs = {
          enable = true;
          socketActivation.enable = true;
@@ -321,8 +318,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;
@@ -359,31 +359,17 @@ in {
          enable = true;
          events = [
            { event = "before-sleep"; command = lockCommand; }
-            # { event = "after-resume"; command = "${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on"; }
            { event = "lock"; command = lockCommand; }
          ];
          timeouts = [
-            # { timeout = 300;
-            #   command = "${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off";
-            # }
            { timeout = 330; command = lockCommand; }
          ];
          extraArgs = [
+            "-w"
            "idlehint" "30"
          ];
        };
        poweralertd.enable = true;
-        avizo = {
-          enable = true;
-          settings.default = {
-            time = "1.0";
-            background = "rgba(0, 0, 0, 0.8)";
-            border-color = "rgba(0, 0, 0, 1)";
-            bar-fg-color = "rgba(160, 160, 160, 1)";
-            bar-bg-color = "rgba(32, 32, 32, 0.96)";
-            # y-offset = "0.25";
-          };
-        };
      };
      home.pointerCursor = {
@@ -424,16 +410,18 @@ in {
          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
+          thunderbird zoom-us xdg-desktop-portal steam steam-run
-          rclone cached-nix-shell worktime fira-code-symbols
+          wireshark virt-manager rclone cached-nix-shell worktime
-          libreoffice xournalpp google-chrome nixos-shell virt-viewer
+          fira-code-symbols libreoffice xournalpp google-chrome
-          freerdp gnome-icon-theme paper-icon-theme sshpassSecret
+          nixos-shell virt-viewer freerdp gnome-icon-theme
-          weechat element-desktop matrix-synapse-tools.synadm
+          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
          nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
+          swtpm
        ];
        file = {
@@ -468,13 +456,6 @@ in {
      };
      xdg.configFile = {
-        "dunst/dunstrc.d" = {
-          source = ./dunstrc.d;
-          recursive = true;
-          onChange = ''
-            ${pkgs.systemd}/bin/systemctl --user try-restart dunst
-          '';
-        };
        "wireplumber" = {
          source = ./wireplumber;
          recursive = true;
@@ -506,6 +487,18 @@ in {
          };
        };
        "emacs/init.el".source = ./emacs.el;
+        "systemd/user/xdg-desktop-portal.service.d/after-graphical-session.conf".text = ''
+          [Unit]
+          After=graphical-session.target
+        '';
+        "systemd/user/home-manager.service.d/before-graphical-session.conf".text = ''
+          [Unit]
+          Before=graphical-session-pre.target
+        '';
+        "pdfpc/pdfpcrc".text = ''
+          mouse 8 prev
+          mouse 9 next
+        '';
      };
      xdg.dataFile = {
@@ -623,7 +616,6 @@ in {
              --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 \
              --class=Rainbow \
              --kiosk "https://web.openrainbow.com" \
              --user-data-dir=''${HOME}/.config/google-chrome-rainbow
@@ -632,6 +624,9 @@ in {
            url = "https://web.openrainbow.com/rb/2.139.17/assets/skins/rainbow/images/homepage/logo__rainbow.svg";
            hash = "sha256-5fmo8rDqVDpzkGaPjk4Y+SsSZpAsY7VUQSFW6WdHwuU=";
          };
+          settings = {
+            StartupWMClass = "Rainbow";
+          };
        };
      };
diff --git a/accounts/gkleen@sif/dunst-settings.nix b/accounts/gkleen@sif/dunst-settings.nix
deleted file mode 100644
index 72687aea..00000000
--- a/accounts/gkleen@sif/dunst-settings.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ pkgs, ... }:
-{
-  global = {
-    font = "Fira Sans 12";
-    markup = "full";
-    format = "<i>%s</i> %p\\n%b";
-    alignment = "left";
-    # geometry = "1216x10-32+64";
-    width = 500;
-    height = 100;
-    offset = "4x4";
-    origin = "top-right";
-    shrink = true;
-    monitor = 0;
-    follow = "none";
-    padding = 6;
-    horizontal_padding = 6;
-    separator_height = 1;
-    separator_color = "frame";
-    idle_threshold = 0;
-    transparency = 10;
-    frame_width = 1;
-    frame_color = "#999999";
-    word_wrap = true;
-    show_age_threshold = 15;
-    show_indicators = false;
-    icon_position = "right";
-    min_icon_size = 25;
-    max_icon_size = 25;
-    sort = false;
-    sticky_history = false;
-    dmenu = "fuzzel --dmenu";
-    browser = "${pkgs.xdg-utils}/bin/xdg-open";
-  };
-  # shortcuts = {
-  #   close = "ctrl+space";
-  #   close_all = "ctrl+shift+space";
-  #   history = "ctrl+comma";
-  #   context = "ctrl+period";
-  # };
-}
diff --git a/accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf b/accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf
deleted file mode 100644
index 98c94b64..00000000
--- a/accounts/gkleen@sif/dunstrc.d/00-urgency_low.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[urgency_low]
-background="#000000aa"
-foreground="#999999"
-timeout=5
-\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf b/accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf
deleted file mode 100644
index f8fa8e2d..00000000
--- a/accounts/gkleen@sif/dunstrc.d/01-urgency_normal.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[urgency_normal]
-background="#000000aa"
-foreground="#ffffff"
-timeout=15
-\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf b/accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf
deleted file mode 100644
index a08bf4b1..00000000
--- a/accounts/gkleen@sif/dunstrc.d/02-urgency_critical.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[urgency_critical]
-background="#900000aa"
-foreground="#ffffff"
-timeout=0
diff --git a/accounts/gkleen@sif/dunstrc.d/10-brightness.conf b/accounts/gkleen@sif/dunstrc.d/10-brightness.conf
deleted file mode 100644
index c54595ab..00000000
--- a/accounts/gkleen@sif/dunstrc.d/10-brightness.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[brightness]
-appname="brightness"
-set_stack_tag="brightness"
-set_transient=yes
-history_ignore=yes
diff --git a/accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf b/accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf
deleted file mode 100644
index 074f4535..00000000
--- a/accounts/gkleen@sif/dunstrc.d/10-pulseaudio-ctl.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[pulseaudio-ctl]
-body="Current is *"
-history_ignore=yes
-set_stack_tag="volume"
-summary="Volume *"
diff --git a/accounts/gkleen@sif/dunstrc.d/20-element.conf b/accounts/gkleen@sif/dunstrc.d/20-element.conf
deleted file mode 100644
index 5ff6031e..00000000
--- a/accounts/gkleen@sif/dunstrc.d/20-element.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[element-im]
-appname=Element
-timeout=0
-\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/20-kitty.conf b/accounts/gkleen@sif/dunstrc.d/20-kitty.conf
deleted file mode 100644
index b27ee27e..00000000
--- a/accounts/gkleen@sif/dunstrc.d/20-kitty.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[kitty]
-appname=kitty
-urgency=low
diff --git a/accounts/gkleen@sif/dunstrc.d/20-mail.conf b/accounts/gkleen@sif/dunstrc.d/20-mail.conf
deleted file mode 100644
index cb568e01..00000000
--- a/accounts/gkleen@sif/dunstrc.d/20-mail.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[element]
-appname="notmuch"
-timeout=0
-\ No newline at end of file
diff --git a/accounts/gkleen@sif/dunstrc.d/20-zulip.conf b/accounts/gkleen@sif/dunstrc.d/20-zulip.conf
deleted file mode 100644
index d7fbd32c..00000000
--- a/accounts/gkleen@sif/dunstrc.d/20-zulip.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[zulip]
-appname="Zulip"
-timeout=0
-\ No newline at end of file
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index 183cb322..5cee16b0 100644
--- a/accounts/gkleen@sif/emacs.el
+++ b/accounts/gkleen@sif/emacs.el
@@ -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."
diff --git a/accounts/gkleen@sif/libvirt/default.nix b/accounts/gkleen@sif/libvirt/default.nix
index 70ac22b9..4e5a9b90 100644
--- a/accounts/gkleen@sif/libvirt/default.nix
+++ b/accounts/gkleen@sif/libvirt/default.nix
@@ -7,6 +7,7 @@ with flakeInputs.nixVirt.lib;
  config = {
    virtualisation.libvirt = {
      enable = true;
+      swtpm.enable = true;
      connections."qemu:///session" = {
        domains = [
          { definition = domain.writeXML (updateManyAttrsByPath [
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 6aa4391c..7e187c84 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -2,31 +2,37 @@
 let
  niri = config.programs.niri.package;
  terminal = lib.getExe config.programs.kitty.package;
-  lightctl = lib.getExe' config.services.avizo.package "lightctl";
+  makoctl = lib.getExe' config.services.mako.package "makoctl";
-  volumectl = lib.getExe' config.services.avizo.package "volumectl";
-  dunstctl = lib.getExe' config.services.dunst.package "dunstctl";
  loginctl = lib.getExe' hostConfig.systemd.package "loginctl";
  systemctl = lib.getExe' hostConfig.systemd.package "systemctl";
+  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
-  focus-or-spawn = pkgs.writeShellApplication {
+  focus_or_spawn = pkgs.writeShellApplication {
    name = "focus-or-spawn";
    runtimeInputs = [ niri pkgs.gojq pkgs.gnugrep pkgs.socat ];
    text = ''
-      app_id="$1"
+      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_workspace="$(jq -r --arg workspace_output "$workspace_output" '.[] | select(.output == $workspace_output and .is_active) | .id' <<<"$workspaces_json")"
-      niri msg action move-workspace-to-monitor --output "$(jq -r '.[] | select(.is_focused) | .output' <<<"$workspaces_json")" "$workspace_name"
+      active_output="$(jq -r '.[] | select(.is_focused) | .output' <<<"$workspaces_json")"
-      socat STDIO "$NIRI_SOCKET" <<<'{"Action":{"FocusWorkspace":{"reference":{"Id":'"''${active_workspace}"'}}}}'
+      if [[ $workspace_output != "$active_output" ]]; then
-      niri msg action move-workspace-to-index --index 1 "$workspace_name"
+        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 jq -r '.app_id' <<<"$window_json" | grep -q "$app_id"; then
+        if [[ -n $(jq -c "$window_select" <<<"$window_json") ]]; then
-          niri msg action focus-window --id "$(jq -r '.id' <<<"$window_json")"
+          if jq -e '.is_focused' <<<"$window_json" >/dev/null; then
+            niri msg action focus-workspace-previous
+          else
+            niri msg action focus-window --id "$(jq -r '.id' <<<"$window_json")"
+          fi
          exit 0
        fi
      done < <(niri msg -j windows | jq -c '.[]')
@@ -34,10 +40,93 @@ let
      exec "$@"
    '';
  };
-  focus-or-spawn-action = app_id: workspace_name: config.lib.niri.actions.spawn (lib.getExe focus-or-spawn) (lib.escapeShellArg app_id) (lib.escapeShellArg workspace_name);
+  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|eff|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")"
+      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_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 --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);
 in {
  imports = [
    ./waybar.nix
+    ./mako.nix
+    ./swayosd.nix
  ];
  config = {
@@ -72,6 +161,113 @@ in {
      ];
    };
+    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" {} ''
+          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):
+                  global workspace_history, history_lock
+                  with history_lock:
+                      workspace_history[output] = [workspace] + [ws for ws in workspace_history[output] if ws != workspace]  # noqa: E501
+                      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):
+                  global workspace_history, history_lock
+                  with detaching(TextIOWrapper(self.wfile, encoding='utf-8', write_through=True)) as out:  # noqa: E501
+                      with history_lock:
+                          json.dump(workspace_history, out)
+          class Server(ThreadingTCPServer):
+              def __init__(self):
+                  ThreadingTCPServer.__init__(self, ("", 8000), RequestHandler, bind_and_activate=False)  # noqa: E501
+                  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
+        '';
+      };
+    };
    programs.niri.settings = {
      prefer-no-csd = true;
      screenshot-path = "${config.home.homeDirectory}/screenshots";
@@ -79,10 +275,15 @@ in {
      hotkey-overlay.skip-at-startup = true;
      input = {
-        keyboard.xkb = {
+        keyboard = {
-          layout = "us,us";
+          repeat-delay = 300;
-          variant = "dvp,";
+          repeat-rate = 50;
-          options = "compose:caps,grp:win_space_toggle";
+          xkb = {
+            layout = "us,us";
+            variant = "dvp,";
+            options = "compose:caps,grp:win_space_toggle";
+          };
        };
        workspace-auto-back-and-forth = true;
@@ -91,7 +292,7 @@ in {
      };
      outputs = {
-        "Samsung Display Corp. 0x4141 Unknown" = {
+        "eDP-1" = {
          scale = 1.5;
          position = { x = 0; y = 0; };
        };
@@ -99,38 +300,95 @@ in {
          scale = 1.5;
          position = { x = 2560; y = 0; };
        };
+        "HP Inc. HP 727pu CN4417143K" = {
+          mode = { width = 2560; height = 1440; refresh = 119.998; };
+          scale = 1;
+          position = { x = 2560; y = 0; };
+          variable-refresh-rate = "on-demand";
+        };
      };
      environment = {
        NIXOS_OZONE_WL = "1";
        QT_QPA_PLATFORM = "wayland";
+        QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
        GDK_BACKEND = "wayland";
        SDL_VIDEODRIVER = "wayland";
+        DISPLAY = ":0";
+      };
+      debug.render-drm-device = "/dev/dri/by-path/pci-0000:00:02.0-render";
+      animations = {
+        slowdown = 0.5;
+        workspace-switch = null;
      };
      layout = {
        gaps = 8;
-        struts = { left = 8; right = 8; top = 0; bottom = 0; };
+        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;
+      input = {
+        touchpad.enable = false;
+        trackball = {
+          scroll-method = "on-button-down";
+          scroll-button = 278;
+        };
+      };
      workspaces = {
-        "001".name = "pwctl";
+        "001" = { name = "pwctl"; open-on-output = "eDP-1"; };
-        "002".name = "kpxc";
+        "002" = { name = "kpxc"; open-on-output = "eDP-1"; };
-        "003".name = "bmgr";
+        "003" = { name = "bmgr"; open-on-output = "eDP-1"; };
+        "004" = { name = "term"; open-on-output = "eDP-1"; };
+        "005" = { name = "edit"; open-on-output = "eDP-1"; };
+        "006" = { name = "eff"; open-on-output = "eDP-1"; };
        "101".name = "comm";
        "102".name = "web";
-        "104".name = "read";
+        # "104".name = "read";
-        "105".name = "mon";
+        # "105".name = "mon";
        "110".name = "vid";
+        "120".name = "bmr";
      };
      window-rules = [
        {
+          matches = [ { is-floating = true; } ];
          geometry-corner-radius =
            let
              allCorners = r: { bottom-left = r; bottom-right = r; top-left = r; top-right = r; };
@@ -140,50 +398,130 @@ in {
        {
          matches = [ { app-id = "^com\.saivert\.pwvucontrol$"; } ];
          open-on-workspace = "pwctl";
+          open-maximized = true;
+        }
+        {
+          matches = [ { app-id = "^com\.github\.wwmm\.easyeffects$"; } ];
+          open-on-workspace = "eff";
+          open-maximized = true;
        }
        {
          matches = [ { app-id = "^\.blueman-manager-wrapped$"; } ];
          open-on-workspace = "bmgr";
+          open-maximized = true;
+        }
+        {
+          matches = [ { app-id = "^org\.keepassxc\.KeePassXC$"; } ];
+          block-out-from = "screencast";
        }
        {
          matches = [ { app-id = "^org\.keepassxc\.KeePassXC$"; } ];
          excludes = [
-            { title = "^Unlock Database"; }
+            { title = "^Unlock Database.*"; }
-            { title = "^Access Request"; }
+            { title = "^Access Request.*"; }
-            { title = "^Passkey credentials"; }
+            { title = ".*Passkey credentials$"; }
          ];
          open-on-workspace = "kpxc";
+          open-maximized = true;
          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;
+          open-floating = true;
+        }
+        {
+          matches = [ { app-id = "^kitty-scratch$"; } ];
+          open-on-workspace = "term";
+          open-maximized = true;
+        }
+        {
+          matches = [ { title = "^scratch$"; app-id = "^emacs$"; } ];
+          open-on-workspace = "edit";
+          open-maximized = true;
+        }
+        {
+          matches = [
+            { app-id = "^emacs$"; }
+            { app-id = "^firefox$"; }
+          ];
+          default-column-width.proportion = 2. / 3.;
+        }
+        {
+          matches = [
+            { app-id = "^kitty$"; }
+            { app-id = "^kitty-play$"; }
+          ];
+          default-column-width.proportion = 1. / 3.;
+        }
+        {
+          matches = [
            { app-id = "^thunderbird$"; }
            { app-id = "^Element$"; }
+            { app-id = "^Rainbow$"; }
          ];
          open-on-workspace = "comm";
        }
        {
          matches = [ { app-id = "^firefox$"; } ];
          open-on-workspace = "web";
+          open-maximized = true;
+          variable-refresh-rate = true;
        }
+        # {
+        #   matches = [
+        #     { app-id = "^evince$"; }
+        #     { app-id = "^imv$"; }
+        #     { app-id = "^org\.pwmt\.zathura$"; }
+        #   ];
+        #   open-on-workspace = "read";
+        # }
        {
-          matches = [
+          matches = [ { app-id = "^mpv$"; } ];
-            { app-id = "^evince$"; }
+          open-on-workspace = "vid";
-            { app-id = "^imv$"; }
+          default-column-width.proportion = 1.;
-            { app-id = "^org\.pwmt\.zathura$"; }
+          variable-refresh-rate = true;
-          ];
-          open-on-workspace = "read";
        }
        {
-          matches = [ { app-id = "^mpv$"; } ];
+          matches = [ { app-id = "^kitty-play$"; } ];
          open-on-workspace = "vid";
+          open-focused = false;
+        }
+        # {
+        #   matches = [
+        #     { app-id = "^qemu$"; }
+        #     { app-id = "^virt-manager$"; }
+        #   ];
+        #   open-on-workspace = "mon";
+        # }
+        {
+          matches = [ { app-id = "^pdfpc$"; } ];
+          default-column-width.proportion = 1.;
+        }
+        {
+          matches = [ { app-id = "^pdfpc$"; title = "^pdfpc - presentation"; } ];
+          open-on-workspace = "bmr";
+          open-fullscreen = true;
        }
        {
          matches = [
-            { app-id = "^qemu$"; }
+            { app-id = "^Gimp-"; title = "^Quit GIMP$"; }
-            { app-id = "^virt-manager$"; }
+            { app-id = "^org\.kde\.polkit-kde-authentication-agent-1$"; }
+            { app-id = "^xdg-desktop-portal-gtk$"; }
          ];
-          open-on-workspace = "mon";
+          open-floating = true;
+        }
+      ];
+      layer-rules = [
+        { matches = [
+            { namespace = "^notifications$"; }
+            { namespace = "^waybar$"; }
+          ];
+          block-out-from = "screencast";
        }
      ];
@@ -192,8 +530,93 @@ in {
        "Mod+Return".action = spawn terminal;
        "Mod+Q".action = close-window;
-        "Mod+D".action = spawn (lib.getExe config.programs.fuzzel.package);
+        "Mod+O".action = spawn (lib.getExe config.programs.fuzzel.package);
-        "Mod+Shift+D".action = spawn (lib.getExe config.programs.fuzzel.package) "--list-executables-in-path";
+        "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 +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+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;
@@ -215,15 +638,33 @@ in {
        "Mod+Shift+Control+N".action = move-workspace-to-monitor-up;
        "Mod+Shift+Control+S".action = move-workspace-to-monitor-right;
-        "Mod+G".action = focus-workspace-down;
+        "Mod+G".action = focus-adjacent-workspace "down";
-        "Mod+C".action = focus-workspace-up;
+        "Mod+C".action = focus-adjacent-workspace "up";
-        "Mod+Shift+G".action = move-column-to-workspace-down;
+        "Mod+Shift+G".action = move-column-to-adjacent-workspace "down";
-        "Mod+Shift+C".action = move-column-to-workspace-up;
+        "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;
@@ -233,8 +674,8 @@ in {
        "Mod+Shift+F".action = maximize-column;
        "Mod+Shift+Ctrl+F".action = fullscreen-window;
-        "Mod+B".action = switch-focus-between-floating-and-tiling;
+        "Mod+V".action = switch-focus-between-floating-and-tiling;
-        "Mod+Shift+B".action = toggle-window-floating;
+        "Mod+Shift+V".action = toggle-window-floating;
        "Mod+Left".action = set-column-width "-10%";
        "Mod+Down".action = set-window-height "-10%";
@@ -245,44 +686,57 @@ in {
          action = spawn (lib.getExe niri) "msg" "action" "power-off-monitors";
          allow-when-locked = true;
        };
-        "Mod+Shift+L" = {
+        "Mod+Shift+L".action = spawn loginctl "lock-session";
-          action = spawn loginctl "lock-session";
-        };
        "Mod+Shift+E".action = quit;
+        "Mod+Shift+Minus" = {
+          action = spawn systemctl "suspend";
+          allow-when-locked = true;
+        };
+        "Mod+Shift+Control+Minus" = {
+          action = spawn systemctl "hibernate";
+          allow-when-locked = true;
+        };
+        "Mod+Shift+P" = {
+          action = spawn (lib.getExe pkgs.playerctl) "-a" "pause";
+          allow-when-locked = true;
+        };
        "XF86MonBrightnessUp" = {
-          action = spawn lightctl "-d" "-e4" "-n1" "up";
+          action = spawn swayosd-client "--brightness" "raise";
          allow-when-locked = true;
        };
        "XF86MonBrightnessDown" = {
-          action = spawn lightctl "-d" "-e4" "-n1" "down";
+          action = spawn swayosd-client "--brightness" "lower";
          allow-when-locked = true;
        };
        "XF86AudioRaiseVolume" = {
-          action = spawn volumectl "-d" "-u" "up";
+          action = spawn swayosd-client "--output-volume" "raise";
          allow-when-locked = true;
        };
        "XF86AudioLowerVolume" = {
-          action = spawn volumectl "-d" "-u" "down";
+          action = spawn swayosd-client "--output-volume" "lower";
          allow-when-locked = true;
        };
        "XF86AudioMute" = {
-          action = spawn volumectl "-d" "toggle-mute";
+          action = spawn swayosd-client "--output-volume" "mute-toggle";
          allow-when-locked = true;
        };
        "XF86AudioMicMute" = {
-          action = spawn volumectl "-d" "-m" "toggle-mute";
+          action = spawn swayosd-client "--input-volume" "mute-toggle";
          allow-when-locked = true;
        };
-        "Mod+Semicolon".action = spawn dunstctl "close";
+        "Mod+Semicolon".action = spawn makoctl "dismiss" "--group";
-        "Mod+Shift+Semicolon".action = spawn dunstctl "close-all";
+        "Mod+Shift+Semicolon".action = spawn makoctl "dismiss" "--all";
-        "Mod+Period".action = spawn dunstctl "context";
+        "Mod+Period".action = spawn makoctl "menu" (lib.getExe config.programs.fuzzel.package) "--dmenu";
-        "Mod+Comma".action = spawn dunstctl "history-pop";
+        "Mod+Comma".action = spawn makoctl "restore";
-        "Mod+Alt+A".action = focus-or-spawn-action "^com\.saivert\.pwvucontrol$" "pwctl" "pwvucontrol";
+        "Mod+Control+A".action = focus-or-spawn-action-app_id "com.saivert.pwvucontrol" "pwctl" "pwvucontrol";
-        "Mod+Alt+P".action = focus-or-spawn-action "^org\.keepassxc\.KeePassXC$" "kpxc" "keepassxc";
+        "Mod+Control+O".action = focus-or-spawn-action-app_id "com.github.wwmm.easyeffects" "eff" "easyeffects";
-        "Mod+Alt+B".action = focus-or-spawn-action "^\.blueman-manager-wrapped$" "bmgr" "blueman-manager";
+        "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
new file mode 100644
index 00000000..0a10555a
--- /dev/null
+++ b/accounts/gkleen@sif/niri/mako.nix
@@ -0,0 +1,115 @@
+{ config, lib, pkgs, ... }:
+{
+  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
+        max-icon-size=48
+        [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
+      '';
+      package = pkgs.symlinkJoin {
+        name = "${pkgs.mako.name}-wrapped";
+        paths = with pkgs; [ mako ];
+        inherit (pkgs.mako) meta;
+        postBuild = ''
+          rm -r $out/share/dbus-1
+        '';
+      };
+    };
+    systemd.user.services.mako = {
+      Unit = {
+        Description = "Mako notification daemon";
+        PartOf = [ "graphical-session.target" ];
+      };
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+      Service = {
+        Type = "dbus";
+        BusName = "org.freedesktop.Notifications";
+        ExecStart = lib.getExe config.services.mako.package;
+        RestartSec = 5;
+        Restart = "always";
+      };
+    };
+    systemd.user.services.mako-follows-focus = {
+      Unit = {
+        BindsTo = [ "niri.service" "mako.service" ];
+        After = [ "niri.service" "mako.service" ];
+      };
+      Service = {
+        Type = "simple";
+        Restart = "always";
+        ExecStart = pkgs.writers.writePython3 "mako-follows-focus" {
+          libraries = with pkgs.python3Packages; [];
+        } ''
+          import os
+          import socket
+          import json
+          import subprocess
+          current_output = None
+          workspaces = []
+          def output_changed(new_output):
+              global current_output
+              if current_output == new_output:
+                  return
+              current_output = new_output
+              subprocess.run(["makoctl", "reload"])
+          sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+          sock.connect(os.environ["NIRI_SOCKET"])
+          sock.send(b"\"EventStream\"\n")
+          for line in sock.makefile(buffering=1, encoding='utf-8'):
+              if line_json := json.loads(line):
+                  if "WorkspacesChanged" in line_json:
+                      workspaces = line_json["WorkspacesChanged"]["workspaces"]
+                      for workspace in workspaces:
+                          if not workspace["is_focused"]:
+                              continue
+                          output_changed(workspace["output"])
+                          break
+                  if "WorkspaceActivated" in line_json and line_json["WorkspaceActivated"]["focused"]:  # noqa: E501
+                      for workspace in workspaces:
+                          if not workspace["id"] == line_json["WorkspaceActivated"]["id"]:  # noqa: E501
+                              continue
+                          output_changed(workspace["output"])
+                          break
+        '';
+      };
+      Install = {
+        WantedBy = [ "mako.service" ];
+      };
+    };
+  };
+}
diff --git a/accounts/gkleen@sif/niri/swayosd.nix b/accounts/gkleen@sif/niri/swayosd.nix
new file mode 100644
index 00000000..984927c2
--- /dev/null
+++ b/accounts/gkleen@sif/niri/swayosd.nix
@@ -0,0 +1,65 @@
+{ pkgs, ... }:
+{
+  config = {
+    services.swayosd = {
+      enable = true;
+      topMargin = 0.946154;
+      stylePath = pkgs.runCommand "style.css" {
+        src = pkgs.writeText "style.scss" ''
+          window#osd {
+            padding: 12px 20px;
+            border-radius: 999px;
+            border: none;
+            background: rgba(0, 0, 0, 0.87);
+            #container {
+              margin: 16px;
+            }
+            image,
+            label {
+              color: rgb(255, 255, 255);
+              &:disabled {
+                opacity: 1;
+                color: rgb(84, 84, 84);
+              }
+            }
+            progressbar {
+              min-height: 6px;
+              border-radius: 999px;
+              background: transparent;
+              border: none;
+              trough, progress {
+                min-height: inherit;
+                border-radius: inherit;
+                border: none;
+              }
+              trough {
+                background: rgb(127, 127, 127);
+              }
+              progress {
+                background: rgb(255, 255, 255);
+              }
+              &:disabled {
+                opacity: 1;
+                trough {
+                  background: rgb(19, 19, 19);
+                }
+                progress {
+                  background: rgb(38, 38, 38);
+                }
+              }
+            }
+          }
+        '';
+        buildInputs = with pkgs; [sass];
+      } "scss -C --sourcemap=none --style=compact $src $out";
+    };
+  };
+}
diff --git a/accounts/gkleen@sif/niri/waybar.nix b/accounts/gkleen@sif/niri/waybar.nix
index 2d00c6d8..3f1f8119 100644
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ b/accounts/gkleen@sif/niri/waybar.nix
@@ -1,5 +1,7 @@
-{ lib, pkgs, ... }:
+{ lib, config, pkgs, ... }:
-{
+let
+  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
+in {
  config = {
    programs.waybar = {
      enable = true;
@@ -22,16 +24,66 @@
          output = [ "eDP-1" "DP-2" "DP-3" ];
          modules-left = [ "niri/workspaces" ];
          modules-center = [ "niri/window" ];
-          modules-right = [ # "custom/worktime" "custom/worktime-today"
+          modules-right = [ "custom/worktime" "custom/worktime-today"
            "custom/weather"
-            # "custom/keymap"
+            "custom/keymap"
-            "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
+            "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, 'tooltip': ', '.join(modes)}, separators=(',', ':')), flush=True)  # noqa: E501
+                  async def on_properties_changed(interface_name, changed_properties, invalidated_properties):  # noqa: E501
+                      if "Modes" not in invalidated_properties:
+                          return
+                      await print_mode()
+                  properties.on_properties_changed(on_properties_changed)
+                  await print_mode()
+                  await loop.create_future()
+              loop.run_until_complete(main())
+            '';
+            on-click = "makoctl mode -t silent";
+          };
          "custom/weather" = {
            format = "{}";
            tooltip = true;
            interval = 3600;
-            exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"120%\\\">{ICON}</span> {FeelsLikeC}°\"";
+            exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"100%\\\">{ICON}</span> {FeelsLikeC}°\"";
            return-type = "json";
          };
          "custom/keymap" = {
@@ -41,8 +93,6 @@
            exec = pkgs.writers.writePython3 "keymap" {} ''
              import os
              import socket
-              import re
-              import subprocess
              import json
@@ -55,32 +105,34 @@
                  print(json.dumps({'text': short, 'tooltip': keymap}, separators=(',', ':')), flush=True)  # noqa: E501
-              r = subprocess.run(["hyprctl", "devices", "-j"], check=True, stdout=subprocess.PIPE, text=True)  # noqa: E501
+              keyboard_layouts = []
-              for keyboard in json.loads(r.stdout)['keyboards']:
-                  if keyboard['name'] != "at-translated-set-2-keyboard":
-                      continue
-                  output(keyboard['active_keymap'])
              sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-              sock.connect(os.environ["XDG_RUNTIME_DIR"] + "/hypr/" + os.environ["HYPRLAND_INSTANCE_SIGNATURE"] + "/.socket2.sock")  # noqa: E501
+              sock.connect(os.environ["NIRI_SOCKET"])
-              expected = re.compile(r'^activelayout>>at-translated-set-2-keyboard,(?P<keymap>.+)$')  # noqa: E501
+              sock.send(b"\"EventStream\"\n")
              for line in sock.makefile(buffering=1, encoding='utf-8'):
-                  if match := expected.match(line):
+                  if line_json := json.loads(line):
-                      output(match.group("keymap"))
+                      if "KeyboardLayoutsChanged" in line_json:
+                          keyboard_layouts = line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["names"]  # noqa: E501
+                          output(keyboard_layouts[line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["current_idx"]])  # noqa: E501
+                      if "KeyboardLayoutSwitched" in line_json:
+                          output(keyboard_layouts[line_json["KeyboardLayoutSwitched"]["idx"]])  # noqa: E501
            '';
-            on-click = "hyprctl switchxkblayout at-translated-set-2-keyboard next";
+            on-click = "niri msg action switch-layout next";
          };
          "custom/worktime" = {
            interval = 60;
-            exec = lib.getExe pkgs.worktime;
+            exec = "${lib.getExe pkgs.worktime} time --waybar";
-            tooltip = false;
+            return-type = "json";
          };
          "custom/worktime-today" = {
            interval = 60;
-            exec = "${lib.getExe pkgs.worktime} today";
+            exec = "${lib.getExe pkgs.worktime} today --waybar";
-            tooltip = false;
+            return-type = "json";
+          };
+          "niri/workspaces" = {
+            ignore = ["eff" "pwctl" "kpxc" "bmgr" "edit" "term"];
          };
-          "niri/workspaces" = {};
          "niri/window" = {
            separate-outputs = true;
            icon = true;
@@ -140,8 +192,8 @@
            icon-size = iconSize;
            tooltip-format = "{percent}%";
            format-icons = ["&#xf00da;" "&#xf00db;" "&#xf00dc;" "&#xf00dd;" "&#xf00de;" "&#xf00df;" "&#xf00e0;"];
-            on-scroll-up = "lightctl -d -e4 -n1 up";
+            on-scroll-up = "${swayosd-client} --brightness raise";
-            on-scroll-down = "lightctl -d -e4 -n1 down";
+            on-scroll-down = "${swayosd-client} --brightness lower";
          };
          wireplumber = {
            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
@@ -150,9 +202,9 @@
            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-up = "${swayosd-client} --output-volume raise";
-            on-scroll-down = "volumectl -d -u down";
+            on-scroll-down = "${swayosd-client} --output-volume lower";
-            on-click = "volumectl -d toggle-mute";
+            on-click = "${swayosd-client} --output-volume mute-toggle";
          };
        }
        {
@@ -164,7 +216,9 @@
          modules-center = [ "niri/window" ];
          modules-right = [ "clock" ];
-          "niri/workspaces" = {};
+          "niri/workspaces" = {
+            ignore = ["pwctl" "kpxc" "bmgr" "edit" "term"];
+          };
          "niri/window" = {
            separate-outputs = true;
            icon = true;
@@ -189,7 +243,7 @@
        * {
          border: none;
-          font-family: "Fira Sans Nerd Font";
+          font-family: "Fira Sans";
          font-size: 10pt;
          min-height: 0;
        }
@@ -200,10 +254,10 @@
        }
        .modules-left {
-          margin-left: 9px;
+          margin-left: 12px;
        }
        .modules-right {
-          margin-right: 9px;
+          margin-right: 12px;
        }
        .module {
@@ -228,21 +282,26 @@
          color: @grey;
          margin: 0 5px;
        }
-        #custom-weather, #custom-worktime-today {
+        #custom-weather {
          margin-right: 3px;
        }
-        #custom-keymap, #custom-weather {
+        #custom-keymap {
          margin-left: 3px;
+          margin-right: 3px;
        }
        #tray {
          margin: 0;
        }
-        #battery, #idle_inhibitor, #backlight, #wireplumber {
+        #battery, #idle_inhibitor, #backlight, #wireplumber, #custom-mako {
          color: @grey;
          margin: 0 5px 0 2px;
        }
        #idle_inhibitor {
+          margin-right: 4px;
+          margin-left: 6px;
+        }
+        #custom-mako {
          margin-right: 2px;
          margin-left: 3px;
        }
@@ -264,6 +323,12 @@
        #idle_inhibitor.activated {
          color: @white;
        }
+        #custom-worktime.running, #custom-worktime-today.running {
+          color: @white;
+        }
+        #custom-worktime.over, #custom-worktime-today.over {
+          color: @orange;
+        }
        #idle_inhibitor {
          padding-top: 1px;
@@ -271,7 +336,7 @@
        #privacy {
          color: @red;
-          margin: -1px 2px 0px 5px;
+          margin: -1px 4px 0px 3px;
        }
        #clock {
          /* margin-right: 5px; */
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 119d8cc3..a89b46c2 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -123,16 +123,8 @@ in {
    };
    emacs = {
      Unit = {
-        After = ["graphical-session-pre.target"];
+        After = [ "graphical-session.target" ];
-      };
+        BindsTo = [ "graphical-session.target" ];
-    };
-    dunst = {
-      Service = {
-        ExecStart = lib.mkForce "${cfg.services.dunst.package}/bin/dunst";
-        Restart = "always";
-      };
-      Install = {
-        WantedBy = ["graphical-session.target"];
      };
    };
    keepassxc = {
@@ -144,8 +136,8 @@ in {
        Environment = [ "QT_QPA_PLATFORM=wayland" ];
      };
      Unit = {
-        Requires = ["graphical-session-pre.target"];
+        After = [ "graphical-session.target" ];
-        After = ["graphical-session-pre.target"];
+        BindsTo = [ "graphical-session.target" ];
      };
    };
    mpris-proxy = {
@@ -193,8 +185,8 @@ in {
        WantedBy = ["graphical-session.target"];
      };
      Unit = {
-        Requires = ["graphical-session-pre.target"];
+        After = [ "graphical-session.target" ];
-        After = ["graphical-session-pre.target"];
+        PartOf = [ "graphical-session.target" ];
      };
      Service = {
        ExecStart = lib.getExe pkgs.psi-notify;
@@ -207,6 +199,7 @@ in {
    gtklock = {
      Unit = {
        Requisite = ["graphical-session.target"];
+        After = [ "graphical-session.target" ];
        PartOf = ["graphical-session.target"];
      };
      Service = {
@@ -214,53 +207,55 @@ in {
        RuntimeDirectory = "gtklock";
        CacheDirectory = "gtklock";
        ExecStartPre = [
-          "${pkgs.libsForQt5.qt5.qttools.bin}/bin/qdbus org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow.lockAllDatabases"
+          "-${lib.getExe' pkgs.libsForQt5.qt5.qttools.bin "qdbus"} org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow.lockAllDatabases"
-          "${config.systemd.package}/bin/systemctl --user stop gpg-agent.service"
+          "-${lib.getExe' config.systemd.package "systemctl"} --user stop gpg-agent.service"
-          (pkgs.writeShellScript "generate-css" ''
+          "-${lib.getExe pkgs.playerctl} -a pause"
-            set -x
+          "-${lib.getExe (pkgs.writeShellApplication {
-            export PATH="${lib.makeBinPath [cfg.programs.wpaperd.package pkgs.jq pkgs.coreutils pkgs.imagemagick pkgs.findutils]}:$PATH"
+            name = "generate-css";
+            runtimeInputs = with pkgs; [cfg.programs.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
+              cp --no-preserve=mode ${pkgs.writeText "gtklock.css" ''
-            monitors=()
+                #window-box {
-            while IFS= read -r entry; do
+                  padding: 64px;
-                path=$(jq -r ".path" <<<"$entry")
+                  /* border: 1px solid black; */
-                [[ -z "$path" || ! -f "$path" ]] && continue
+                  border-radius: 4px;
-                blurred_path="$CACHE_DIRECTORY"/"$(b2sum -l 128 <<<"$path" | cut -d' ' -f1)"."''${path##*.}"
+                  box-shadow: rgba(0, 0, 0, 0.8) 0px 4px 12px;
-                monitor=$(jq -r ".display" <<<"$entry")
+                  /* background-color: white; */
-                if [[ ! -f "$blurred_path" ]]; then
+                  background-color: rgba(0, 0, 0, 0.5);
-                    mkdir -p "$(dirname "$blurred_path")"
+                }
-                    magick "$path" -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$blurred_path" &
+              ''} "$RUNTIME_DIRECTORY"/style.css
-                fi
+              for monitor in "''${!monitors[@]}"; do
-                monitors+=([$monitor]="$blurred_path")
+              cat >>"$RUNTIME_DIRECTORY"/style.css <<EOF
-            done < <(wpaperctl all-wallpapers -j | jq -c ".[]")
+              window#''${monitor} {
-            wait
+                background-image: url("''${monitors[$monitor]}");
+                background-repeat: no-repeat;
-            cp --no-preserve=mode ${pkgs.writeText "gtklock.css" ''
+                background-size: 100% 100%;
-              #window-box {
+                background-origin: content-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
+              EOF
-            for monitor in "''${!monitors[@]}"; do
+              done
-            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
-          '')
        ];
        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
+          ${lib.getExe cfg.programs.niri.package} msg action power-off-monitors
-          ${config.systemd.package}/bin/systemd-notify --ready
+          ${lib.getExe' config.systemd.package "systemd-notify"} --ready
        ''}'';
      };
    };
@@ -313,8 +308,8 @@ in {
        WantedBy = ["graphical-session.target"];
      };
      Unit = {
-        BindsTo = ["graphical-session-pre.target"];
+        After = [ "graphical-session.target" ];
-        After = ["graphical-session-pre.target"];
+        PartOf = [ "graphical-session.target" ];
      };
      Service = {
        ExecStart = lib.getExe cfg.programs.wpaperd.package;
@@ -323,6 +318,36 @@ in {
        RestartSec = "2s";
      };
    };
+    xembed-sni-proxy = {
+      Unit = {
+        PartOf = lib.mkForce ["tray.target"];
+        BindsTo = ["xwayland-satellite.service"];
+        After = ["xwayland-satellite.service"];
+      };
+    };
+    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 = lib.mkForce ["tray.target"];
+      };
+    };
  } // listToAttrs (map ({host, port}: nameValuePair "proxy-to-autossh-socks@${toString port}" {
      Unit = {
        Requires = ["autossh-socks@${host}:${toString (port + 1)}.service" "proxy-to-autossh-socks@${toString port}.socket"];
@@ -373,6 +398,9 @@ in {
    };
    tray = {
      Unit = {
+        PartOf = [ "graphical-session.target" ];
+        Requires = [ "waybar.service" ];
+        After = [ "graphical-session.target" "waybar.service" ];
        Wants = ["blueman-applet.service" "udiskie.service" "network-manager-applet.service"];
      };
    };
diff --git a/accounts/gkleen@sif/taffybar/default.nix b/accounts/gkleen@sif/taffybar/default.nix
deleted file mode 100644
index 98366d8f..00000000
--- a/accounts/gkleen@sif/taffybar/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{ haskellPackages ? (import <nixpkgs> {}).haskellPackages }:
-haskellPackages.callCabal2nix "gkleen-sif-taffybar" ./. {}
diff --git a/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal b/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal
deleted file mode 100644
index e32cb473..00000000
--- a/accounts/gkleen@sif/taffybar/gkleen-sif-taffybar.cabal
+++ /dev/null
@@ -1,32 +0,0 @@
-name:                gkleen-sif-taffybar
-version:             0.0.0
-build-type:          Simple
-cabal-version:       >=1.10
-data-files:          taffybar.css
-executable taffybar
-  hs-source-dirs:      src
-  main-is:             taffybar.hs
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N -O2 -Wall
-  build-depends:       base
-                     , containers
-                     , directory
-                     , filepath
-                     , gtk3
-                     , taffybar
-                     , X11>=1.8
-                     , transformers
-                     , gi-gtk
-                     , time, time-locale-compat
-                     , text
-                     , HStringTemplate
-                     , gtk-sni-tray
-                     , hslogger
-  other-modules:       Paths_gkleen_sif_taffybar
-                     , System.Taffybar.Widget.Clock
-                     , System.Taffybar.Widget.TooltipBattery
-  default-language:    Haskell2010
-  default-extensions:  ScopedTypeVariables
-                     , LambdaCase
-                     , NamedFieldPuns
-\ No newline at end of file
diff --git a/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/Clock.hs b/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/Clock.hs
deleted file mode 100644
index e8dc480f..00000000
--- a/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/Clock.hs
+++ /dev/null
@@ -1,111 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-module System.Taffybar.Widget.Clock
-  ( textClockNew
-  , textClockNewWith
-  , defaultClockConfig
-  , ClockConfig(..)
-  , ClockUpdateStrategy(..)
-  ) where
-import           Control.Monad.IO.Class
-import           Data.Maybe
-import qualified Data.Text as T
-import qualified Data.Time.Clock as Clock
-import           Data.Time.Format
-import           Data.Time.LocalTime
-import qualified Data.Time.Locale.Compat as L
-import           GI.Gtk
-import           System.Taffybar.Widget.Generic.PollingLabel
-type ClockFormat = L.TimeLocale -> ZonedTime -> T.Text
-- | Create the widget. I recommend passing @Nothing@ for the TimeLocale
-- parameter. The format string can include Pango markup
-- (<http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>).
-textClockNew ::
-  MonadIO m => Maybe L.TimeLocale -> ClockFormat -> Double -> m GI.Gtk.Widget
-textClockNew userLocale format interval =
-  textClockNewWith cfg
-  where
-    cfg = defaultClockConfig { clockTimeLocale = userLocale
-                             , clockFormat = format
-                             , clockUpdateStrategy = ConstantInterval interval
-                             }
-data ClockUpdateStrategy
-  = ConstantInterval Double
-  | RoundedTargetInterval Int Double
-  deriving (Eq, Ord, Show)
-data ClockConfig = ClockConfig
-  { clockTimeZone :: Maybe TimeZone
-  , clockTimeLocale :: Maybe L.TimeLocale
-  , clockFormat :: ClockFormat
-  , clockUpdateStrategy :: ClockUpdateStrategy
-  }
-- | A clock configuration that defaults to the current locale
-defaultClockConfig :: ClockConfig
-defaultClockConfig = ClockConfig
-  { clockTimeZone = Nothing
-  , clockTimeLocale = Nothing
-  , clockFormat = \locale zonedTime -> T.pack $ formatTime locale "%a %b %_d %r" zonedTime
-  , clockUpdateStrategy = RoundedTargetInterval 5 0.0
-  }
-systemGetTZ :: IO TimeZone
-systemGetTZ = getCurrentTimeZone
-- | A configurable text-based clock widget.  It currently allows for
-- a configurable time zone through the 'ClockConfig'.
--
-- See also 'textClockNew'.
-textClockNewWith :: MonadIO m => ClockConfig -> m Widget
-textClockNewWith ClockConfig
-                   { clockTimeZone = userZone
-                   , clockTimeLocale = userLocale
-                   , clockFormat = format
-                   , clockUpdateStrategy = updateStrategy
-                   } = liftIO $ do
-  let getTZ = maybe systemGetTZ return userZone
-      locale = fromMaybe L.defaultTimeLocale userLocale
-  let getUserZonedTime =
-        utcToZonedTime <$> getTZ <*> Clock.getCurrentTime
-      doTimeFormat = format locale
-      getRoundedTimeAndNextTarget = do
-        zonedTime <- getUserZonedTime
-        return $ case updateStrategy of
-          ConstantInterval interval ->
-            (doTimeFormat zonedTime, Nothing, interval)
-          RoundedTargetInterval roundSeconds offset ->
-            let roundSecondsDiffTime = fromIntegral roundSeconds
-                addTheRound = addLocalTime roundSecondsDiffTime
-                localTime = zonedTimeToLocalTime zonedTime
-                ourLocalTimeOfDay = localTimeOfDay localTime
-                seconds = round $ todSec ourLocalTimeOfDay
-                secondsFactor = seconds `div` roundSeconds
-                displaySeconds = secondsFactor * roundSeconds
-                baseLocalTimeOfDay =
-                  ourLocalTimeOfDay { todSec = fromIntegral displaySeconds }
-                ourLocalTime =
-                  localTime { localTimeOfDay = baseLocalTimeOfDay }
-                roundedLocalTime =
-                  if seconds `mod` roundSeconds > roundSeconds `div` 2
-                  then addTheRound ourLocalTime
-                  else ourLocalTime
-                roundedZonedTime =
-                  zonedTime { zonedTimeToLocalTime = roundedLocalTime }
-                nextTarget = addTheRound ourLocalTime
-                amountToWait = realToFrac $ diffLocalTime nextTarget localTime
-            in (doTimeFormat roundedZonedTime, Nothing, amountToWait - offset)
-  label <- pollingLabelWithVariableDelay getRoundedTimeAndNextTarget
-  ebox <- eventBoxNew
-  containerAdd ebox label
-  eventBoxSetVisibleWindow ebox False
-  widgetShowAll ebox
-  toWidget ebox
diff --git a/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/TooltipBattery.hs b/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/TooltipBattery.hs
deleted file mode 100644
index 9dc52774..00000000
--- a/accounts/gkleen@sif/taffybar/src/System/Taffybar/Widget/TooltipBattery.hs
+++ /dev/null
@@ -1,101 +0,0 @@
-{-# LANGUAGE OverloadedStrings   #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-module System.Taffybar.Widget.TooltipBattery ( batteryIconTooltipNew ) where
-import           Control.Applicative
-import           Control.Monad
-import           Control.Monad.IO.Class
-import           Control.Monad.Trans.Reader
-import           Data.Int (Int64)
-import qualified Data.Text as T
-import           GI.Gtk
-import           Prelude
-import           StatusNotifier.Tray (scalePixbufToSize)
-import           System.Taffybar.Context
-import           System.Taffybar.Information.Battery
-import           System.Taffybar.Util
-import           System.Taffybar.Widget.Generic.AutoSizeImage
-import           System.Taffybar.Widget.Generic.ChannelWidget
-import           Text.Printf
-import           Text.StringTemplate
-import           Data.Function ((&))
-- | Just the battery info that will be used for display (this makes combining
-- several easier).
-data BatteryWidgetInfo = BWI
-  { seconds :: Maybe Int64
-  , percent :: Double
-  , status :: String
-  , rate :: Maybe Double
-  } deriving (Eq, Show)
-- | Format a duration expressed as seconds to hours and minutes
-formatDuration :: Int64 -> String
-formatDuration secs = let minutes, hours, minutes' :: Int64
-                          minutes = secs `div` 60
-                          (hours, minutes') = minutes `divMod` 60
-                       in printf "%02d:%02d" hours minutes'
-getBatteryWidgetInfo :: BatteryInfo -> BatteryWidgetInfo
-getBatteryWidgetInfo info =
-  let battPctNum :: Double
-      battPctNum = batteryPercentage info
-      battTime :: Maybe Int64
-      battTime =
-        case batteryState info of
-          BatteryStateCharging -> Just $ batteryTimeToFull info
-          BatteryStateDischarging -> Just $ batteryTimeToEmpty info
-          _ -> Nothing
-      battStatus :: String
-      battStatus =
-        case batteryState info of
-          BatteryStateCharging -> "↑"
-          BatteryStateDischarging -> "↓"
-          BatteryStateEmpty -> "⤓"
-          BatteryStateFullyCharged -> "⤒"
-          _ -> "?"
-      battRate :: Maybe Double
-      battRate | rawRate < 0.1 = Nothing
-               | otherwise = Just rawRate
-        where rawRate = batteryEnergyRate info
-  in BWI{ seconds = battTime, percent = battPctNum, status = battStatus, rate = battRate }
-- | Given (maybe summarized) battery info and format: provides the string to display
-formatBattInfo :: BatteryWidgetInfo -> String -> T.Text
-formatBattInfo info fmt =
-  let tpl = newSTMP fmt
-      tpl' = tpl
-        & setManyAttrib [ ("percentage", printf "%.0f" $ percent info)
-                        , ("status", status info)
-                        ]
-        & setManyAttrib [ ("time", formatDuration <$> seconds info)
-                        , ("rate", printf "%.0f" <$> rate info)
-                        ]
-  in render tpl'
-themeLoadFlags :: [IconLookupFlags]
-themeLoadFlags = [IconLookupFlagsGenericFallback, IconLookupFlagsUseBuiltin]
-batteryIconTooltipNew :: String -> TaffyIO Widget
-batteryIconTooltipNew format = do
-  DisplayBatteryChanVar (chan, _) <- setupDisplayBatteryChanVar ["IconName", "State", "Percentage", "TimeToFull", "TimeToEmpty", "EnergyRate"]
-  ctx <- ask
-  liftIO $ do
-    image <- imageNew
-    styleCtx <- widgetGetStyleContext =<< toWidget image
-    defaultTheme <- iconThemeGetDefault
-    let getCurrentBatteryIconNameStringTooltip = do
-          info <- runReaderT getDisplayBatteryInfo ctx
-          let iconNameString = T.pack $ batteryIconName info
-              tooltip = formatBattInfo (getBatteryWidgetInfo info) format
-          return (iconNameString, tooltip)
-        extractPixbuf info =
-          fst <$> iconInfoLoadSymbolicForContext info styleCtx
-        setIconForSize size = do
-          (name, tooltip) <- getCurrentBatteryIconNameStringTooltip
-          widgetSetTooltipMarkup image $ Just tooltip
-          iconThemeLookupIcon defaultTheme name size themeLoadFlags >>=
-            traverse extractPixbuf >>=
-              traverse (scalePixbufToSize size OrientationHorizontal)
-    updateImage <- autoSizeImage image setIconForSize OrientationHorizontal
-    toWidget =<< channelWidgetNew image chan (const $ postGUIASync updateImage)
diff --git a/accounts/gkleen@sif/taffybar/src/taffybar.hs b/accounts/gkleen@sif/taffybar/src/taffybar.hs
deleted file mode 100644
index 67ee942d..00000000
--- a/accounts/gkleen@sif/taffybar/src/taffybar.hs
+++ /dev/null
@@ -1,89 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-module Main where
-import System.Taffybar (startTaffybar)
-import System.Taffybar.Context (TaffybarConfig(..))
-import System.Taffybar.Hooks
-import System.Taffybar.SimpleConfig hiding (SimpleTaffyConfig(cssPaths))
-import System.Taffybar.Widget
-import qualified System.Taffybar.Widget.Clock as MyClock
-import System.Taffybar.Widget.TooltipBattery
-import Data.Time.Format
-import Data.Time.LocalTime
-import Data.Time.Calendar.WeekDate
-import qualified Data.Text as T
-import Control.Exception (SomeException, try)
-import Control.Monad.Trans.Reader (mapReaderT)
-import Paths_gkleen_sif_taffybar
-import System.Log.Logger
-main :: IO ()
-main = do
-  logger <- getLogger "System.Taffybar"
-  saveGlobalLogger $ setLevel INFO logger
-  myCssPath <- getDataFileName "taffybar.css"
-  startTaffybar taffybarConfig{ cssPaths = pure myCssPath }
-taffybarConfig :: TaffybarConfig
-taffybarConfig =
-  let myWorkspacesConfig =
-        defaultWorkspacesConfig
-        { maxIcons = Just 0
-        , widgetGap = 7
-        , showWorkspaceFn = \case
-            -- Workspace{ workspaceState = Empty } -> False
-            Workspace{ workspaceName } | workspaceName == "NSP" -> False
-            _other -> True
-        , getWindowIconPixbuf = \i d -> either (\(_ :: SomeException) -> Nothing) id <$> mapReaderT try (defaultGetWindowIconPixbuf i d)
-        , urgentWorkspaceState = True
-        }
-      workspaces = workspacesNew myWorkspacesConfig
-      clock = MyClock.textClockNewWith MyClock.defaultClockConfig
-        { MyClock.clockUpdateStrategy = MyClock.RoundedTargetInterval 1 0.0
-        , MyClock.clockFormat = \tl zt@ZonedTime{ zonedTimeToLocalTime = LocalTime{ localDay } }
-                                -> let date = formatTime tl "%Y-%m-%d" localDay
-                                       weekdate = "W" <> show2 woy <> "-" <> show dow
-                                         where (_, woy, dow) = toWeekDate localDay
-                                               show2 :: Int -> String
-                                               show2 x = replicate (2 - length s) '0' ++ s
-                                                 where s = show x
-                                       time = formatTime tl "%H:%M:%S%Ez" zt
-                                    in T.intercalate " " $ map T.pack [weekdate, date, time]
-        }
-      layout = layoutNew defaultLayoutConfig
-      windowsW = windowsNew defaultWindowsConfig
-        { getMenuLabel = truncatedGetMenuLabel 80
-        , getActiveLabel = truncatedGetActiveLabel 80
-        }
-      worktime = commandRunnerNew 60 "worktime" [] "worktime"
-      worktimeToday = commandRunnerNew 60 "worktime" ["today"] "worktime today"
-      -- See https://github.com/taffybar/gtk-sni-tray#statusnotifierwatcher
-      -- for a better way to set up the sni tray
-      -- tray = sniTrayThatStartsWatcherEvenThoughThisIsABadWayToDoIt
-      tray = sniTrayNew
-      myConfig = defaultSimpleTaffyConfig
-        { startWidgets =
-            workspaces : map (>>= buildContentsBox) [ layout, windowsW ]
-        , endWidgets = map (>>= buildContentsBox) $ reverse
-          -- , mpris2New
-          [ worktime, worktimeToday
-          , clock
-          , tray
-          , batteryIconTooltipNew "$status$ $percentage$%$if(time)$$if(rate)$ ($rate$W $time$)$else$ ($time$)$endif$$elseif(rate)$ ($rate$W)$endif$"
-          ]
-        , barPosition = Top
-        , barPadding = 2
-        , barHeight = ExactSize 28
-        , widgetSpacing = 10
-        }
-  in withBatteryRefresh $ withLogServer $
-     withToggleServer $ toTaffyConfig myConfig
diff --git a/accounts/gkleen@sif/taffybar/taffybar.css b/accounts/gkleen@sif/taffybar/taffybar.css
deleted file mode 100644
index 7a297465..00000000
--- a/accounts/gkleen@sif/taffybar/taffybar.css
+++ /dev/null
@@ -1,146 +0,0 @@
-@define-color transparent rgba(0.0, 0.0, 0.0, 0.0);
-@define-color white #808080;
-@define-color gray #202020;
-@define-color green #008000;
-@define-color yellow #808000;
-@define-color blue #000080;
-@define-color red #800000;
-@define-color black #000000;
-/* @define-color taffy-blue #0c7cd5; */
-@define-color taffy-blue @blue;
-@define-color active-window-color @white;
-@define-color urgent-window-color @taffy-blue;
-@define-color font-color @white;
-@define-color menu-background-color @black;
-@define-color menu-font-color @white;
-/* Top level styling */
-.taffy-window * {
-        /*
-                This removes any existing styling from UI elements. Taffybar will not
-                cohere with your gtk theme.
-        */
-        all: unset;
-        font-family: "Fira Sans", sans-serif;
-        font-size: 21px;
-        color: @font-color;
-}
-.taffy-box {
-        /* border-radius: 10px; */
-        background-color: @black;
-}
-.inner-pad {
-        /* padding-bottom: 5px; */
-        /* padding-top: 5px; */
-        padding-left: 2px;
-        padding-right: 2px;
-}
-.contents {
-        /* padding-bottom: 4px; */
-        /* padding-top: 4px; */
-        padding-right: 2px;
-        padding-left: 2px;
-        transition: background-color .5s;
-        border-radius: 5px;
-}
-/* Workspaces styling */
-.workspace-label {
-        padding-right: 3px;
-        padding-left: 2px;
-        font-size: 21px;
-}
-.workspace-label.active {
-        color: @green;
-}
-.workspace-label.visible {
-        color: @yellow;
-}
-.workspace-label.empty {
-        color: @gray;
-}
-.workspace-label.urgent {
-        color: @red;
-}
-.active .contents {
-        background-color: rgba(0.0, 0.0, 0.0, 0.5);
-}
-.visible .contents {
-        background-color: rgba(0.0, 0.0, 0.0, 0.2);
-}
-.window-icon-container {
-        transition: opacity .5s, box-shadow .5s;
-        opacity: 1;
-}
-/* This gives space for the box-shadow (they look like underlines) that follow.
-   This will actually affect all widgets, (not just the workspace icons), but
-   that is what we want since we want the icons to look the same. */
-.auto-size-image, .sni-tray {
-        padding-top: 3px;
-        padding-bottom: 3px;
-}
-.window-icon-container.active {
-        box-shadow: inset 0 -3px @white;
-}
-.window-icon-container.urgent {
-        box-shadow: inset 0 -3px @urgent-window-color;
-}
-.window-icon-container.inactive .window-icon {
-        padding: 0px;
-}
-.window-icon-container.minimized .window-icon {
-        opacity: .3;
-}
-.window-icon {
-        opacity: 1;
-        transition: opacity .5s;
-}
-/* Button styling */
-button {
-        background-color: @transparent;
-        border-width: 0px;
-        border-radius: 0px;
-}
-button:checked, button:hover .Contents:hover {
-        box-shadow: inset 0 -3px @taffy-blue;
-}
-/* Menu styling */
-/* The ".taffy-window" prefixed selectors are needed because if they aren't present,
-   the top level .Taffybar selector takes precedence */
-.taffy-window menuitem *,  menuitem * {
-        color: @menu-font-color;
-}
-.taffy-window menuitem, menuitem {
-        background-color: @menu-background-color;
-}
-.taffy-window menuitem:hover, menuitem:hover {
-        background-color: @taffy-blue;
-}
-.taffy-window menuitem:hover > label, menuitem:hover > label {
-        color: @white;
-}
diff --git a/accounts/gkleen@sif/xmonad/.gitignore b/accounts/gkleen@sif/xmonad/.gitignore
deleted file mode 100644
index c11891cd..00000000
--- a/accounts/gkleen@sif/xmonad/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-**/#*#
-**/.stack-work/
-/stack.yaml.lock
-/*.cabal
diff --git a/accounts/gkleen@sif/xmonad/default.nix b/accounts/gkleen@sif/xmonad/default.nix
deleted file mode 100644
index 8790c12f..00000000
--- a/accounts/gkleen@sif/xmonad/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-argumentPackages@{ ... }:
-let
-  # defaultPackages = (import ./stackage.nix {});
-  # haskellPackages = defaultPackages // argumentPackages;
-  haskellPackages = argumentPackages;
-in haskellPackages.callPackage ./xmonad-yggdrasil.nix {}
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Mpv.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Mpv.hs
deleted file mode 100644
index e6accdcc..00000000
--- a/accounts/gkleen@sif/xmonad/lib/XMonad/Mpv.hs
+++ /dev/null
@@ -1,127 +0,0 @@
-{-# LANGUAGE DeriveGeneric, OverloadedLists, OverloadedStrings, ViewPatterns, ExistentialQuantification, MultiWayIf #-}
-module XMonad.Mpv
-  ( MpvCommand(..), MpvResponse(..), MpvException(..)
-  , mpv
-  , mpvDir
-  , mpvAll, mpvOne
-  , mpvResponse
-  ) where
-import Data.Aeson
-import Data.Monoid
-import Network.Socket hiding (recv)
-import Network.Socket.ByteString
-import qualified Data.ByteString as BS
-import qualified Data.ByteString.Char8 as CBS
-import qualified Data.ByteString.Lazy as LBS
-import GHC.Generics (Generic)
-import Data.Typeable (Typeable)
-import Data.String (IsString(..))
-import Control.Exception
-import System.IO.Temp (getCanonicalTemporaryDirectory)
-import Control.Monad
-import Control.Exception (bracket)
-import Control.Monad.IO.Class (MonadIO(..))
-import System.FilePath
-import System.Directory (getDirectoryContents)
-import Data.List
-import Data.Either
-import Data.Maybe
-import Debug.Trace
-data MpvCommand
-  = forall a. ToJSON a => MpvSetProperty String a
-  | MpvGetProperty String
-data MpvResponse
-  = MpvError String
-  | MpvSuccess (Maybe Value)
-  deriving (Read, Show, Generic, Eq)
-data MpvException = MpvException String
-                  | MpvNoValue
-                  | MpvNoParse String
-  deriving (Generic, Typeable, Read, Show)
-instance Exception MpvException
-instance ToJSON MpvCommand where
-  toJSON (MpvSetProperty name val) = Array ["set_property", fromString name, toJSON val]
-  toJSON (MpvGetProperty name)     = Array ["get_property", fromString name]
-instance FromJSON MpvResponse where
-  parseJSON = withObject "response object" $ \obj -> do
-    mval <- obj .:? "data"
-    err <- obj .: "error"
-    let ret
-          | err == "success" = MpvSuccess mval
-          | otherwise        = MpvError err
-    return ret
-mpvSocket :: FilePath -> (Socket -> IO a) -> IO a
-mpvSocket sockPath = withSocketsDo . bracket mkSock close
-  where
-    mkSock = do
-      sock <- socket AF_UNIX Stream defaultProtocol
-      connect sock $ SockAddrUnix (traceId sockPath)
-      return sock
-mpvResponse :: FromJSON v => MpvResponse -> IO v
-mpvResponse (MpvError str) = throwIO $ MpvException str
-mpvResponse (MpvSuccess Nothing) = throwIO MpvNoValue
-mpvResponse (MpvSuccess (Just v)) = case fromJSON v of
-  Success v' -> return v'
-  Error str  -> throwIO $ MpvNoParse str
-mpv :: FilePath -> MpvCommand -> IO MpvResponse
-mpv sockPath cmd = mpvSocket sockPath $ \sock -> do
-  let message = (`BS.append` "\n") . LBS.toStrict . encode $ Object [("command", toJSON cmd)]
-  traceIO $ show message
-  sendAll sock message
-  let recvAll = do
-        prefix <- recv sock 4096
-        if
-          | (prefix', rest) <- CBS.break (== '\n') prefix
-          , not (BS.null rest) -> return prefix'
-          | BS.null prefix     -> return prefix
-          | otherwise          -> BS.append prefix <$> recvAll
-  response <- recvAll
-  traceIO  $ show response
-  either (ioError . userError) return . traceShowId $ eitherDecodeStrict' response
-mpvDir :: Exception e => FilePath -> (FilePath -> [(FilePath, Either e MpvResponse)] -> Maybe MpvCommand) -> IO [(FilePath, Either e MpvResponse)]
-mpvDir dir step = do
-  socks <- filter (".sock" `isSuffixOf`) <$> getDirectoryContents dir
-  go [] socks
-  where
-    go acc [] = return acc
-    go acc (sock:socks)
-      | Just cmd <- step sock acc = do
-          res <- try $ mpv (dir </> sock) cmd
-          go ((sock, res) : acc) socks
-      | otherwise =
-          go acc socks
-mpvAll :: FilePath -> MpvCommand -> IO [MpvResponse]
-mpvAll dir cmd = do
-  results <- map snd <$> (mpvDir dir (\_ _ -> Just cmd) :: IO [(FilePath, Either SomeException MpvResponse)])
-  mapM (either throwIO return) results
-mpvOne :: FilePath -> MpvCommand -> IO (Maybe MpvResponse)
-mpvOne dir cmd = listToMaybe . snd . partitionEithers . map snd <$> (mpvDir dir step :: IO [(FilePath, Either SomeException MpvResponse)])
-  where
-    step _ results
-      | any (isRight . snd) results = Nothing
-      | otherwise = Just cmd
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyPass.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyPass.hs
deleted file mode 100644
index 1caefae5..00000000
--- a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyPass.hs
+++ /dev/null
@@ -1,94 +0,0 @@
-module XMonad.Prompt.MyPass
-  (
-    -- * Usages
-    -- $usages
-    mkPassPrompt
-  ) where
-import Control.Monad (liftM)
-import XMonad.Core
-import XMonad.Prompt ( XPrompt
-                     , showXPrompt
-                     , commandToComplete
-                     , nextCompletion
-                     , getNextCompletion
-                     , XPConfig
-                     , mkXPrompt
-                     , searchPredicate)
-import System.Directory (getHomeDirectory)
-import System.FilePath (takeExtension, dropExtension, combine)
-import System.Posix.Env (getEnv)
-import XMonad.Util.Run (runProcessWithInput)
-- $usages
-- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:
--
-- > import XMonad.Prompt.Pass
--
-- Then add a keybinding for 'passPrompt', 'passGeneratePrompt' or 'passRemovePrompt':
--
-- >   , ((modMask x , xK_p)                              , passPrompt xpconfig)
-- >   , ((modMask x .|. controlMask, xK_p)               , passGeneratePrompt xpconfig)
-- >   , ((modMask x .|. controlMask  .|. shiftMask, xK_p), passRemovePrompt xpconfig)
--
-- For detailed instructions on:
--
-- - editing your key bindings, see "XMonad.Doc.Extending#Editing_key_bindings".
--
-- - how to setup the password storage, see <http://git.zx2c4.com/password-store/about/>
--
-type Predicate = String -> String -> Bool
-getPassCompl :: [String] -> Predicate -> String -> IO [String]
-getPassCompl compls p s
-  | length s <= minL
-  , all ((> minL) . length) compls = return []
-  | otherwise = do return $ filter (p s) compls
-  where
-    minL = 3
-type PromptLabel = String
-data Pass = Pass PromptLabel
-instance XPrompt Pass where
-  showXPrompt       (Pass prompt) = prompt ++ ": "
-  commandToComplete _ c           = c
-  nextCompletion      _           = getNextCompletion
-- | Default password store folder in $HOME/.password-store
--
-passwordStoreFolderDefault :: String -> String
-passwordStoreFolderDefault home = combine home ".password-store"
-- | Compute the password store's location.
-- Use the PASSWORD_STORE_DIR environment variable to set the password store.
-- If empty, return the password store located in user's home.
--
-passwordStoreFolder :: IO String
-passwordStoreFolder =
-  getEnv "PASSWORD_STORE_DIR" >>= computePasswordStoreDir
-  where computePasswordStoreDir Nothing         = liftM passwordStoreFolderDefault getHomeDirectory
-        computePasswordStoreDir (Just storeDir) = return storeDir
-- | A pass prompt factory
--
-mkPassPrompt :: PromptLabel -> (String -> X ()) -> XPConfig -> X ()
-mkPassPrompt promptLabel passwordFunction xpconfig = do
-  passwords <- io (passwordStoreFolder >>= getPasswords)
-  mkXPrompt (Pass promptLabel) xpconfig (getPassCompl passwords $ searchPredicate xpconfig) passwordFunction
-- | Retrieve the list of passwords from the password storage 'passwordStoreDir
-getPasswords :: FilePath -> IO [String]
-getPasswords passwordStoreDir = do
-  files <- runProcessWithInput "find" [
-    passwordStoreDir,
-    "-type", "f",
-    "-name", "*.gpg",
-    "-printf", "%P\n"] []
-  return $ map removeGpgExtension $ lines files
-removeGpgExtension :: String -> String
-removeGpgExtension file | takeExtension file == ".gpg" = dropExtension file
-                        | otherwise                    = file
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyShell.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyShell.hs
deleted file mode 100644
index c268f87d..00000000
--- a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MyShell.hs
+++ /dev/null
@@ -1,105 +0,0 @@
-module XMonad.Prompt.MyShell
-       ( Shell (..)
-       , shellPrompt
-       , prompt
-       , safePrompt
-       , unsafePrompt
-       , getCommands
-       , getShellCompl
-       , split
-       ) where
-import Codec.Binary.UTF8.String (encodeString)
-import Control.Exception as E
-import Control.Monad (forM)
-import Data.List (isPrefixOf)
-import System.Directory (doesDirectoryExist, getDirectoryContents)
-import System.Environment (getEnv)
-import System.Posix.Files (getFileStatus, isDirectory)
-import XMonad hiding (config)
-import XMonad.Prompt
-import XMonad.Util.Run
-econst :: Monad m => a -> IOException -> m a
-econst = const . return
-data Shell = Shell String
-instance XPrompt Shell where
-    showXPrompt (Shell q)     = q
-    completionToCommand _ = escape
-shellPrompt :: String -> XPConfig -> X ()
-shellPrompt q c = do
-    cmds <- io getCommands
-    mkXPrompt (Shell q) c (getShellCompl cmds) spawn
-{- $spawns
-    See safe and unsafeSpawn in "XMonad.Util.Run".
-    prompt is an alias for safePrompt;
-    safePrompt and unsafePrompt work on the same principles, but will use
-    XPrompt to interactively query the user for input; the appearance is
-    set by passing an XPConfig as the second argument. The first argument
-    is the program to be run with the interactive input.
-    You would use these like this:
-    >     , ((modm,               xK_b), safePrompt "firefox" greenXPConfig)
-    >     , ((modm .|. shiftMask, xK_c), prompt ("xterm" ++ " -e") greenXPConfig)
-    Note that you want to use safePrompt for Firefox input, as Firefox
-    wants URLs, and unsafePrompt for the XTerm example because this allows
-    you to easily start a terminal executing an arbitrary command, like
-    'top'. -}
-prompt, unsafePrompt, safePrompt :: String -> FilePath -> XPConfig -> X ()
-prompt = unsafePrompt
-safePrompt q c config = mkXPrompt (Shell q) config (getShellCompl [c]) run
-    where run = safeSpawn c . return
-unsafePrompt q c config = mkXPrompt (Shell q) config (getShellCompl [c]) run
-    where run a = unsafeSpawn $ c ++ " " ++ a
-getShellCompl :: [String] -> String -> IO [String]
-getShellCompl cmds s | s == "" || last s == ' ' = return []
-                     | otherwise                = do
-    f     <- fmap lines $ runProcessWithInput "bash" [] ("compgen -A file -- "
-                                                        ++ s ++ "\n")
-    files <- case f of
-               [x] -> do fs <- getFileStatus (encodeString x)
-                         if isDirectory fs then return [x ++ "/"]
-                                           else return [x]
-               _   -> return f
-    return . uniqSort $ files ++ commandCompletionFunction cmds s
-commandCompletionFunction :: [String] -> String -> [String]
-commandCompletionFunction cmds str | '/' `elem` str = []
-                                   | otherwise      = filter (isPrefixOf str) cmds
-getCommands :: IO [String]
-getCommands = do
-    p  <- getEnv "PATH" `E.catch` econst []
-    let ds = filter (/= "") $ split ':' p
-    es <- forM ds $ \d -> do
-        exists <- doesDirectoryExist d
-        if exists
-            then getDirectoryContents d
-            else return []
-    return . uniqSort . filter ((/= '.') . head) . concat $ es
-split :: Eq a => a -> [a] -> [[a]]
-split _ [] = []
-split e l =
-    f : split e (rest ls)
-        where
-          (f,ls) = span (/=e) l
-          rest s | s == []   = []
-                 | otherwise = tail s
-escape :: String -> String
-escape []       = ""
-escape (x:xs)
-    | isSpecialChar x = '\\' : x : escape xs
-    | otherwise       = x : escape xs
-isSpecialChar :: Char -> Bool
-isSpecialChar =  flip elem " &\\@\"'#?$*()[]{};"
diff --git a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs b/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs
deleted file mode 100644
index 998c533e..00000000
--- a/accounts/gkleen@sif/xmonad/lib/XMonad/Prompt/MySsh.hs
+++ /dev/null
@@ -1,246 +0,0 @@
-module XMonad.Prompt.MySsh
-    ( -- * Usage
-      -- $usage
-      sshPrompt,
-      Ssh,
-      Override (..),
-      mkOverride,
-      Conn (..),
-      moshCmd,
-      moshCmd',
-      sshCmd,
-      inTmux,
-      withEnv
-    ) where
-import XMonad
-import XMonad.Util.Run
-import XMonad.Prompt
-import System.Directory
-import System.Environment
-import qualified Control.Exception as E
-import Control.Monad
-import Data.Maybe
-import Text.Parsec.String
-import Text.Parsec
-import Data.Char (isSpace)
-econst :: Monad m => a -> E.IOException -> m a
-econst = const . return
-- $usage
-- 1. In your @~\/.xmonad\/xmonad.hs@:
--
-- > import XMonad.Prompt
-- > import XMonad.Prompt.Ssh
--
-- 2. In your keybindings add something like:
--
-- >   , ((modm .|. controlMask, xK_s), sshPrompt defaultXPConfig)
--
-- Keep in mind, that if you want to use the completion you have to
-- disable the "HashKnownHosts" option in your ssh_config
--
-- For detailed instruction on editing the key binding see
-- "XMonad.Doc.Extending#Editing_key_bindings".
-data Override = Override
-                { oUser :: Maybe String
-                , oHost :: String
-                , oPort :: Maybe Int
-                , oCommand :: Conn -> String
-                }
-mkOverride = Override { oUser = Nothing, oHost = "", oPort = Nothing, oCommand = sshCmd }
-sshCmd c = concat
-           [ "ssh -t "
-           , if isJust $ cUser c then (fromJust $ cUser c) ++ "@" else ""
-           , cHost c
-           , if isJust $ cPort c then " -p " ++ (show $ fromJust $ cPort c) else ""
-           , " -- "
-           , cCommand c
-           ]
-moshCmd c = concat
-            [ "mosh "
-            , if isJust $ cUser c then (fromJust $ cUser c) ++ "@" else ""
-            , cHost c
-            , if isJust $ cPort c then " --ssh=\"ssh -p " ++ (show $ fromJust $ cPort c) ++ "\"" else ""
-            , " -- "
-            , cCommand c
-            ]
-moshCmd' p c = concat
-            [ "mosh "
-            , "--server=" ++ p ++ " "
-            , if isJust $ cUser c then (fromJust $ cUser c) ++ "@" else ""
-            , cHost c
-            , if isJust $ cPort c then " --ssh=\"ssh -p " ++ (show $ fromJust $ cPort c) ++ "\"" else ""
-            , " -- "
-            , cCommand c
-            ]
-inTmux Nothing c
-  | null $ cCommand c = c { cCommand = "tmux new-session" }
-  | otherwise = c { cCommand = "tmux new-session \"" ++ (cCommand c) ++  "\"" }
-inTmux (Just h) c
-  | null $ cCommand c = c { cCommand = "tmux new-session -As " <> h }
-  | otherwise = c { cCommand = "tmux new-session \"" ++ (cCommand c) ++  "\"" }
-withEnv :: [(String, String)] -> Conn -> Conn
-withEnv envs c = c { cCommand = "env" ++ (concat $ map (\(n, v) -> ' ' : (n ++ "=" ++ v)) envs) ++ " " ++ (cCommand c) }
-             
-data Conn = Conn
-            { cUser :: Maybe String
-            , cHost :: String
-            , cPort :: Maybe Int
-            , cCommand :: String
-            } deriving (Eq, Show, Read)
-data Ssh = Ssh
-instance XPrompt Ssh where
-  showXPrompt       Ssh = "SSH to: "
-  commandToComplete _ c = c
-  nextCompletion      _ = getNextCompletion
-toConn :: String -> Maybe Conn
-toConn = toConn' . parse connParser "(unknown)"
-toConn' :: Either ParseError Conn -> Maybe Conn
-toConn' (Left _) = Nothing
-toConn' (Right a) = Just a
-connParser :: Parser Conn
-connParser = do
-  spaces
-  user' <- optionMaybe $ try $ do
-    str <- many1 $ satisfy (\c -> (not $ isSpace c) && (c /= '@'))
-    char '@'
-    return str
-  host' <- many1 $ satisfy (not . isSpace)
-  port' <- optionMaybe $ try $ do
-    space
-    string "-p"
-    spaces
-    int <- many1 digit
-    (space >> return ()) <|> eof
-    return $ (read int :: Int)
-  spaces
-  command' <- many anyChar
-  eof
-  return $ Conn
-         { cHost = host'
-         , cUser = user'
-         , cPort = port'
-         , cCommand = command'
-         }
-sshPrompt :: [Override] -> XPConfig -> X ()
-sshPrompt o c = do
-  sc <- io sshComplList
-  mkXPrompt Ssh c (mkComplFunFromList c sc) $ ssh o
-ssh :: [Override] -> String -> X ()
-ssh overrides str = do
-  let cmd = applyOverrides overrides str
-  liftIO $ putStr "SSH Command: "
-  liftIO $ putStrLn cmd
-  runInTerm "" cmd
-applyOverrides :: [Override] -> String -> String
-applyOverrides [] str = "ssh " ++ str
-applyOverrides (o:os) str = case (applyOverride o str) of
-  Just str -> str
-  Nothing -> applyOverrides os str
-applyOverride :: Override -> String -> Maybe String
-applyOverride o str = let
-  conn = toConn str
-  in
-   if isNothing conn then Nothing else
-     case (fromJust conn) `matches` o of
-       True -> Just $ (oCommand o) (fromJust conn)
-       False -> Nothing
-matches :: Conn -> Override -> Bool
-a `matches` b = and
-                [ justBool (cUser a) (oUser b) (==)
-                , (cHost a) == (oHost b)
-                , justBool (cPort a) (oPort b) (==)
-                ]
-justBool :: Eq a => Maybe a -> Maybe a -> (a -> a -> Bool) -> Bool
-justBool Nothing _ _ = True
-justBool _ Nothing _ = True
-justBool (Just a) (Just b) match = a `match` b
-sshComplList :: IO [String]
-sshComplList = uniqSort `fmap` liftM2 (++) sshComplListLocal sshComplListGlobal
-sshComplListLocal :: IO [String]
-sshComplListLocal = do
-  h <- getEnv "HOME"
-  s1 <- sshComplListFile $ h ++ "/.ssh/known_hosts"
-  s2 <- sshComplListConf $ h ++ "/.ssh/config"
-  return $ s1 ++ s2
-sshComplListGlobal :: IO [String]
-sshComplListGlobal = do
-  env <- getEnv "SSH_KNOWN_HOSTS" `E.catch` econst "/nonexistent"
-  fs <- mapM fileExists [ env
-                        , "/usr/local/etc/ssh/ssh_known_hosts"
-                        , "/usr/local/etc/ssh_known_hosts"
-                        , "/etc/ssh/ssh_known_hosts"
-                        , "/etc/ssh_known_hosts"
-                        ]
-  case catMaybes fs of
-    []    -> return []
-    (f:_) -> sshComplListFile' f
-sshComplListFile :: String -> IO [String]
-sshComplListFile kh = do
-  f <- doesFileExist kh
-  if f then sshComplListFile' kh
-       else return []
-sshComplListFile' :: String -> IO [String]
-sshComplListFile' kh = do
-  l <- readFile kh
-  return $ map (getWithPort . takeWhile (/= ',') . concat . take 1 . words)
-         $ filter nonComment
-         $ lines l
-sshComplListConf :: String -> IO [String]
-sshComplListConf kh = do
-  f <- doesFileExist kh
-  if f then sshComplListConf' kh
-       else return []
-sshComplListConf' :: String -> IO [String]
-sshComplListConf' kh = do
-  l <- readFile kh
-  return $ map (!!1)
-         $ filter isHost
-         $ map words
-         $ lines l
- where
-   isHost ws = take 1 ws == ["Host"] && length ws > 1
-fileExists :: String -> IO (Maybe String)
-fileExists kh = do
-  f <- doesFileExist kh
-  if f then return $ Just kh
-       else return Nothing
-nonComment :: String -> Bool
-nonComment []      = False
-nonComment ('#':_) = False
-nonComment ('|':_) = False -- hashed, undecodeable
-nonComment _       = True
-getWithPort :: String -> String
-getWithPort ('[':str) = host ++ " -p " ++ port
-    where (host,p) = break (==']') str
-          port = case p of
-                   ']':':':x -> x
-                   _         -> "22"
-getWithPort  str = str
diff --git a/accounts/gkleen@sif/xmonad/package.yaml b/accounts/gkleen@sif/xmonad/package.yaml
deleted file mode 100644
index f65137af..00000000
--- a/accounts/gkleen@sif/xmonad/package.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: xmonad-yggdrasil
-executables:
-  xmonad:
-    dependencies:
-      - base
-      - xmonad
-      - xmonad-contrib
-      - aeson
-      - bytestring
-      - text
-      - temporary
-      - filepath
-      - directory
-      - network
-      - unix
-      - utf8-string
-      - parsec
-      - process
-      - mtl
-      - X11
-      - transformers
-      - containers
-      - hostname
-      - libnotify
-      - taffybar
-    main: xmonad.hs
-    source-dirs:
-      - .
-      - lib
diff --git a/accounts/gkleen@sif/xmonad/stack.nix b/accounts/gkleen@sif/xmonad/stack.nix
deleted file mode 100644
index 17a49e04..00000000
--- a/accounts/gkleen@sif/xmonad/stack.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ghc, nixpkgs ? import ./nixpkgs.nix {} }:
-let
-  haskellPackages = import ./stackage.nix { inherit nixpkgs; };
-  inherit (nixpkgs {}) pkgs;
-in pkgs.haskell.lib.buildStackProject {
-  inherit ghc;
-  inherit (haskellPackages) stack;
-  name = "stackenv";
-  buildInputs = (with pkgs;
-    [ xorg.libX11 xorg.libXrandr xorg.libXinerama xorg.libXScrnSaver xorg.libXext xorg.libXft
-      cairo
-      glib
-    ]) ++ (with haskellPackages;
-    [ 
-    ]);
-}
diff --git a/accounts/gkleen@sif/xmonad/stack.yaml b/accounts/gkleen@sif/xmonad/stack.yaml
deleted file mode 100644
index b8ed1147..00000000
--- a/accounts/gkleen@sif/xmonad/stack.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-nix:
-  enable: true
-  shell-file: stack.nix
-resolver: lts-13.21
-packages:
-  - .
-extra-deps: []
diff --git a/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix b/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
deleted file mode 100644
index 7c853619..00000000
--- a/accounts/gkleen@sif/xmonad/xmonad-yggdrasil.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ mkDerivation, aeson, base, bytestring, containers, directory
-, filepath, hostname, hpack, mtl, network, parsec, process, lib
-, temporary, transformers, unix, utf8-string, X11, xmonad
-, xmonad-contrib, libnotify, taffybar
-}:
-mkDerivation {
-  pname = "xmonad-yggdrasil";
-  version = "0.0.0";
-  src = ./.;
-  isLibrary = false;
-  isExecutable = true;
-  libraryToolDepends = [ hpack ];
-  executableHaskellDepends = [
-    aeson base bytestring containers directory filepath hostname mtl
-    network parsec process temporary transformers unix utf8-string X11
-    xmonad xmonad-contrib libnotify taffybar
-  ];
-  preConfigure = "hpack";
-  license = "unknown";
-  hydraPlatforms = lib.platforms.none;
-}
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs
deleted file mode 100644
index a44d3bb7..00000000
--- a/accounts/gkleen@sif/xmonad/xmonad.hs
+++ /dev/null
@@ -1,939 +0,0 @@
-{-# LANGUAGE TupleSections, ViewPatterns, OverloadedStrings, FlexibleInstances, UndecidableInstances, MultiWayIf, NumDecimals #-}
-import XMonad
-import XMonad.Hooks.DynamicLog
-import XMonad.Hooks.ManageDocks
-import XMonad.Util.Run hiding (proc)
-import XMonad.Util.Loggers
-import XMonad.Util.EZConfig(additionalKeys)
-import System.IO
-import System.IO.Error
-import System.Environment
-import Data.Map (Map)
-import qualified Data.Map as Map
-import qualified XMonad.StackSet as W
-import System.Exit
-import Control.Monad.State (get)
-- import XMonad.Layout.Spiral
-import Data.Ratio
-import Data.List
-import Data.Char
-import Data.Maybe (fromMaybe, listToMaybe, maybeToList, catMaybes, isJust)
-import XMonad.Layout.Tabbed
-import XMonad.Prompt
-import XMonad.Prompt.Input
-import XMonad.Util.Scratchpad
-import XMonad.Util.NamedScratchpad
-import XMonad.Util.Ungrab
-import Control.Monad (sequence, liftM, liftM2, join, void)
-import XMonad.Util.WorkspaceCompare
-import XMonad.Layout.NoBorders
-import XMonad.Layout.PerWorkspace
-import XMonad.Layout.SimplestFloat
-import XMonad.Layout.Renamed
-import XMonad.Layout.Reflect
-import XMonad.Layout.OnHost
-import XMonad.Layout.Combo
-import XMonad.Layout.ComboP
-import XMonad.Layout.Column
-import XMonad.Layout.TwoPane
-import XMonad.Layout.IfMax
-import XMonad.Layout.LayoutBuilder
-import XMonad.Layout.WindowNavigation
-import XMonad.Layout.Dwindle
-import XMonad.Layout.TrackFloating
-import System.Process
-import System.Directory (removeFile)
-import System.Posix.Files
-import System.FilePath ((</>))
-import Control.Concurrent
-import System.Posix.Process (getProcessID)
-import System.IO.Error
-import System.IO
-import XMonad.Hooks.ManageHelpers hiding (CW)
-import XMonad.Hooks.UrgencyHook as U
-import XMonad.Hooks.EwmhDesktops
-import XMonad.StackSet (RationalRect (..))
-import Control.Monad (when, filterM, (<=<))
-import Graphics.X11.ExtraTypes.XF86
-import XMonad.Util.Cursor
-import XMonad.Actions.Warp
-import XMonad.Actions.FloatKeys
-import XMonad.Util.SpawnOnce
-import System.Directory
-import System.FilePath
-import XMonad.Actions.CopyWindow
-import XMonad.Hooks.ServerMode
-import XMonad.Actions.Commands
-import XMonad.Actions.CycleWS
-import XMonad.Actions.RotSlaves
-import XMonad.Actions.UpdatePointer
-import XMonad.Prompt.Window
-import Data.IORef
-import Data.Monoid
-import Data.String
-import qualified XMonad.Actions.PhysicalScreens as P
-import XMonad.Layout.IM
-import System.Taffybar.Support.PagerHints (pagerHints)
-import XMonad.Prompt.MyShell
-import XMonad.Prompt.MyPass
-import XMonad.Prompt.MySsh
-import XMonad.Mpv
-import Network.HostName
-import Control.Applicative ((<$>))
-import Libnotify as Notify hiding (appName)
-import qualified Libnotify as Notify (appName)
-import Libnotify (Notification)
-- import System.Information.Battery
-import Data.Int (Int32)
-import System.Posix.Process
-import System.Posix.Signals
-import System.Posix.IO as Posix
-import Control.Exception
-import System.IO.Unsafe
-import Control.Monad.Trans.Class
-import Control.Monad.Trans.Maybe
-import Data.Fixed (Micro)
-import qualified Data.Text as Text
-import Data.Ord (comparing)
-import Debug.Trace
-instance MonadIO m => IsString (m ()) where
-  fromString = spawn
-type KeyMap = Map (ButtonMask, KeySym) (X ())
-data Host = Host
-            { hName :: HostName
-            , hManageHook :: ManageHook
-            , hWsp :: Integer -> WorkspaceId
-            , hCoWsp :: String -> Maybe WorkspaceId
-            , hKeysMod :: XConfig Layout -> (KeyMap -> KeyMap)
-            , hScreens :: [P.PhysicalScreen]
-            , hKbLayouts :: [(String, Maybe String)]
-            , hCmds :: X [(String, X ())]
-            , hKeyUpKeys :: XConfig Layout -> KeyMap
-            }
-defaultHost = Host { hName = "unkown"
-                   , hManageHook = composeOne [manageScratchTerm]
-                   , hWsp = show
-                   , hCoWsp = const Nothing
-                   , hKeysMod = const id
-                   , hScreens = [0,1..]
-                   , hKbLayouts = [ ("us", Just "dvp")
-                                  , ("us", Nothing)
-                                  , ("de", Nothing)
-                                  ]
-                   , hCmds = return []
-                   , hKeyUpKeys = const Map.empty
-                   }
-browser :: String
-browser = "env MOZ_USE_XINPUT2=1 firefox"
-gray, darkGray, red, green :: String
-gray = "#808080"
-darkGray = "#202020"
-red = "#800000"
-green = "#008000"
-hostFromName :: HostName -> Host
-hostFromName h@("vali") = defaultHost { hName = h
-                                      , hManageHook = composeOne $ catMaybes [ Just manageScratchTerm
-                                                                             , assign "web"  $ className =? ".dwb-wrapped"
-                                                                             , assign "web"  $ className =? "Chromium"
-                                                                             , assign "work" $ className =? "Emacs"
-                                                                             , assign "media" $ className =? "mpv"
-                                                                             ]
-                                      , hWsp = hWsp
-                                      , hCoWsp = hCoWsp
-                                      , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_d, ["chromium", "chromium $(xclip -o)"])
-                                                                                                                        , (xK_e, ["emacsclient -c"])
-                                                                                                                        ])
-                                                            `Map.union`
-                                                            ( Map.fromList [ ((XMonad.modMask conf .|. controlMask, xK_Return), scratchpadSpawnActionCustom $ (XMonad.terminal conf) ++ " -name scratchpad -title scratchpad -e tmux new-session -D -s scratch")
-                                                                           ] )
-                                      , hScreens = hScreens defaultHost
-                                      }
-  where
-    workspaceNames = Map.fromList [ (2, "web")
-                                  , (3, "work")
-                                  , (10, "media")
-                                  ]
-    hWsp = wspFromMap workspaceNames
-    hCoWsp = coWspFromMap workspaceNames
-    assign wsp test = (\wsp -> test -?> doShift wsp) <$> hCoWsp wsp
-hostFromName h
-  | h `elem` ["hel", "sif"] = defaultHost { hName = h
-                                          , hManageHook = namedScratchpadManageHook scratchpads <+> composeOne (catMaybes
-                                              [ assign "mpv"     $ className =? "mpv"
-                                              , assign "mpv"     $ stringProperty "WM_WINDOW_ROLE" =? "presentation"
-                                              , assign "read"    $ stringProperty "WM_WINDOW_ROLE" =? "presenter"
-                                              , assign "mpv"     $ className =? "factorio"
-                                              , assign "mpv"     $ resource =? "twitch"
-                                              , assign "web"     $ className =? "chromium-browser"
-                                              , assign "web"     $ className =? "Google-chrome"
-                                              , assign "work"    $ (appName =? "Devtools" <&&> className =? "firefox")
-                                              , assign "work"    $ className =? "Postman"
-                                              , assign "web"     $ (appName =? "Navigator" <&&> className =? "firefox")
-                                              , assign "comm"    $ (className =? "Emacs" <&&> title =? "Mail")
-                                              , assign "comm"    $ className =? "Zulip"
-                                              , assign "comm"    $ className =? "Element"
-                                              , assign "comm"    $ className =? "Rocket.Chat"
-                                              , assign "comm"    $ className =? "Discord"
-                                              , assign "comm"    $ className =? "Rainbow"
-                                              , assign "media"   $ resource =? "media"
-                                              , assign "monitor" $ className =? "Grafana"
-                                              , assign "monitor" $ className =? "Virt-viewer"
-                                              , assign "monitor" $ resource =? "htop"
-                                              , assign "monitor" $ resource =? "monitor"
-                                              , assign "monitor" $ className =? "xfreerdp"
-                                              , assign "monitor" $ className =? "org.remmina.Remmina"
-                                              , Just $ resource =? "htop" -?> centerFloat
-                                              , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat
-                                              , Just $ resource =? "log" -?> centerFloat
-                                              , assign "work"    $ className =? "Alacritty"
-                                              , Just $ (appName =? "Edit with Emacs FRAME") -?> centerFloat
-                                              , assign' ["work", "uni"] $ (className =? "Emacs" <&&> appName /=? "Edit with Emacs FRAME")
-                                              , assign' ["work", "uni"] $ className =? "jetbrains-idea-ce"
-                                              , assign "read"    $ className =? "llpp"
-                                              , assign "read"    $ className =? "Evince"
-                                              , assign "read"    $ className =? "Zathura"
-                                              , assign "read"    $ className =? "MuPDF"
-                                              , assign "read"    $ className =? "Xournal"
-                                              , assign "read"    $ appName =? "libreoffice"
-                                              , assign "read"    $ appName =? "com-trollworks-gcs-app-GCS"
-                                              , assign "read"    $ appName =? "Tux.py"
-                                              , assign "read"    $ className =? "Gnucash"
-                                              , assign "comm"    $ className =? "Skype"
-                                              , assign "comm"    $ className =? "Daily"
-                                              , assign "comm"    $ className =? "Pidgin"
-                                              , assign "comm"    $ className =? "Thunderbird"
-                                              , assign "comm"    $ className =? "Slack"
-                                              , Just $ (resource =? "xvkbd") -?> doRectFloat $ RationalRect (1 % 8) (3 % 8) (6 % 8) (4 % 8)
-                                              , Just $ (stringProperty "_NET_WM_WINDOW_TYPE" =? "_NET_WM_WINDOW_TYPE_DIALOG") -?> doFloat
-                                              , Just $ (className =? "Dunst") -?> doFloat
-                                              , Just $ (className =? "Xmessage") -?> doCenterFloat
-                                              , Just $ (className =? "Nm-openconnect-auth-dialog") -?> centerFloat
-                                              , Just $ (className =? "Pinentry") -?> doCenterFloat
-                                              , Just $ (className =? "pinentry") -?> doCenterFloat
-                                              , Just $ (stringProperty "WM_WINDOW_ROLE" =? "GtkFileChooseDialog") -?> centerFloatSmall
-                                              , Just $ (className =? "Nvidia-settings") -?> doCenterFloat
-                                              , Just $ fmap ("Minetest" `isInfixOf`) title -?> doIgnore
-                                              , Just $ fmap ("Automachef" `isInfixOf`) title -?> doIgnore
-                                              , assign "call"    $ className =? "zoom"
-                                              ])
-                                          , hWsp = hWsp
-                                          , hCoWsp = hCoWsp
-                                          , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"])
-                                                                                                                            , (xK_d, [fromString browser, "google-chrome" {- , "notmuch-links" -}])
-                                                                                                                            , (xK_c, [ inputPrompt xPConfigMonospace "dc" ?+ dc ])
-                                                                                                                            , (xK_g, ["pidgin"])
-                                                                                                                            , (xK_s, ["skype"])
-                                                                                                                            -- , (xK_p, [mkPassPrompt "Type password" pwType xPConfig, mkPassPrompt "Show password" pwShow xPConfig, mkPassPrompt "Copy password" pwClip xPConfig])
-                                                                                                                            , (xK_w, ["sudo rewacom"])
-                                                                                                                            , (xK_y, [ "tmux new-window -dt media /var/media/link.hs $(xclip -o)"
-                                                                                                                                     , "tmux new-window -dt media /var/media/download.hs $(xclip -o)"
-                                                                                                                                     , "tmux new-window -dt media /var/media/download.hs $(xclip -o -selection clipboard)"
-                                                                                                                                     ])
-                                                                                                                            , (xK_l, [ "tmux new-window -dt media mpv $(xclip -o)"
-                                                                                                                                     , "tmux new-window -dt media mpv $(xclip -o -selection clipboard)"
-                                                                                                                                     , "alacritty --class media -e tmuxp load /var/media"
-                                                                                                                                     ])
-                                                                                                                            {- , (xK_m, [ "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch)'"
-                                                                                                                                     , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e '(notmuch-mua-new-mail)'"
-                                                                                                                                     , "emacsclient -c -F \"'(title . \\\"Mail\\\")\" -e \"(browse-url-mail \"$(xclip -o)\")\""
-                                                                                                                                     ]) -}
-                                                                                                                            , (xK_Return, ["keynav start,windowzoom", "keynav start"])
-                                                                                                                            , (xK_t, [inputPrompt xPConfigMonospace "fuzzytime timer" ?+ fuzzytime, fuzzytime "unset", work_fuzzytime])
-                                                                                                                            , (xK_a, [inputPrompt xPConfigMonospace "adjmix" ?+ adjmix])
-                                                                                                                            , (xK_s, [ inputPromptWithCompl xPConfigMonospace "start synergy" synergyCompl ?+ synergyStart
-                                                                                                                                     , inputPromptWithCompl xPConfigMonospace "stop synergy" synergyCompl ?+ synergyStop
-                                                                                                                                     ])
-                                                                                                                            , (xK_h, [ "alacritty --class htop -e htop"
-                                                                                                                                     , "alacritty --class log -e journalctl -xef"
-                                                                                                                                     ])
-                                                                                                                            , (xK_x, [ "autorandr -c"
-                                                                                                                                     , "autorandr -fl def"
-                                                                                                                                     ])
-                                                                                                                            , (xK_z, [ "zulip -- --force-device-scale-factor=2"
-                                                                                                                                     ])
-                                                                                                                            ])
-                                                                `Map.union`
-                                                                ( Map.fromList [ ((XMonad.modMask conf .|. controlMask, xK_Return), namedScratchpadAction scratchpads "term")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_a), namedScratchpadAction scratchpads "pavucontrol")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_o), namedScratchpadAction scratchpads "easyeffects")
-                                                                               , ((XMonad.modMask conf .|. controlMask .|. shiftMask, xK_o), namedScratchpadAction scratchpads "helvum")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_w), namedScratchpadAction scratchpads "alarms")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_b), namedScratchpadAction scratchpads "blueman")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_p), namedScratchpadAction scratchpads "keepassxc")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_t), namedScratchpadAction scratchpads "toggl")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_e), namedScratchpadAction scratchpads "emacs")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_m), namedScratchpadAction scratchpads "calendar")
-                                                                               , ((XMonad.modMask conf .|. controlMask, xK_f), namedScratchpadAction scratchpads "music")
-                                                                               , ((XMonad.modMask conf .|. mod1Mask, xK_Up), rotate U)
-                                                                               , ((XMonad.modMask conf .|. mod1Mask, xK_Down), rotate D)
-                                                                               , ((XMonad.modMask conf .|. mod1Mask, xK_Left), rotate L)
-                                                                               , ((XMonad.modMask conf .|. mod1Mask, xK_Right), rotate R)
-                                                                               , ((controlMask,               xK_space ), "dunstctl close"      )
-                                                                               , ((controlMask .|. shiftMask, xK_space ), "dunstctl close-all"  )
-                                                                               , ((controlMask,               xK_period), "dunstctl context"    )
-                                                                               , ((controlMask,               xK_comma ), "dunstctl history-pop")
-                                                                               -- , ((XMonad.modMask conf .|. shiftMask, xK_a), startMute "hel")
-                                                                               ] )
-                                          , hKeyUpKeys = \conf -> Map.fromList [ -- ((XMonad.modMask conf .|. shiftMask, xK_a), stopMute "hel")
-                                                                               ]
-                                          , hScreens = hScreens defaultHost
-                                          , hCmds = return [ ("prev-workspace", prevWS)
-                                                           , ("next-workspace", nextWS)
-                                                           , ("prev-window", rotAllDown)
-                                                           , ("next-window", rotAllUp)
-                                                           , ("banish", banishScreen LowerRight)
-                                                           , ("update-gpg-tty", safeSpawn "gpg-connect-agent" ["UPDATESTARTUPTTY", "/bye"])
-                                                           , ("rescreen", rescreen)
-                                                           , ("repanel", do
-                                                                 spawn "nm-applet"
-                                                                 spawn "blueman-applet"
-                                                                 spawn "pasystray"
-                                                                 spawn "kdeconnect-indicator"
-                                                                 spawn "dunst -print"
-                                                                 spawn "udiskie"
-                                                                 spawn "autocutsel -s PRIMARY"
-                                                                 spawn "autocutsel -s CLIPBOARD"
-                                                             )
-                                                           , ("pause", mediaMpv $ MpvSetProperty "pause" True)
-                                                           , ("unpause", mediaMpv $ MpvSetProperty "pause" False)
-                                                           , ("exit", io $ exitWith ExitSuccess)
-                                                           ]
-                                          }
-  where
-    withGdkScale act = void . xfork $ setEnv "GDK_SCALE" "2" >> act
-    workspaceNames = Map.fromList [ (1, "comm")
-                                  , (2, "web")
-                                  , (3, "work")
-                                  , (4, "read")
-                                  , (5, "monitor")
-                                  , (6, "uni")
-                                  , (8, "call")
-                                  , (9, "media")
-                                  , (10, "mpv")
-                                  ]
-    scratchpads = [ NS "term" "alacritty --class scratchpad --title scratchpad -e tmux new-session -AD -s scratch" (resource =? "scratchpad") centerFloat
-                  , NS "pavucontrol" "pavucontrol" (resource =? "pavucontrol") centerFloat
-                  , NS "helvum" "helvum" (resource =? "helvum") centerFloat
-                  , NS "easyeffects" "easyeffects" (resource =? "easyeffects") centerFloat
-                  , NS "alarms" "alarm-clock-applet" (className =? "Alarm-clock-applet" <&&> title =? "Alarms") centerFloat
-                  , NS "blueman" "blueman-manager" (className =? ".blueman-manager-wrapped") centerFloat
-                  , NS "keepassxc" "keepassxc" (className =? "KeePassXC") centerFloat
-                  , NS "toggl" "toggldesktop" (className =? "Toggl Desktop") centerFloat
-                  , NS "calendar" "minetime -- --force-device-scale-factor=1.6" (className =? "MineTime") centerFloat
-                  , NS "emacs" "emacsclient -c -F \"'(title . \\\"Scratchpad\\\")\"" (className =? "Emacs" <&&> title =? "Scratchpad") centerFloat
-                  , NS "music" "ytmdesktop" (className =? "youtube-music-desktop-app") centerFloat
-                  ]
-    centerFloat = customFloating $ RationalRect (1 % 16) (1 % 16) (7 % 8) (7 % 8)
-    centerFloatSmall = customFloating $ RationalRect (1 % 4) (1 % 4) (1 % 2) (1 % 2)
-    hWsp = wspFromMap workspaceNames
-    hCoWsp = coWspFromMap workspaceNames
-    assign wsp test = (\wsp -> test -?> doShift wsp) <$> hCoWsp wsp
-    assign' :: [String] -> Query Bool -> Maybe MaybeManageHook
-    assign' wsps test = do
-      wsIds <- mapM hCoWsp wsps
-      return $ test -?> go wsIds
-      where
-        go :: [WorkspaceId] -> ManageHook
-        go wsps = do
-          visWsps <- liftX $ (\wset -> W.tag . W.workspace <$> W.current wset : W.visible wset) <$> gets windowset
-          case (filter (`elem` visWsps) wsps, wsps) of
-            (wsp : _, _) -> doShift wsp
-            (_, wsp : _) -> doShift wsp
-            ([], [])     -> return mempty
-    rotate rot = do
-      safeSpawn "xrandr" ["--output", "eDP-1", "--rotate", xrandrDir]
-      mapM_ rotTouch touchscreens
-      where
-        xrandrDir = case rot of
-          U -> "normal"
-          L -> "left"
-          R -> "right"
-          D -> "inverted"
-        matrix = case rot of
-          U -> [ [ 1,  0,  0]
-               , [ 0,  1,  0]
-               , [ 0,  0,  1]
-               ]
-          L -> [ [ 0, -1,  1]
-               , [ 1,  0,  0]
-               , [ 0,  0,  1]
-               ]
-          R -> [ [ 0,  1,  0]
-               , [-1,  0,  1]
-               , [ 0,  0,  1]
-               ]
-          D -> [ [-1,  0,  1]
-               , [ 0, -1,  1]
-               , [ 0,  0,  1]
-               ]
-        touchscreens = [ "Wacom Co.,Ltd. Pen and multitouch sensor Finger touch"
-                       , "Wacom Co.,Ltd. Pen and multitouch sensor Pen stylus"
-                       , "Wacom Co.,Ltd. Pen and multitouch sensor Pen eraser"
-                       ]
-        rotTouch screen = do
-          safeSpawn "xinput" $ ["set-prop", screen, "Coordinate Transformation Matrix"] ++ map (\n -> show n ++ ",") (concat matrix)
-          safeSpawn "xinput" ["map-to-output", screen, "eDP-1"]
-    withPw f label = io . void . forkProcess $ do
-      uninstallSignalHandlers
-      void $ createSession
-      (dropWhileEnd isSpace -> pw) <- readCreateProcess (proc "pass" ["show", label]) ""
-      void $ f pw
-    pwType :: String -> X ()
-    pwType = withPw $ readCreateProcess (proc "xdotool" ["type", "--clearmodifiers", "--file", "-"])
-    pwClip label = safeSpawn "pass" ["show", "--clip", label]
-    pwShow :: String -> X ()
-    pwShow = withPw $ \pw -> do
-      xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE")
-      readCreateProcess (proc xmessage ["-file", "-"]) pw
-    fuzzytime str = safeSpawn "fuzzytime" $ "timer" : words str
-    work_fuzzytime = io . void . forkProcess $ do
-      readCreateProcess (proc "worktime" []) "" >>= safeSpawn "fuzzytime" . ("timer" : ) . pure
-    adjmix str = safeSpawn "adjmix" $ words str
-    dc expr = void . xfork $ do
-      result <- readProcess "dc" [] $ expr ++ "f"
-      let
-        (first : rest) = filter (not . null) $ lines result
-        notification = Notify.summary first <> Notify.body (unlines rest) <> Notify.timeout Infinite <> Notify.urgency Normal <> Notify.appName "dc"
-      void $ Notify.display notification
-    synergyCompl = mkComplFunFromList' xPConfigMonospace ["mathw86"]
-    synergyStart host = safeSpawn "systemctl" ["--user", "start", "synergy-rtunnel@" ++ host ++ ".service"]
-    synergyStop host = safeSpawn "systemctl" ["--user", "stop", "synergy-rtunnel@" ++ host ++ ".service"]
-hostFromName _ = defaultHost
-- muteRef :: IORef (Maybe (String, Notification))
-- {-# NOINLINE muteRef #-}
-- muteRef = unsafePerformIO $ newIORef Nothing
-- startMute, stopMute :: String -> X ()
-- startMute sink = liftIO $ do
--   muted <- isJust <$> readIORef muteRef
--   when (not muted) $ do
--     let
--       notification = Notify.summary "Muted" <> Notify.timeout Infinite <> Notify.urgency Normal
--       level = "0.0dB"
--     -- level <- runProcessWithInput "ssh" ["bragi", "cat", "/dev/shm/mix/" ++ sink ++ "/level"] ""
--     -- callProcess "ssh" ["bragi", "adjmix", "-t", sink, "-o", "0"]
--     hPutStrLn stderr "Mute"
--     writeIORef muteRef . Just . (level, ) =<< Notify.display notification
-- stopMute sink = liftIO $ do
--   let
--     unmute (Just (level, notification)) = do
--       hPutStrLn stderr "Unmute"
--       -- callProcess "ssh" ["bragi", "adjmix", "-t", sink, "-o", level]
--       Notify.close notification
--     unmute Nothing = return ()
--   muted <- isJust <$> readIORef muteRef
--   when muted . join . atomicModifyIORef muteRef $ (Nothing, ) . unmute
-wspFromMap workspaceNames = \i -> case Map.lookup i workspaceNames of
-  Just str -> show i ++ " " ++ str
-  Nothing -> show i
-coWspFromMap workspaceNames = \str -> case filter ((== str) . snd) $ Map.toList workspaceNames of
-  [] -> Nothing
-  [(i, _)] -> Just $ wspFromMap workspaceNames i
-  _ -> Nothing
-spawnModifiers = [0, controlMask, shiftMask .|. controlMask]
-spawnBindings :: XConfig layout -> (KeySym, [X ()]) -> [((KeyMask, KeySym), X ())]
-spawnBindings conf (k, cmds) = zipWith (\m cmd -> ((modm .|. mod1Mask .|. m, k), cmd)) spawnModifiers cmds
-  where
-    modm = XMonad.modMask conf
-manageScratchTerm = (resource =? "scratchpad" <||> resource =? "keysetup") -?> doRectFloat $ RationalRect (1 % 16) (1 % 16) (7 % 8) (7 % 8)
-tabbedLayout t = renamed [Replace "Tabbed"] $ reflectHoriz $ t CustomShrink $ tabbedTheme
-tabbedLayoutHoriz t = renamed [Replace "Tabbed Horiz"] $ reflectVert $ t CustomShrink $ tabbedTheme
-tabbedTheme = def
-  { activeColor = "black"
-  , inactiveColor = "black"
-  , urgentColor = "black"
-  , activeBorderColor = gray
-  , inactiveBorderColor = darkGray
-  , urgentBorderColor = red
-  , activeTextColor = gray
-  , inactiveTextColor = gray
-  , urgentTextColor = gray
-  , decoHeight = 32
-  , fontName = "xft:Fira Sans:pixelsize=21"
-  }
-main :: IO ()
-main = do
-  arguments <- either (const []) id <$> tryIOError getArgs
-  case arguments of
-    ["--command", s] -> do
-      d   <- openDisplay ""
-      rw  <- rootWindow d $ defaultScreen d
-      a   <- internAtom d "XMONAD_COMMAND" False
-      m   <- internAtom d s False
-      allocaXEvent $ \e -> do
-        setEventType e clientMessage
-        setClientMessageEvent e rw a 32 m currentTime
-        sendEvent d rw False structureNotifyMask e
-        sync d False
-    _ -> do
-      -- batteryMon <- xfork $ monitorBattery Nothing Nothing
-      hostname <- getHostName
-      let
-        host = hostFromName hostname
-      setEnv "HOST" hostname
-      let myConfig = withHostUrgency . ewmhFullscreen . ewmh . pagerHints $ docks def
-            { manageHook = hManageHook host
-            , terminal = "alacritty"
-            , layoutHook = smartBorders . avoidStruts $ windowNavigation layout'
-            , logHook = do
-                dynamicLogString xmobarPP' >>= writeProps
-                updatePointer (99 % 100, 98 % 100) (0, 0)
-            , modMask = mod4Mask
-            , keys = \conf -> hKeysMod host conf $ myKeys' conf host
-            , workspaces = take (length numKeys) $ map wsp [1..]
-            , startupHook = setDefaultCursor xC_left_ptr
-            , normalBorderColor = darkGray
-            , focusedBorderColor = gray
-            , handleEventHook = serverModeEventHookCmd' (hCmds host) <+> keyUpEventHook
-            }
-          writeProps str = do
-            let encodeCChar = map $ fromIntegral . fromEnum
-                atoms = [ "_XMONAD_WORKSPACES"
-                        , "_XMONAD_LAYOUT"
-                        , "_XMONAD_TITLE"
-                        ]
-            (flip mapM_) (zip atoms (lines str)) $ \(atom', content) -> do
-              ustring <- getAtom "UTF8_STRING"
-              atom <- getAtom atom'
-              withDisplay $ \dpy -> io $ do
-                root <- rootWindow dpy $ defaultScreen dpy
-                changeProperty8 dpy root atom ustring propModeReplace $ encodeCChar content
-                sync dpy True
-          wsp = hWsp host
-          -- We can´t define per-host layout modifiers because we lack dependent types
-          layout' = onHost "skadhi" ( onWorkspace (wsp 1) (Full ||| withIM (1%5) (Title "Buddy List") tabbedLayout') $
-                                      onWorkspace (wsp 10) Full $
-                                      onWorkspace (wsp 2) (Full ||| tabbedLayout') $
-                                      onWorkspace (wsp 5) tabbedLayout' $
-                                      onWorkspace (wsp 8) (withIM (1%5) (Title "Friends") tabbedLayout') $
-                                      defaultLayouts
-                                    ) $
-                    onHost "vali"   ( onWorkspace (wsp 2) (Full ||| tabbedLayout' ||| combineTwo (TwoPane 0.01 0.57) Full tabbedLayout') $
-                                      onWorkspace (wsp 3) workLayouts $
-                                      defaultLayouts
-                                    ) $
-                    onHost "hel"    ( onWorkspace (wsp 1) (withIM (1 % 8) (Title "Buddy List") $ trackFloating tabbedLayout') $
-                                      onWorkspace (wsp 2) (tabbedLayout''' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 3) workLayouts $
-                                      onWorkspace (wsp 6) workLayouts $
-                                      onWorkspace (wsp 4) (tabbedLayout' ||| tabbedLayoutHoriz' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 5) (tabbedLayout''' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 10) (tabbedLayout''' ||| combineTwoP (TwoPane (1 % 100) (3 % 4)) tabbedLayout''' tabbedLayout''' (ClassName "mpv") ||| Dwindle R CW 1 (5 % 100)) $
-                                      defaultLayouts
-                                    ) $
-                    onHost "sif"    ( onWorkspace (wsp 1) (withIM (1 % 8) (Title "Buddy List") $ trackFloating tabbedLayout') $
-                                      onWorkspace (wsp 2) (tabbedLayout''' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 3) workLayouts $
-                                      onWorkspace (wsp 6) workLayouts $
-                                      onWorkspace (wsp 4) (tabbedLayout' ||| tabbedLayoutHoriz' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 5) (tabbedLayout''' ||| Dwindle R CW 1 (5 % 100)) $
-                                      onWorkspace (wsp 8) tabbedLayout''' $
-                                      onWorkspace (wsp 10) (tabbedLayout''' ||| combineTwoP (TwoPane (1 % 100) (3 % 4)) tabbedLayout''' tabbedLayout''' (ClassName "mpv") ||| Dwindle R CW 1 (5 % 100)) $
-                                      defaultLayouts
-                                    ) $
-                    defaultLayouts
-          -- tabbedLayout''' = renamed [Replace "Tabbed'"] $ IfMax 1 (noBorders Full) (tabbedLayout tabbedBottomAlways)
-          tabbedLayout''' = tabbedLayout tabbedBottom
-          tabbedLayout' = tabbedLayout tabbedBottomAlways
-          tabbedLayoutHoriz' = tabbedLayoutHoriz tabbedLeftAlways
-          defaultLayouts = {- spiralWithDir East CW (1 % 2) -} Dwindle R CW 1 (5 % 100) ||| tabbedLayout' ||| Full
-          -- workLayouts = {- spiralWithDir East CW (1 % 2) -} Dwindle R CW (2 % 1) (5 % 100) ||| tabbedLayout' ||| Full
-          workLayouts = tabbedLayout' ||| (renamed [Replace "Combined"] $ combineTwoP (TwoPane (1 % 100) (1891 % 2560)) tabbedLayout''' (Column 1.6) (ClassName "Postman" `Or` ClassName "Emacs" `Or` ClassName "jetbrains-idea-ce" `Or` (Resource "Devtools" `And` ClassName "Firefox"))) ||| Full ||| Dwindle R CW 1 (5 % 100)
-          sqrtTwo = approxRational (sqrt 2) (1 / 2560)
-          xmobarPP' = xmobarPP { ppTitle = shorten 80
-                               , ppSort = (liftM2 (.)) getSortByIndex $ return scratchpadFilterOutWorkspace
-                               , ppUrgent = wrap "(" ")" . xmobarColor "#800000" ""
-                               , ppHiddenNoWindows = xmobarColor "#202020" "" . wrap "(" ")"
-                               , ppVisible = wrap "(" ")" . xmobarColor "#808000" ""
-                               , ppCurrent = wrap "(" ")" . xmobarColor "#008000" ""
-                               , ppHidden = wrap "(" ")"
-                               , ppWsSep = " "
-                               , ppSep = "\n"
-                               }
-          withHostUrgency = case hostname of
-            "sif" -> withUrgencyHookC urgencyHook' $ def { suppressWhen = U.Never, remindWhen = Every 2 }
-            _ -> id
-          urgencyHook' window = do
-            let blinkLight = (lightHigh >> threadDelay 0.5e6) `finally` lightLow
-                  where
-                    lightHigh =
-                      writeFile "/sys/class/leds/input0::capslock/brightness" =<< readFile "/sys/class/leds/input0::capslock/max_brightness"
-                    lightLow = writeFile "/sys/class/leds/input0::capslock/brightness" "0"
-            runQuery ((resource =? "comm" <||> resource =? "Pidgin" <||> className =? "Gajim" <||> className =? "Skype" <||> className =? "Thunderbird") --> void (xfork blinkLight)) window
-            urgencyHook (BorderUrgencyHook { urgencyBorderColor = red }) window
-          shutdown :: SomeException -> IO a
-          shutdown e = do
-            let pids = [ -- batteryMon
-                       ]
-            mapM_ (signalProcess sigTERM) pids
-            mapM_ (getProcessStatus False False) pids
-            throw e
-          keyUpEventHook :: Event -> X All
-          keyUpEventHook event = handle event >> return (All True)
-            where
-              handle (KeyEvent { ev_event_type = t, ev_state = m, ev_keycode = code })
-                | t == keyRelease = withDisplay $ \dpy -> do
-                    s  <- io $ keycodeToKeysym dpy code 0
-                    mClean <- cleanMask m
-                    ks <- asks $ hKeyUpKeys host . config
-                    userCodeDef () $ whenJust (Map.lookup (mClean, s) ks) id
-                | otherwise = return ()
-              handle _ = return ()
-      handle shutdown $ launch myConfig =<< getDirectories
-secs :: Int -> Int
-secs = (* 1000000)
-- monitorBattery :: Maybe BatteryContext -> Maybe Notification -> IO ()
-- monitorBattery Nothing n = do
--   ctx <- batteryContextNew
--   case ctx of
--     Nothing -> threadDelay (secs 10) >> monitorBattery Nothing n
--     Just _  -> monitorBattery ctx n
-- monitorBattery ctx@(Just ctx') n = do
--   batInfo <- getBatteryInfo ctx'
--   case batInfo of
--     Nothing -> threadDelay (secs 1) >> monitorBattery ctx n
--     Just batInfo -> do
--       let n'
--             | batteryState batInfo == BatteryStateDischarging
--             , timeLeft <= 1200
--             , timeLeft > 0 = Just $ summary "Discharging" <> hint "value" percentage <> urgency u <> body (duz timeLeft ++ "left")
--             | otherwise = Nothing
--           u
--             | timeLeft <= 600 = Critical
--             | timeLeft <= 1800 = Normal
--             | otherwise = Low
--           timeLeft = batteryTimeToEmpty batInfo
--           percentage :: Int32
--           percentage = round $ batteryPercentage batInfo
--           ts = [("s", 60), ("m", 60), ("h", 24), ("d", 365), ("y", 1)]
--           duz ms = ss
--             where (ss, _) = foldl (\(ss, x) (s, y) -> ((if rem x y > 0 then show (rem x y) ++ s ++ " " else "") ++ ss , quot x y)) ("", ms) ts
--       case n' of
--         Just n' -> Notify.display (maybe mempty reuse n <> Notify.appName "monitorBattery" <> n') >>= (\n -> threadDelay (secs 2) >> monitorBattery ctx (Just n))
--         Nothing -> threadDelay (secs 30) >> monitorBattery ctx n
-disableTouchpad, disableTrackpoint, enableTrackpoint, enableTouchpad :: X ()
-enableTouchpad = safeSpawn "xinput" ["enable", "SynPS/2 Synaptics TouchPad"]
-disableTouchpad = safeSpawn "xinput" ["disable", "SynPS/2 Synaptics TouchPad"]
-enableTrackpoint = safeSpawn "xinput" ["enable", "TPPS/2 IBM TrackPoint"]
-disableTrackpoint = safeSpawn "xinput" ["disable", "TPPS/2 IBM TrackPoint"]
-isDisabled :: String -> X Bool
-isDisabled str = do
-  out <- runProcessWithInput "xinput" ["list", str] ""
-  return $ "disabled" `isInfixOf` out
-spawnKeychain :: X ()
-spawnKeychain = do
-  home <- liftIO getHomeDirectory
-  let keys = (map ((home </>) . (".ssh/" ++)) ["id", "id-rsa"]) ++ ["6B13AA67"]
-  liftIO (maybe (return ()) (setEnv "SSH_ASKPASS") =<< findAskpass)
-  safeSpawn "keychain" . (["--agents", "gpg,ssh"] ++)=<< liftIO (filterM doesFileExist keys)
-  where
-    findAskpass = filter `liftM` readFile "/etc/zshrc"
-    filter = listToMaybe . catMaybes . map (stripPrefix "export SSH_ASKPASS=") . lines
-assimilateKeychain :: X ()
-assimilateKeychain = liftIO $ assimilateKeychain' >> return ()
-assimilateKeychain' = tryIOError $ do
-  -- pid <- getProcessID
-  -- tmpDir <- lookupEnv "TMPDIR"
-  -- let tmpDir' = fromMaybe "/tmp" tmpDir
-  --     tmpFile = tmpDir' </> "xmonad-keychain" ++ (show pid) ++ ".env"
-  env <- runProcessWithInput "sh" ["-c", "eval $(keychain --eval --noask --agents gpg,ssh); env"] "" -- > " ++ tmpFile] ""
-  -- env <- readFile tmpFile
-  let envVars = Map.fromList $ map (\(k, v) -> (k, tail' v)) $ map (span (/= '=')) $ envLines
-      envVars' = Map.filterWithKey (\k _ -> k `elem` transfer) envVars
-      transfer = ["SSH_AUTH_SOCK", "SSH_AGENT_PID", "GPG_AGENT_INFO"]
-      envLines = filter (elem '=') $ lines env :: [String]
-  sequence $ map (\(k, c) -> setEnv k c) $ Map.toList envVars'
-  -- removeFile tmpFile
-  where
-    tail' [] = []
-    tail' (x:xs) = xs
-numKeys = [xK_parenleft, xK_parenright, xK_braceright, xK_plus, xK_braceleft, xK_bracketright, xK_bracketleft, xK_exclam, xK_equal, xK_asterisk]
-instance Shrinker CustomShrink where
-  shrinkIt _ "" = [""]
-  shrinkIt s cs
-    | length cs >= 4 = cs : shrinkIt s ((reverse . drop 4 . reverse $ cs) ++ "...")
-    | otherwise = cs : shrinkIt s (init cs)
-xPConfig, xPConfigMonospace :: XPConfig
-xPConfig = def
-  { font = "xft:Fira Sans:pixelsize=21"
-  , height = 32
-  , bgColor = "black"
-  , fgColor = gray
-  , fgHLight = green
-  , bgHLight = "black"
-  , borderColor = gray
-  , searchPredicate = (\needle haystack -> all (`isInfixOf` map toLower haystack) . map (map toLower) $ words needle)
-  , position = Top
-  }
-xPConfigMonospace = xPConfig { font = "xft:Fira Code:pixelsize=21" }
-sshOverrides host = map (\h -> mkOverride { oHost = h, oCommand = moshCmd . inTmux host} )
-               [ "odin"
-               , "ymir"
-               , "surtr"
-               , "vidhar"
-               , "srv02.uniworx.de"
-               ]
-               ++
-               map (\h -> mkOverride { oHost = h, oCommand = moshCmd' "/run/current-system/sw/bin/mosh-server" . withEnv [("TERM", "xterm")] . inTmux host} )
-               [ "bragi", "bragi.asgard.yggdrasil"
-               ]
-               ++
-               map (\h -> mkOverride { oHost = h, oCommand = sshCmd . inTmux host } )
-               [ "uni2work-dev1", "srv01.uniworx.de"
-               ]
-               ++
-               map (\h -> mkOverride { oHost = h, oCommand = sshCmd . withEnv [("TERM", "xterm")] . inTmux host } )
-               [ "remote.cip.ifi.lmu.de"
-               , "uniworx3", "uniworx4", "uniworx5", "uniworxdb2"
-               , "testworx"
-               ]
-backlight :: (Rational -> Rational) -> X ()
-backlight f = void . xfork . liftIO $ do
-  [   _device
-    , _class
-    , read . Text.unpack -> currentBright
-    , _currentPercentage
-    , read . Text.unpack -> maximumBright
-    ] <- Text.splitOn "," . Text.pack <$> readProcess "brightnessctl" ["-m"] ""
-  let current = currentBright % maximumBright
-      new' = f current * fromIntegral maximumBright
-      new :: Integer
-      new | floor new' < 0 = 0
-          | ceiling new' > maximumBright = maximumBright
-          | new' >= maximumBright % 2 = ceiling new'
-          | otherwise = floor new'
-  callProcess "brightnessctl" ["-m", "s", show new]
-cycleThrough :: [Rational] -> (Rational -> Rational)
-cycleThrough opts current = fromMaybe currentOpt $ listToMaybe next'
-  where currentOpt = minimumBy (comparing $ abs . subtract current) opts
-        (_, _ : next') = break (== currentOpt) opts
-cycleKbLayout :: [(String, Maybe String)] -> X ()
-cycleKbLayout [] = return ()
-cycleKbLayout layouts = liftIO $ do
-  next <- (getNext . extract) `liftM` runProcessWithInput "setxkbmap" ["-query"] ""
-  let
-    args = case next of
-      (l, Just v) -> [l, v]
-      (l, Nothing) -> [l]
-  safeSpawn "setxkbmap" args
-  where
-    extract :: String -> Maybe (String, Maybe String)
-    extract str = listToMaybe $ do
-      ["layout:", l] <- str'
-      [(l, Just v) | ["variant:", v] <- str'] ++ pure (l, Nothing)
-      where
-        str' = map words $ lines str
-    getNext :: Maybe (String, Maybe String) -> (String, Maybe String)
-    getNext = maybe (head layouts) getNext'
-    getNext' x = case elemIndex x layouts of
-      Nothing -> getNext Nothing
-      Just i -> layouts !! ((i + 1) `mod` length layouts)
-mpvAll' :: MpvCommand -> IO [MpvResponse]
-mpvAll' = mpvAll "/var/media/.mpv-ipc"
-mpvOne' :: MpvCommand -> IO (Maybe MpvResponse)
-mpvOne' = mpvOne "/var/media/.mpv-ipc"
-mediaMpv :: MpvCommand -> X ()
-mediaMpv cmd = void . xfork $ print =<< mpvAll' cmd
-mediaMpvTogglePause :: X ()
-mediaMpvTogglePause = void . xfork $ do
-  paused <- mapM mpvResponse <=< mpvAll' $ MpvGetProperty "pause"
-  if
-    | and paused -> print <=< mpvAll' $ MpvSetProperty "pause" False
-    | otherwise  -> print <=< mpvOne' $ MpvSetProperty "pause" True
-myKeys' conf host = Map.fromList $
-    -- launch a terminal
-    [ ((modm,               xK_Return), spawn $ (XMonad.terminal conf) ++ " -e tmux")
-    , ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf)
-    -- launch dmenu
-    --, ((modm,               xK_d     ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"")
-    , ((modm,               xK_d     ), shellPrompt "Run: " xPConfigMonospace)
-    , ((modm .|. shiftMask, xK_d     ), prompt "Run in Terminal: " ("alacritty" ++ " -e") xPConfigMonospace)
-    , ((modm,               xK_at    ), sshPrompt (sshOverrides . Just $ hName host) xPConfigMonospace)
-    -- close focused window
-    , ((modm .|. shiftMask, xK_q     ), kill)
-    , ((modm .|. controlMask .|. shiftMask, xK_q     ), spawn "xkill")
-     -- Rotate through the available layout algorithms
-    , ((modm,               xK_space ), sendMessage NextLayout)
-    --  Reset the layouts on the current workspace to default
-    , ((modm .|. controlMask, xK_r   ), (setLayout $ XMonad.layoutHook conf) >> refresh)
-    -- Resize viewed windows to the correct size
-    , ((modm,               xK_r     ), refresh)
-    -- Move focus to the next window
-    , ((modm,               xK_t     ), windows W.focusDown)
-    -- Move focus to the previous window
-    , ((modm,               xK_n     ), windows W.focusUp  )
-    -- Move focus to the master window
-    , ((modm,               xK_m     ), windows W.focusMaster  )
-    -- Swap the focused window and the master window
-    , ((modm .|. shiftMask, xK_m     ), windows W.swapMaster)
-    -- Swap the focused window with the next window
-    , ((modm .|. shiftMask, xK_t     ), windows W.swapDown  )
-    -- Swap the focused window with the previous window
-    , ((modm .|. shiftMask, xK_n     ), windows W.swapUp    )
-    -- Swap the focused window with the previous window
-    , ((modm .|. shiftMask .|. controlMask, xK_m), sendMessage SwapWindow)
-    , ((modm,                 xK_Right), sendMessage $ Go R)
-    , ((modm,                 xK_Left ), sendMessage $ Go L)
-    , ((modm,                 xK_Up   ), sendMessage $ Go U)
-    , ((modm,                 xK_Down ), sendMessage $ Go D)
-    , ((modm .|. shiftMask  , xK_Right), sendMessage $ Move R)
-    , ((modm .|. shiftMask  , xK_Left ), sendMessage $ Move L)
-    , ((modm .|. shiftMask  , xK_Up   ), sendMessage $ Move U)
-    , ((modm .|. shiftMask  , xK_Down ), sendMessage $ Move D)
-    -- , ((modm .|. controlMask, xK_Right), withFocused $ keysMoveWindow (10, 0))
-    -- , ((modm .|. controlMask, xK_Left ), withFocused $ keysMoveWindow (-10, 0))
-    -- , ((modm .|. controlMask, xK_Up   ), withFocused $ keysMoveWindow (0, -10))
-    -- , ((modm .|. controlMask, xK_Down ), withFocused $ keysMoveWindow (0, 10))
-     -- Shrink the master area
-    , ((modm,               xK_h     ), sendMessage Shrink)
-    -- Expand the master area
-    , ((modm,               xK_s     ), sendMessage Expand)
-    -- Push window back into tiling
-    , ((modm .|. shiftMask, xK_space ), withFocused $ windows . W.sink)
-    , ((modm, xK_BackSpace), focusUrgent)
-    , ((modm .|. shiftMask, xK_BackSpace), clearUrgents)
-    -- Increment the number of windows in the master area
-    , ((modm              , xK_comma ), sendMessage (IncMasterN 1))
-    -- Deincrement the number of windows in the master area
-    , ((modm              , xK_period), sendMessage (IncMasterN (-1)))
-    , ((0, xF86XK_AudioRaiseVolume), safeSpawn "pamixer" ["-i", "2"])
-    , ((0, xF86XK_AudioLowerVolume), safeSpawn "pamixer" ["-d", "2"])
-    , ((0, xF86XK_AudioMute), safeSpawn "pamixer" ["-t"])
-    , ((0, xF86XK_AudioPause), mediaMpv $ MpvSetProperty "pause" False)
-    , ((0, {-xF86XK_AudioMicMute-} 269025202), safeSpawn "pulseaudio-ctl" ["mute-input"])
-    , ((0, xF86XK_AudioPlay), mediaMpvTogglePause)
-    , ((0, xK_Print), do
-          home <- liftIO getHomeDirectory
-          unGrab
-          safeSpawn "scrot" ["-s", "-F", home </> "screenshots" </> "%Y-%m-%dT%H:%M:%S.png", "-e", "xclip -selection clipboard -t image/png -i $f"]
-      )
-    , ((modm .|. mod1Mask, xK_space), mediaMpvTogglePause)
-    -- , ((0, xF86XK_MonBrightnessDown), backlight . cycleThrough $ reverse brCycle)
-    -- , ((0, xF86XK_MonBrightnessUp  ), backlight $ cycleThrough brCycle)
-    , ((modm .|. shiftMask                , xK_b), backlight . cycleThrough $ reverse brCycle)
-    , ((modm .|. shiftMask .|. controlMask, xK_b), backlight $ cycleThrough brCycle)
-    , ((modm                , xK_Escape), cycleKbLayout (hKbLayouts host))
-    , ((modm .|. controlMask, xK_Escape), safeSpawn "setxkbmap" $ fst (head $ hKbLayouts host) : maybeToList (snd . head $ hKbLayouts host))
-    -- Toggle the status bar gap
-    -- Use this binding with avoidStruts from Hooks.ManageDocks.
-    -- See also the statusBar function from Hooks.DynamicLog.
-    --
-    , ((modm              , xK_b     ), sendMessage ToggleStruts)
-    , ((modm .|. shiftMask, xK_p     ), safeSpawn "playerctl" ["-a", "pause"])
-    -- Quit xmonad
-    , ((modm .|. shiftMask, xK_e     ), io (exitWith ExitSuccess))
-    -- Restart xmonad
-    -- , ((modm .|. shiftMask .|. controlMask, xK_r     ), void . xfork $ recompile False >>= flip when (safeSpawn "xmonad" ["--restart"]))
-    , ((modm .|. shiftMask, xK_r     ), void . liftIO $ executeFile "xmonad" True [] Nothing)
-    , ((modm .|. shiftMask, xK_l     ), void . xfork $ do
-          sessId <- getEnv "XDG_SESSION_ID"
-          safeSpawn "loginctl" ["lock-session", sessId]
-      )
-    , ((modm .|. shiftMask, xK_s     ), safeSpawn "systemctl" ["suspend"])
-    , ((modm .|. shiftMask, xK_h     ), inputPromptWithCompl xPConfigMonospace "systemctl" powerActCompl ?+ powerAct)
-    , ((modm, xK_v ), windows copyToAll) -- @@ Make focused window always visible
-    , ((modm .|. shiftMask, xK_v ),  killAllOtherCopies) -- @@ Toggle window state back
-    , ((modm .|. shiftMask, xK_g     ), windowPrompt xPConfig Goto wsWindows)
-    , ((modm              , xK_g     ), windowPrompt xPConfig Bring allWindows)
-    ]
-    ++
-    --
-    -- mod-[1..9], Switch to workspace N
-    --
-    -- mod-[1..9], Switch to workspace N
-    -- mod-shift-[1..9], Move client to workspace N
-    --
-    [((m .|. modm, k), windows $ f i)
-    | (i, k) <- zip (XMonad.workspaces conf) $ numKeys
-    , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]
-    ]
-    ++
-    [((m .|. modm .|. controlMask, k), void . runMaybeT $
-         MaybeT (P.getScreen def i) >>= MaybeT . screenWorkspace >>= lift . windows . f
-     )
-    | (i, k) <- zip (hScreens host) [xK_g, xK_c, xK_r, xK_l]
-    , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
-    ]
-  where
-    modm = XMonad.modMask conf
-    brCycle = [0, 1 % 500, 1 % 250, 1 % 100, 1 % 10, 1 % 4, 1 % 2, 3 % 4, 1]
-    powerActWords = ["poweroff", "reboot", "hibernate", "suspend"]
-    powerActCompl = mkComplFunFromList' xPConfigMonospace powerActWords
-    powerAct act | act `elem` powerActWords = safeSpawn "systemctl" $ pure act
-                 | otherwise = return ()
diff --git a/flake.lock b/flake.lock
index 27a157d5..876ebecf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -322,11 +322,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736014120,
+        "lastModified": 1737831749,
-        "narHash": "sha256-ZrI+mcuQfal5IfT4HsxVEiiFNAgV4qYh+B4/NyXxpAs=",
+        "narHash": "sha256-La1xZYZ1yHvT4h5MNl5WC2wxBi2P4vozce2n7V/9+2w=",
        "owner": "gkleen",
        "repo": "home-manager",
-        "rev": "99e8412a18eb7e0731aa2b77abeed00d6d1863ad",
+        "rev": "8b16ee252e38acc29ba634ab60672a051ebc9f59",
        "type": "github"
      },
      "original": {
@@ -359,11 +359,11 @@
    },
    "impermanence": {
      "locked": {
-        "lastModified": 1736688610,
+        "lastModified": 1737831083,
-        "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=",
+        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
        "owner": "nix-community",
        "repo": "impermanence",
-        "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7",
+        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
        "type": "github"
      },
      "original": {
@@ -397,11 +397,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1736855225,
+        "lastModified": 1737961005,
-        "narHash": "sha256-2+ayH/0B37BLPJy4thO1titHIrVCoDdCtdnl0CyV8kc=",
+        "narHash": "sha256-b4hqJNgyx8lnngz7NFcJ1W+59xQnMQYF0EK5g0IOy7c=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "b013bedcff63b5cdbb9cd9841ac339361fc5cfcc",
+        "rev": "e98ae62893568dd31e7a7e4e75e1dbbf23f759a0",
        "type": "github"
      },
      "original": {
@@ -431,11 +431,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1736861309,
+        "lastModified": 1737795105,
-        "narHash": "sha256-RSCoXyngYF+7apD5pRq6lZfRbl8vHIUVI57bbihA5Ew=",
+        "narHash": "sha256-OsrjQ8O9t9NjDCwfG/EY8MT+K3lb+A5U6SZZ+4PyKzk=",
        "owner": "gkleen",
        "repo": "niri",
-        "rev": "80a7ee2971b2d43622f68dcdc3233ae8365338f6",
+        "rev": "78697d1cea20e6b53013e820999b0403c45d9f00",
        "type": "github"
      },
      "original": {
@@ -472,11 +472,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736652904,
+        "lastModified": 1737861961,
-        "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
+        "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
+        "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523",
        "type": "github"
      },
      "original": {
@@ -508,11 +508,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1736441705,
+        "lastModified": 1737751639,
-        "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
+        "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
+        "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
        "type": "github"
      },
      "original": {
@@ -630,11 +630,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1736684107,
+        "lastModified": 1737885640,
-        "narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=",
+        "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "635e887b48521e912a516625eee7df6cf0eba9c1",
+        "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
        "type": "github"
      },
      "original": {
@@ -678,11 +678,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1736798957,
+        "lastModified": 1737885589,
-        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
+        "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
+        "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
        "type": "github"
      },
      "original": {
@@ -748,11 +748,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1736774291,
+        "lastModified": 1736884309,
-        "narHash": "sha256-1rEUm7R93L8rltgyBzon2/lzIN2udC/Kd8nyvuDN6ps=",
+        "narHash": "sha256-eiCqmKl0BIRiYk5/ZhZozwn4/7Km9CWTbc15Cv+VX5k=",
        "owner": "nix-community",
        "repo": "poetry2nix",
-        "rev": "499221030113adc5dea05886a1d7aa1cc3a315d1",
+        "rev": "75d0515332b7ca269f6d7abfd2c44c47a7cbca7b",
        "type": "github"
      },
      "original": {
@@ -891,11 +891,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736808430,
+        "lastModified": 1737411508,
-        "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=",
+        "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8",
+        "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4",
        "type": "github"
      },
      "original": {
@@ -966,16 +966,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1734278650,
+        "lastModified": 1737014022,
-        "narHash": "sha256-z9FiyHDbKC2nwfd/qsHCxLBEogzQj73zo85lW3zIlzY=",
+        "narHash": "sha256-5cG3lbjvrqvotI3oEPham3jGq8Fd96NfrqCGvC1e6Qw=",
        "owner": "gkleen",
        "repo": "Waybar",
-        "rev": "5432f9c1697a8d2d3e1264a5ce820d7eac26e2c6",
+        "rev": "83765e0f8e99a7d344eae511a4090a76a27e5791",
        "type": "github"
      },
      "original": {
        "owner": "gkleen",
-        "ref": "feat/privacy-ignore",
+        "ref": "feat/niri-workspaces-hide",
        "repo": "Waybar",
        "type": "github"
      }
@@ -1000,11 +1000,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1736487362,
+        "lastModified": 1737837494,
-        "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=",
+        "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1",
+        "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f",
        "type": "github"
      },
      "original": {
diff --git a/flake.nix b/flake.nix
index 47c03f23..5cc1e298 100644
--- a/flake.nix
+++ b/flake.nix
@@ -172,7 +172,7 @@
      type = "github";
      owner = "gkleen";
      repo = "Waybar";
-      ref = "feat/privacy-ignore";
+      ref = "feat/niri-workspaces-hide";
      inputs = {
        nixpkgs.follows = "nixpkgs";
        flake-compat.follows = "flake-compat";
@@ -335,7 +335,7 @@
        nixosConfigurations = installerNixosConfigurations // nixImport rec { dir = ./hosts; _import = mkNixosConfiguration [] dir; };
        homeModules = nixImport rec { dir = ./home-modules; };
-        homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: configuration: nameValuePair "${username}@${hostname}" { inherit (configuration.home) activationPackage; inherit (configuration) home-files; }) nixosConfig.config.home-manager.users) self.nixosConfigurations));
+        homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: nameValuePair "${username}@${hostname}") nixosConfig.config.home-manager.users) self.nixosConfigurations));
        overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths;
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 6dc6f3a9..32651e14 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -12,7 +12,7 @@ let
 in {
  imports = with flake.nixosModules.systemProfiles; [
    ./hw.nix
-    ./mail ./libvirt
+    ./mail ./libvirt ./greetd
    tmpfs-root bcachefs initrd-all-crypto-modules default-locale openssh rebuild-machines niri-unstable networkmanager
    flakeInputs.nixos-hardware.nixosModules.lenovo-thinkpad-p1
    flakeInputs.impermanence.nixosModules.impermanence
@@ -63,15 +63,20 @@ in {
      plymouth.enable = true;
      kernelPackages = pkgs.linuxPackages_latest;
-      extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
-      kernelModules = ["v4l2loopback"];
      kernelPatches = [
        { name = "edac-config";
          patch = null;
-          extraConfig = ''
+          extraStructuredConfig = with lib.kernel; {
-            EDAC y
+            EDAC = yes;
-            EDAC_IE31200 y
+            EDAC_IE31200 = yes;
-          '';
+          };
+        }
+        { name = "zswap-default";
+          patch = null;
+          extraStructuredConfig = with lib.kernel; {
+            ZSWAP_DEFAULT_ON = yes;
+            ZSWAP_SHRINKER_DEFAULT_ON = yes;
+          };
        }
      ];
@@ -440,7 +445,7 @@ in {
      };
      xserver = {
-        enable = true;
+        enable = false;
        xkb = {
          layout = "us";
@@ -466,46 +471,15 @@ in {
      };
      libinput.enable = true;
-      greetd = {
+      envfs.enable = false;
-        enable = true;
-      #   settings.default_session.command = let
-      #     cfg = config.programs.regreet;
-      #   in pkgs.writeShellScript "greeter" ''
-      #       modprobe -r nvidia_drm
-      #       exec ${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${lib.getExe cfg.package}
-      #     '';
-      };
    };
-    programs.regreet = {
-      enable = true;
-      theme = {
-        package = pkgs.equilux-theme;
-        name = "Equilux-compact";
-      };
-      iconTheme = {
-        package = pkgs.paper-icon-theme;
-        name = "Paper-Mono-Dark";
-      };
-      font = {
-        package = pkgs.fira;
-        name = "Fira Sans";
-        # size = 6;
-      };
-      cageArgs = [ "-s" "-m" "last" ];
-      settings = {
-        GTK.application_prefer_dark_theme = true;
-      };
-    };
-    programs.niri.enable = true;
    systemd.tmpfiles.settings = {
      "10-localtime"."/etc/localtime".L.argument = "/.bcachefs/etc/localtime";
      "10-regreet"."/var/cache/regreet/cache.toml".C.argument = toString ((pkgs.formats.toml {}).generate "cache.toml" {
        last_user = "gkleen";
-        user_to_last_sess.gkleen = "Niri";
+        user_to_last_sess.gkleen = "niri";
      });
    };
@@ -615,15 +589,15 @@ in {
      };
      nvidia = {
-        open = true;
+        open = false;
        modesetting.enable = true;
        powerManagement.enable = true;
-        prime = {
+        # prime = {
-          nvidiaBusId = "PCI:1:0:0";
+        #   nvidiaBusId = "PCI:1:0:0";
-          intelBusId = "PCI:0:2:0";
+        #   intelBusId = "PCI:0:2:0";
-          reverseSync.enable = true;
+        #   reverseSync.enable = true;
-          offload.enableOffloadCmd = true;
+        #   offload.enableOffloadCmd = true;
-        };
+        # };
      };
      graphics = {
@@ -697,6 +671,7 @@ in {
    services.dbus.packages = with pkgs;
      [ dbus dconf
+        xdg-desktop-portal-gtk
      ];
    services.udisks2.enable = true;
@@ -705,12 +680,8 @@ in {
      light.enable = true;
      wireshark.enable = true;
      dconf.enable = true;
-    };
+      niri.enable = true;
+      fuse.userAllowOther = true;
-    zramSwap = {
-      enable = true;
-      algorithm = "zstd";
-      writebackDevice = "/dev/disk/by-label/swap";
    };
    services.pcscd.enable = true;
@@ -730,6 +701,16 @@ in {
    environment.sessionVariables."GTK_USE_PORTAL" = "1";
    xdg.portal = {
      enable = true;
+      extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
+      config.niri = {
+        default = ["gnome" "gtk"];
+        "org.freedesktop.impl.portal.FileChooser" = ["gtk"];
+        "org.freedesktop.impl.portal.OpenFile" = ["gtk"];
+        "org.freedesktop.impl.portal.Access" = ["gtk"];
+        "org.freedesktop.impl.portal.Notification" = ["gtk"];
+        "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+        "org.freedesktop.impl.portal.Inhibit" = ["none"];
+      };
    };
    environment.persistence."/.bcachefs" = {
@@ -737,11 +718,11 @@ in {
      directories = [
        "/nix"
        "/root"
+        "/home"
        "/var/log"
        "/var/lib/sops-nix"
        "/var/lib/nixos"
        "/var/lib/systemd"
-        "/home"
        "/var/lib/chrony"
        "/var/lib/fprint"
        "/var/lib/bluetooth"
@@ -770,6 +751,10 @@ in {
    home-manager.sharedModules = [ flakeInputs.nixVirt.homeModules.default ];
+    environment.pathsToLink = [
+      "share/zsh"
+    ];
    system.stateVersion = "24.11";
  };
 }
diff --git a/hosts/sif/greetd/default.nix b/hosts/sif/greetd/default.nix
new file mode 100644
index 00000000..f609fc05
--- /dev/null
+++ b/hosts/sif/greetd/default.nix
@@ -0,0 +1,44 @@
+{ pkgs, ... }:
+{
+  config = {
+    services.greetd = {
+      enable = true;
+    #   settings.default_session.command = let
+    #     cfg = config.programs.regreet;
+    #   in pkgs.writeShellScript "greeter" ''
+    #       modprobe -r nvidia_drm
+    #       exec ${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} ${lib.escapeShellArgs cfg.cageArgs} -- ${lib.getExe cfg.package}
+    #     '';
+    };
+    programs.regreet = {
+      enable = true;
+      theme = {
+        package = pkgs.equilux-theme;
+        name = "Equilux-compact";
+      };
+      iconTheme = {
+        package = pkgs.paper-icon-theme;
+        name = "Paper-Mono-Dark";
+      };
+      font = {
+        package = pkgs.fira;
+        name = "Fira Sans";
+        # size = 6;
+      };
+      cageArgs = [ "-s" "-m" "last" ];
+      settings = {
+        GTK.application_prefer_dark_theme = true;
+        widget.clock.format = "%F %H:%M:%S%:z";
+        background = {
+          path = pkgs.runCommand "wallpaper.png" {
+            buildInputs = with pkgs; [ imagemagick ];
+          } ''
+            magick ${./wallpaper.png} -filter Gaussian -resize 6.25% -define filter:sigma=2.5 -resize 1600% "$out"
+          '';
+          fit = "Cover";
+        };
+      };
+    };
+  };
+}
diff --git a/hosts/sif/greetd/wallpaper.png b/hosts/sif/greetd/wallpaper.png
new file mode 100644
index 00000000..20fc761a
--- /dev/null
+++ b/hosts/sif/greetd/wallpaper.png
Binary files differ
diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index d1fb2934..1bcf0261 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -19,6 +19,9 @@
    "/var/lib/sops-nix".neededForBoot = true;
    "/var/lib/systemd".neededForBoot = true;
  };
+  swapDevices = [
+    { label = "swap"; }
+  ];
  # system.etc.overlay.enable = false;
  boot.initrd.systemd.packages = [
diff --git a/hosts/sif/libvirt/default.nix b/hosts/sif/libvirt/default.nix
index d0be7dff..9712d0d9 100644
--- a/hosts/sif/libvirt/default.nix
+++ b/hosts/sif/libvirt/default.nix
@@ -8,6 +8,7 @@ with flakeInputs.nixVirt.lib;
      qemu.swtpm.enable = true;
      allowedBridges = ["virbr0" "rz-0971" "rz-2403"];
    };
+    virtualisation.spiceUSBRedirection.enable = true;
    virtualisation.libvirt = {
      enable = true;
      swtpm.enable = true;
diff --git a/hosts/sif/mail/default.nix b/hosts/sif/mail/default.nix
index f36cd599..8d6cd705 100644
--- a/hosts/sif/mail/default.nix
+++ b/hosts/sif/mail/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
  services.postfix = {
    enable = true;
diff --git a/modules/nix-access-tokens/default.nix b/modules/nix-access-tokens/default.nix
new file mode 100644
index 00000000..a3b7abfa
--- /dev/null
+++ b/modules/nix-access-tokens/default.nix
@@ -0,0 +1,24 @@
+{ lib, config, hostName ,... }:
+let
+  cfg = config.nix.includeAccessTokens;
+in {
+  options = {
+    nix.includeAccessTokens.enable = lib.mkEnableOption "including access tokens in nix.conf" // { default = lib.elem hostName ["sif" "surtr" "vidhar"]; };
+  };
+  config = lib.mkIf cfg.enable {
+    nix = {
+      extraOptions = ''
+        !include ${config.sops.secrets.nixAccessTokens.path}
+      '';
+    };
+    sops.secrets.nixAccessTokens = {
+      format = "binary";
+      sopsFile = ./nix.conf;
+      mode = "0440";
+      group = "wheel";
+    };
+  };
+}
diff --git a/modules/nix-access-tokens/nix.conf b/modules/nix-access-tokens/nix.conf
new file mode 100644
index 00000000..f0b394ef
--- /dev/null
+++ b/modules/nix-access-tokens/nix.conf
@@ -0,0 +1,32 @@
+{
+        "data": "ENC[AES256_GCM,data:/cdBpvCAFpgm0YWhy1WYlA09KlU6PzVfBYVLBD0boqGqvP+8wuyDzj5KWbcKsdGhoiklODiKR0ODXNU+fA35y862PFXvSb4xVyfbdKRndYdIA4W6vyobtoC9h7B1yR9pkq9L+1tqlU30Dgy2Gndg9rWHlIo+1lO/1A==,iv:B1Px2+cxCaopHZThkEG5saOib+PNvurPIS6aeAv2uPo=,tag:K3JqRaX3/iIqD3c//YdqSQ==,type:str]",
+        "sops": {
+                "kms": null,
+                "gcp_kms": null,
+                "azure_kv": null,
+                "hc_vault": null,
+                "age": [
+                        {
+                                "recipient": "age1rmmhetcmllq0ahl5qznlr0eya2zdxwl9h6y5wnl97d2wtyx5t99sm2u866",
+                                "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5NkZUUGI3M2pQYWVXeFV6\na2h2czRTeUJFekJCS012YlBkL1FDdTd3ekZ3ClJsTVh0R2JQM0Jua1JjL285RVA1\nRHhlbjlLdmNBUXVLelFGY2NGYWpLejQKLS0tIDBUWUhJNm8zWGoyQ0pBYnV1ZjBh\ndktNRkNPS1lpWXFITC81aEZJbXlONk0Km2c1xVKwSankaVs7O/utGJwRRX395upz\ndPbsOElTnbGmkb0esGtvGSPboTvK+gjn9w/GhaPyTnNDoos7GaIfyg==\n-----END AGE ENCRYPTED FILE-----\n"
+                        },
+                        {
+                                "recipient": "age1fj65apkhfkrwyv5tx6zcs9nkjg8267fy733qph30sc7zfn7vapjqkd5kne",
+                                "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6bS9iY2lua3U4U3lJa1pK\nSlZNMmFZMEU5M1V2bWRjaXIwajZJVDJPMlM4Cmd3TTNFWjVuSGdtbC9iODltTS91\nOE5XOEVEQkh0SFpVVW5jc3IzbzNpTmMKLS0tIEtrSU54QUVPa2tBZDhLYlRFWitR\nc2x6MFlxL0tobDJTek42dEcyZXpoWDgKXzQfU+o6FkbJBwmm6oaHu4sDPi822uUR\n5VY6gY/h3g2kM4cuS03Q4NJmeRxuh7cx0UqGU3j5Mf8muE1LHpYEPw==\n-----END AGE ENCRYPTED FILE-----\n"
+                        },
+                        {
+                                "recipient": "age19a7j77w267z04zls7m28a8hj4a0g5af6ltye2d5wypg33c3l89csd4r9zq",
+                                "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaOVpNZ2lVT0VwbHVZNzFl\nenJsMGpnbkRvU0xOSU5obk5yT2p5ZVNzdXhNCnVlQzZtRjZNVmJLSUpKc3UwVXZs\nWi9EZ3kxZkJNeFJDSjl1L1IweTFNMXcKLS0tIDJUOTBwTldCUmlnU0tWVkZkNzJL\nejM4ajJVbVhvSm1YM2Vxa2JldllYN0UKAzxy2wkzRvCSiTy417AulpCu41z668HG\nto92eGF2ZRFfEG5LGlCKWeDcP3gM8QwKiVlm6wndbOkhMMfc4Sp3wA==\n-----END AGE ENCRYPTED FILE-----\n"
+                        },
+                        {
+                                "recipient": "age1qffdqvy9arld9zd5a5cylt0n98xhcns5shxhrhwjq5g4qa844ejselaa4l",
+                                "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2ejRHcGttNUxYZnFzTU5J\nMTFvY3daQ1VMM2xxYTgvLzZwT1owazVNenhzCktaWFF6K2s5UjI2b20rSHFNSS9E\nMVlJSmZhQm15eUs3U0hGTGpSRndmSDgKLS0tIDVrcjl4eDhwak1pRithbnRWWEZy\nVE9EOEpKdEJoRTFrTXpQVDc1cmsrU1kK/goTdUmpZPeMRbY1QzLXAa6Qpg4YYYYo\n3v3GK1bzdey8szfgIr1dHTtQEzqE2WX1swzZizDXj/RiUWx01Ky3GA==\n-----END AGE ENCRYPTED FILE-----\n"
+                        }
+                ],
+                "lastmodified": "2025-01-25T19:58:58Z",
+                "mac": "ENC[AES256_GCM,data:Oza4XgnTX3vly89nGluLbEytk1dUYAiOhIYewQyDLLLSSlUIpXmWhV+X0HUQ9AX5kUrEhNbVzRdvUG/9YwoWjTJfvd7tw41IYeTqgykMNXJUfGssoutXfeij9YR+t5aJaRhlTkIWcBhUjXSUNyJCl6Z3XmzWstTPZXEU9VmAvuE=,iv:LqVwIiit+WqI5NWSboexWsmPzg7e63nWJYsNFEK1Uog=,tag:ClR6oI62WXEfIYYAY6vL0A==,type:str]",
+                "pgp": null,
+                "unencrypted_suffix": "_unencrypted",
+                "version": "3.9.3"
+        }
+}
+\ No newline at end of file
diff --git a/nvfetcher.toml b/nvfetcher.toml
index c0566373..ecaebba0 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -78,12 +78,12 @@ git.fetchSubmodules = true
 src.git = "https://github.com/jgreco/mpv-youtube-quality"
 fetch.git = "https://github.com/jgreco/mpv-youtube-quality"
-[batman-adv]
+# [batman-adv]
-src.webpage = "https://www.open-mesh.org/projects/open-mesh/wiki/Download"
+# src.webpage = "https://www.open-mesh.org/projects/open-mesh/wiki/Download"
-src.regex = "The latest version of <a[^\\>]*>batman-adv</a> is <a[^\\>]*>batman-adv-([0-9\\.]+).tar.gz</a>"
+# src.regex = "The latest version of <a[^\\>]*>batman-adv</a> is <a[^\\>]*>batman-adv-([0-9\\.]+).tar.gz</a>"
-src.from_pattern = "^.*batman-adv-([0-9\\.]+).tar.gz.*$"
+# src.from_pattern = "^.*batman-adv-([0-9\\.]+).tar.gz.*$"
-src.to_pattern = "\\1"
+# src.to_pattern = "\\1"
-fetch.tarball = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-$ver.tar.gz"
+# fetch.tarball = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-$ver.tar.gz"
 [scutiger]
 src.github_tag = "bk2204/scutiger"
@@ -107,3 +107,11 @@ fetch.tarball = "https://github.com/JonathonReinhart/spice-record/archive/refs/t
 [yt-dlp]
 src.pypi = "yt_dlp"
 fetch.pypi = "yt_dlp"
+[mako]
+src.git = "https://github.com/emersion/mako"
+fetch.git = "https://github.com/emersion/mako"
+[swayosd]
+src.git = "https://github.com/ErikReider/SwayOSD"
+fetch.git = "https://github.com/ErikReider/SwayOSD"
diff --git a/overlays/batman-adv.nix b/overlays/batman-adv.nix
deleted file mode 100644
index cce7dc4f..00000000
--- a/overlays/batman-adv.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ final, prev, sources, ... }: {
-  linuxPackages_latest = prev.linuxPackages_latest.extend (self: super: {
-    batman_adv = super.batman_adv.overrideAttrs (oldAttrs: {
-      version = "${sources.batman-adv.version}-${self.kernel.version}";
-      inherit (sources.batman-adv) src;
-    });
-  });
-  linuxPackages_6_2 = prev.linuxPackages_6_2.extend (self: super: {
-    batman_adv = super.batman_adv.overrideAttrs (oldAttrs: {
-      version = "${sources.batman-adv.version}-${self.kernel.version}";
-      inherit (sources.batman-adv) src;
-    });
-  });
-}
diff --git a/overlays/keepassxc/database-open-dialog.patch b/overlays/keepassxc/database-open-dialog.patch
new file mode 100644
index 00000000..4916dc1b
--- /dev/null
+++ b/overlays/keepassxc/database-open-dialog.patch
@@ -0,0 +1,126 @@
+diff -u3 -r source.orig/src/browser/BrowserService.cpp source/src/browser/BrowserService.cpp
+--- source.orig/src/browser/BrowserService.cpp  2025-01-27 20:55:04.128198171 +0100
+++ source/src/browser/BrowserService.cpp       2025-01-27 21:16:07.068959077 +0100
+@@ -249,7 +249,7 @@
+         return result;
+     }
+ 
+-    auto dialogResult = MessageBox::warning(m_currentDatabaseWidget,
+    auto dialogResult = MessageBox::warning(nullptr,
+                                             tr("KeePassXC - Create a new group"),
+                                             tr("A request for creating a new group \"%1\" has been received.\n"
+                                                "Do you want to create this group?\n")
+@@ -422,7 +422,7 @@
+ 
+     m_dialogActive = true;
+     updateWindowState();
+-    BrowserAccessControlDialog accessControlDialog(m_currentDatabaseWidget);
+    BrowserAccessControlDialog accessControlDialog{};
+ 
+     connect(m_currentDatabaseWidget, SIGNAL(databaseLockRequested()), &accessControlDialog, SLOT(reject()));
+ 
+@@ -512,7 +512,7 @@
+     QString id;
+ 
+     do {
+-        QInputDialog keyDialog(m_currentDatabaseWidget);
+        QInputDialog keyDialog{};
+         connect(m_currentDatabaseWidget, SIGNAL(databaseLockRequested()), &keyDialog, SLOT(reject()));
+         keyDialog.setWindowTitle(tr("KeePassXC - New key association request"));
+         keyDialog.setLabelText(tr("You have received an association request for the following database:\n%1\n\n"
+@@ -535,7 +535,7 @@
+ 
+         contains = db->metadata()->customData()->contains(CustomData::BrowserKeyPrefix + id);
+         if (contains) {
+-            dialogResult = MessageBox::warning(m_currentDatabaseWidget,
+            dialogResult = MessageBox::warning(nullptr,
+                                                tr("KeePassXC - Overwrite existing key?"),
+                                                tr("A shared encryption key with the name \"%1\" "
+                                                   "already exists.\nDo you want to overwrite it?")
+@@ -595,7 +595,7 @@
+     const auto existingEntries = getPasskeyEntriesWithUserHandle(rpId, userId, keyList);
+ 
+     raiseWindow();
+-    BrowserPasskeysConfirmationDialog confirmDialog(m_currentDatabaseWidget);
+    BrowserPasskeysConfirmationDialog confirmDialog{};
+     confirmDialog.registerCredential(username, rpId, existingEntries, timeout);
+ 
+     auto dialogResult = confirmDialog.exec();
+@@ -612,7 +612,7 @@
+             // If no entry is selected, show the import dialog for manual entry selection
+             auto selectedEntry = confirmDialog.getSelectedEntry();
+             if (!selectedEntry) {
+-                PasskeyImporter passkeyImporter(m_currentDatabaseWidget);
+               PasskeyImporter passkeyImporter{};
+                 const auto result = passkeyImporter.showImportDialog(db,
+                                                                      nullptr,
+                                                                      origin,
+@@ -683,7 +683,7 @@
+     const auto timeout = publicKeyOptions["timeout"].toInt();
+ 
+     raiseWindow();
+-    BrowserPasskeysConfirmationDialog confirmDialog(m_currentDatabaseWidget);
+    BrowserPasskeysConfirmationDialog confirmDialog{};
+     confirmDialog.authenticateCredential(entries, rpId, timeout);
+     auto dialogResult = confirmDialog.exec();
+     if (dialogResult == QDialog::Accepted) {
+@@ -760,7 +760,7 @@
+ 
+     // Ask confirmation if entry already contains a Passkey
+     if (entry->hasPasskey()) {
+-        if (MessageBox::question(m_currentDatabaseWidget,
+        if (MessageBox::question(nullptr,
+                                  tr("KeePassXC - Update passkey"),
+                                  tr("Entry already has a passkey.\nDo you want to overwrite the passkey in %1 - %2?")
+                                      .arg(entry->title(), passkeyUtils()->getUsernameFromEntry(entry)),
+@@ -873,7 +873,7 @@
+         MessageBox::Button dialogResult = MessageBox::No;
+         if (!browserSettings()->alwaysAllowUpdate()) {
+             raiseWindow();
+-            dialogResult = MessageBox::question(m_currentDatabaseWidget,
+            dialogResult = MessageBox::question(nullptr,
+                                                 tr("KeePassXC - Update Entry"),
+                                                 tr("Do you want to update the information in %1 - %2?")
+                                                     .arg(QUrl(entryParameters.siteUrl).host(), username),
+@@ -909,7 +909,7 @@
+         return false;
+     }
+ 
+-    auto dialogResult = MessageBox::warning(m_currentDatabaseWidget,
+    auto dialogResult = MessageBox::warning(nullptr,
+                                             tr("KeePassXC - Delete entry"),
+                                             tr("A request for deleting entry \"%1\" has been received.\n"
+                                                "Do you want to delete the entry?\n")
+@@ -1536,7 +1536,7 @@
+         }
+     }
+ 
+-    BrowserEntrySaveDialog browserEntrySaveDialog(m_currentDatabaseWidget);
+    BrowserEntrySaveDialog browserEntrySaveDialog{};
+     int openDatabaseCount = browserEntrySaveDialog.setItems(databaseWidgets, m_currentDatabaseWidget);
+     if (openDatabaseCount > 1) {
+         int res = browserEntrySaveDialog.exec();
+diff -u3 -r source.orig/src/fdosecrets/objects/Prompt.cpp source/src/fdosecrets/objects/Prompt.cpp
+--- source.orig/src/fdosecrets/objects/Prompt.cpp       2025-01-27 20:55:04.135942791 +0100
+++ source/src/fdosecrets/objects/Prompt.cpp    2025-01-27 21:01:37.166710935 +0100
+@@ -313,7 +313,7 @@
+         if (!entries.isEmpty()) {
+             QString app = tr("%1 (PID: %2)").arg(client->name()).arg(client->pid());
+             auto ac = new AccessControlDialog(
+-                findWindow(m_windowId), entries, app, client->processInfo(), AuthOption::Remember);
+                nullptr, entries, app, client->processInfo(), AuthOption::Remember);
+             connect(ac, &AccessControlDialog::finished, this, &UnlockPrompt::itemUnlockFinished);
+             connect(ac, &AccessControlDialog::finished, ac, &AccessControlDialog::deleteLater);
+             ac->open();
+diff -u3 -r source.orig/src/gui/DatabaseTabWidget.cpp source/src/gui/DatabaseTabWidget.cpp
+--- source.orig/src/gui/DatabaseTabWidget.cpp   2025-01-27 20:55:04.134589500 +0100
+++ source/src/gui/DatabaseTabWidget.cpp        2025-01-27 21:07:09.785284837 +0100
+@@ -41,7 +41,7 @@
+     : QTabWidget(parent)
+     , m_dbWidgetStateSync(new DatabaseWidgetStateSync(this))
+     , m_dbWidgetPendingLock(nullptr)
+-    , m_databaseOpenDialog(new DatabaseOpenDialog(this))
+    , m_databaseOpenDialog(new DatabaseOpenDialog())
+     , m_databaseOpenInProgress(false)
+ {
+     auto* tabBar = new QTabBar(this);
diff --git a/overlays/keepassxc/default.nix b/overlays/keepassxc/default.nix
new file mode 100644
index 00000000..25429a66
--- /dev/null
+++ b/overlays/keepassxc/default.nix
@@ -0,0 +1,8 @@
+{ final, prev, ... }:
+{
+  keepassxc = prev.keepassxc.overrideAttrs (oldAttrs: {
+    patches = (oldAttrs.patches or []) ++ [
+      ./database-open-dialog.patch
+    ];
+  });
+}
diff --git a/overlays/mako.nix b/overlays/mako.nix
new file mode 100644
index 00000000..1c1464fb
--- /dev/null
+++ b/overlays/mako.nix
@@ -0,0 +1,5 @@
+{ final, prev, sources, ... }: {
+  mako = prev.mako.overrideAttrs (oldAttrs: {
+    inherit (sources.mako) version src;
+  });
+}
diff --git a/overlays/swayosd.nix b/overlays/swayosd.nix
new file mode 100644
index 00000000..61c865e7
--- /dev/null
+++ b/overlays/swayosd.nix
@@ -0,0 +1,27 @@
+{ final, prev, sources, ... }: {
+  swayosd = prev.swayosd.overrideAttrs (oldAttrs: rec {
+    inherit (sources.swayosd) version src;
+    cargoDeps = prev.rustPlatform.fetchCargoTarball {
+      inherit (oldAttrs) pname;
+      inherit version src;
+      hash = "sha256-Anrk8p76HKZcNavYdi9l1oYahduLrb7Lf7knQK7Hy5E=";
+    };
+    nativeBuildInputs = with final; [
+      wrapGAppsHook4
+      pkg-config
+      meson
+      rustc
+      cargo
+      ninja
+      rustPlatform.cargoSetupHook
+    ];
+    buildInputs = with final; [
+      gtk4-layer-shell
+      libevdev
+      libinput
+      libpulseaudio
+      udev
+      sassc
+    ];
+  });
+}
diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py
index 362c8da4..ba6c5ff6 100755
--- a/overlays/worktime/worktime/__main__.py
+++ b/overlays/worktime/worktime/__main__.py
@@ -23,7 +23,7 @@ import argparse
 from copy import deepcopy
 import sys
-from sys import stderr
+from sys import stderr, stdout
 from tabulate import tabulate
@@ -38,6 +38,7 @@ from collections import defaultdict
 import jsonpickle
 from hashlib import blake2s
+import json
 class TogglAPISection(Enum):
    TOGGL = '/api/v9'
@@ -223,6 +224,7 @@ class Worktime(object):
    leave_budget = dict()
    time_per_day = None
    workdays = None
+    pull_forward = dict()
    @staticmethod
    @cache
@@ -390,8 +392,6 @@ class Worktime(object):
              if e.errno != 2:
                  raise e
-      pull_forward = dict()
      start_day = self.start_date.date()
      end_day = self.end_date.date()
@@ -418,15 +418,15 @@ class Worktime(object):
                                  if not d == datetime.strptime(c, date_format).replace(tzinfo=tzlocal()).date(): break
                          else:
                              if d >= self.end_date.date():
-                                  pull_forward[d] = min(timedelta(hours = float(hours)), self.time_per_day(d) - (holidays[d] if d in holidays else timedelta()))
+                                  self.pull_forward[d] = min(timedelta(hours = float(hours)), self.time_per_day(d) - (holidays[d] if d in holidays else timedelta()))
      except IOError as e:
          if e.errno != 2:
              raise e
      self.days_to_work = dict()
-      if pull_forward:
+      if self.pull_forward:
-          end_day = max(end_day, max(list(pull_forward)))
+          end_day = max(end_day, max(list(self.pull_forward)))
      for day in [start_day + timedelta(days = x) for x in range(0, (end_day - start_day).days + 1)]:
          if day.isoweekday() in self.workdays:
@@ -470,17 +470,17 @@ class Worktime(object):
          self.extra_days_to_work[self.now.date()] = timedelta()
      self.time_to_work = sum([self.days_to_work[day] for day in self.days_to_work.keys() if day <= self.end_date.date()], timedelta())
-      for day in [d for d in list(pull_forward) if d > self.end_date.date()]:
+      for day in [d for d in list(self.pull_forward) if d > self.end_date.date()]:
-          days_forward = set([d for d in self.days_to_work.keys() if d >= self.end_date.date() and d < day and (not d in pull_forward or d == self.end_date.date())])
+          days_forward = set([d for d in self.days_to_work.keys() if d >= self.end_date.date() and d < day and (not d in self.pull_forward or d == self.end_date.date())])
-          extra_days_forward = set([d for d in self.extra_days_to_work.keys() if d >= self.end_date.date() and d < day and (not d in pull_forward or d == self.end_date.date())])
+          extra_days_forward = set([d for d in self.extra_days_to_work.keys() if d >= self.end_date.date() and d < day and (not d in self.pull_forward or d == self.end_date.date())])
          days_forward = days_forward.union(extra_days_forward)
          extra_day_time_left = timedelta()
          for extra_day in extra_days_forward:
              day_time = max(timedelta(), self.time_per_day(extra_day) - self.extra_days_to_work[extra_day])
              extra_day_time_left += day_time
-          extra_day_time = min(extra_day_time_left, pull_forward[day])
+          extra_day_time = min(extra_day_time_left, self.pull_forward[day])
-          time_forward = pull_forward[day] - extra_day_time
+          time_forward = self.pull_forward[day] - extra_day_time
          if extra_day_time_left > timedelta():
            for extra_day in extra_days_forward:
                day_time = max(timedelta(), self.time_per_day(extra_day) - self.extra_days_to_work[extra_day])
@@ -518,7 +518,14 @@ def format_days(worktime, days, date_format=None):
    return ', '.join(map(lambda group: ','.join(map(format_group, group)), groups))
-def worktime(**args):
+def tooltip_timedelta(td):
+    if td < timedelta(seconds = 0):
+        return "-" + tooltip_timedelta(-td)
+    mm, ss = divmod(td.total_seconds(), 60)
+    hh, mm = divmod(mm, 60)
+    return "%d:%02d:%02d" % (hh, mm, ss)
+def worktime(pull_forward_cutoff, waybar, **args):
    worktime = Worktime(**args)
    def format_worktime(worktime):
@@ -562,7 +569,12 @@ def worktime(**args):
              else:
                  return f"({difference_string})"
-    if worktime.time_pulled_forward >= timedelta(minutes = 15):
+    out_class = "running" if worktime.running_entry else "stopped"
+    difference = worktime.time_to_work - worktime.time_worked
+    if worktime.running_entry and -min(timedelta(milliseconds=0), difference) > sum(worktime.pull_forward.values(), start=timedelta(milliseconds=0)) or not worktime.running_entry and max(timedelta(milliseconds=0), difference) > worktime.time_per_day(worktime.now.date()) and worktime.now_is_workday:
+        out_class = "over"
+    tooltip = tooltip_timedelta(difference)
+    if worktime.time_pulled_forward >= min(pull_forward_cutoff, timedelta(seconds = 1)):
        worktime_no_pulled_forward = deepcopy(worktime)
        worktime_no_pulled_forward.time_to_work -= worktime_no_pulled_forward.time_pulled_forward
        worktime_no_pulled_forward.time_pulled_forward = timedelta()
@@ -570,11 +582,24 @@ def worktime(**args):
        difference_string = format_worktime(worktime)
        difference_string_no_pulled_forward = format_worktime(worktime_no_pulled_forward)
-        print(f"{difference_string_no_pulled_forward}…{difference_string}")
+        tooltip = tooltip_timedelta(worktime_no_pulled_forward.time_to_work - worktime_no_pulled_forward.time_worked) + "…" + tooltip
+        if worktime.time_pulled_forward >= pull_forward_cutoff:
+            out_text = f"{difference_string_no_pulled_forward}…{difference_string}"
+        else:
+            out_text = format_worktime(worktime)
+    else:
+        out_text = format_worktime(worktime)
+    if waybar:
+        json.dump({"text": out_text, "class": out_class, "tooltip": tooltip}, stdout)
    else:
-        print(format_worktime(worktime))
+        print(out_text)
+def pull_forward(**args):
+    worktime = Worktime(**args)
+    print(tooltip_timedelta(sum(worktime.pull_forward.values(), start=timedelta(milliseconds=0))))
-def time_worked(now, **args):
+def time_worked(now, waybar, **args):
    then = now.replace(hour = 0, minute = 0, second = 0, microsecond = 0)
    if now.time() == time():
        now = now + timedelta(days = 1)
@@ -584,6 +609,9 @@ def time_worked(now, **args):
    worked = now.time_worked - then.time_worked
+    out_text = None
+    out_class = "stopped"
+    tooltip = tooltip_timedelta(worked)
    if args['do_round']:
      total_minutes_difference = 5 * ceil(worked / timedelta(minutes = 5))
      (hours_difference, minutes_difference) = divmod(abs(total_minutes_difference), 60)
@@ -602,15 +630,25 @@ def time_worked(now, **args):
          difference = target_time - worked
          clockout_difference = 5 * ceil(difference / timedelta(minutes = 5))
          clockout_time = now.now + difference
+          exact_clockout_time = clockout_time
          clockout_time += (5 - clockout_time.minute % 5) * timedelta(minutes = 1)
          clockout_time = clockout_time.replace(second = 0, microsecond = 0)
      if now.running_entry and clockout_time and clockout_difference >= 0:
-          print(f"{difference_string}/{clockout_time:%H:%M}")
+          out_class = "running"
+          out_text = f"{difference_string}/{clockout_time:%H:%M}"
+          tooltip = f"{tooltip_timedelta(worked)}/{exact_clockout_time:%H:%M}"
      else:
-          print(difference_string)
+          if now.running_entry:
+              out_class = "over"
+          out_text = difference_string
+    else:
+      out_text = str(worked)
+    if waybar:
+        json.dump({"text": out_text, "class": out_class, "tooltip": tooltip}, stdout)
    else:
-      print(worked)
+        print(out_text)
 def diff(now, **args):
    now = now.replace(hour = 0, minute = 0, second = 0, microsecond = 0)
@@ -798,6 +836,38 @@ def classification(classification_name, table, table_format, **args):
 def main():
    def isotime(s):
        return datetime.fromisoformat(s).replace(tzinfo=tzlocal())
+    def duration_minutes(s):
+        return timedelta(minutes = float(s))
+    def set_default_subparser(self, name, args=None, positional_args=0):
+        """default subparser selection. Call after setup, just before parse_args()
+        name: is the name of the subparser to call by default
+        args: if set is the argument list handed to parse_args()
+        , tested with 2.7, 3.2, 3.3, 3.4
+        it works with 2.6 assuming argparse is installed
+        """
+        subparser_found = False
+        for arg in sys.argv[1:]:
+            if arg in ['-h', '--help']:  # global help if no subparser
+                break
+        else:
+            for x in self._subparsers._actions:
+                if not isinstance(x, argparse._SubParsersAction):
+                    continue
+                for sp_name in x._name_parser_map.keys():
+                    if sp_name in sys.argv[1:]:
+                        subparser_found = True
+            if not subparser_found:
+                # insert default in last position before global positional
+                # arguments, this implies no global options are specified after
+                # first positional argument
+                if args is None:
+                    sys.argv.insert(len(sys.argv) - positional_args, name)
+                else:
+                    args.insert(len(args) - positional_args, name)
+    argparse.ArgumentParser.set_default_subparser = set_default_subparser
    config = Worktime.config()
@@ -807,9 +877,13 @@ def main():
    parser.add_argument('--no-running', dest = 'include_running', action = 'store_false')
    parser.add_argument('--no-force-day-to-work', dest = 'force_day_to_work', action = 'store_false')
    subparsers = parser.add_subparsers(help = 'Subcommands')
-    parser.set_defaults(cmd = worktime)
+    worktime_parser = subparsers.add_parser('time_worked', aliases = ['time', 'worked'])
-    time_worked_parser = subparsers.add_parser('time_worked', aliases = ['time', 'worked', 'today'])
+    worktime_parser.add_argument('--pull-forward-cutoff', dest = 'pull_forward_cutoff', metavar = 'MINUTES', type = duration_minutes, default = timedelta(minutes = 15))
+    worktime_parser.add_argument('--waybar', action='store_true')
+    worktime_parser.set_defaults(cmd = worktime)
+    time_worked_parser = subparsers.add_parser('today')
    time_worked_parser.add_argument('--no-round', dest = 'do_round', action = 'store_false')
+    time_worked_parser.add_argument('--waybar', action='store_true')
    time_worked_parser.set_defaults(cmd = time_worked)
    diff_parser = subparsers.add_parser('diff')
    diff_parser.set_defaults(cmd = diff)
@@ -827,6 +901,9 @@ def main():
        classification_parser.add_argument('--table', action = 'store_true')
        classification_parser.add_argument('--table-format', dest='table_format', type=str, default='fancy_grid')
        classification_parser.set_defaults(cmd = partial(classification, classification_name=classification_name))
+    pull_forward_parser = subparsers.add_parser('pull-forward')
+    pull_forward_parser.set_defaults(cmd = pull_forward)
+    parser.set_default_subparser('time_worked')
    args = parser.parse_args()
    args.cmd(**vars(args))