4 files changed, 796 insertions, 97 deletions

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";
-  volumectl = lib.getExe' config.services.avizo.package "volumectl";
-  dunstctl = lib.getExe' config.services.dunst.package "dunstctl";
+  makoctl = lib.getExe' config.services.mako.package "makoctl";
   loginctl = lib.getExe' hostConfig.systemd.package "loginctl";
   systemctl = lib.getExe' hostConfig.systemd.package "systemctl";
+  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
 
-  focus-or-spawn = pkgs.writeShellApplication {
+  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")"
-      niri msg action move-workspace-to-monitor --output "$(jq -r '.[] | select(.is_focused) | .output' <<<"$workspaces_json")" "$workspace_name"
-      socat STDIO "$NIRI_SOCKET" <<<'{"Action":{"FocusWorkspace":{"reference":{"Id":'"''${active_workspace}"'}}}}'
-      niri msg action move-workspace-to-index --index 1 "$workspace_name"
+      # active_workspace="$(jq -r --arg workspace_output "$workspace_output" '.[] | select(.output == $workspace_output and .is_active) | .id' <<<"$workspaces_json")"
+      active_output="$(jq -r '.[] | select(.is_focused) | .output' <<<"$workspaces_json")"
+      if [[ $workspace_output != "$active_output" ]]; then
+        niri msg action move-workspace-to-monitor --reference "$workspace_name" "$active_output"
+        # socat STDIO "$NIRI_SOCKET" <<<'{"Action":{"FocusWorkspace":{"reference":{"Id":'"''${active_workspace}"'}}}}'
+        # niri msg action move-workspace-to-index --reference "$workspace_name" 1
+      fi
 
       while IFS=$'\n' read -r window_json; do
-        if jq -r '.app_id' <<<"$window_json" | grep -q "$app_id"; then
-          niri msg action focus-window --id "$(jq -r '.id' <<<"$window_json")"
+        if [[ -n $(jq -c "$window_select" <<<"$window_json") ]]; then
+          if jq -e '.is_focused' <<<"$window_json" >/dev/null; then
+            niri msg action focus-workspace-previous
+          else
+            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 = {
-          layout = "us,us";
-          variant = "dvp,";
-          options = "compose:caps,grp:win_space_toggle";
+        keyboard = {
+          repeat-delay = 300;
+          repeat-rate = 50;
+
+          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";
-        "002".name = "kpxc";
-        "003".name = "bmgr";
+        "001" = { name = "pwctl"; open-on-output = "eDP-1"; };
+        "002" = { name = "kpxc"; open-on-output = "eDP-1"; };
+        "003" = { name = "bmgr"; open-on-output = "eDP-1"; };
+        "004" = { name = "term"; open-on-output = "eDP-1"; };
+        "005" = { name = "edit"; open-on-output = "eDP-1"; };
+        "006" = { name = "eff"; open-on-output = "eDP-1"; };
         "101".name = "comm";
         "102".name = "web";
-        "104".name = "read";
-        "105".name = "mon";
+        # "104".name = "read";
+        # "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 = "^Access Request"; }
-            { title = "^Passkey credentials"; }
+            { title = "^Unlock Database.*"; }
+            { title = "^Access Request.*"; }
+            { 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 = [
-            { app-id = "^evince$"; }
-            { app-id = "^imv$"; }
-            { app-id = "^org\.pwmt\.zathura$"; }
-          ];
-          open-on-workspace = "read";
+          matches = [ { app-id = "^mpv$"; } ];
+          open-on-workspace = "vid";
+          default-column-width.proportion = 1.;
+          variable-refresh-rate = true;
         }
         {
-          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 = "^virt-manager$"; }
+            { app-id = "^Gimp-"; title = "^Quit GIMP$"; }
+            { 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+Shift+D".action = spawn (lib.getExe config.programs.fuzzel.package) "--list-executables-in-path";
+        "Mod+O".action = spawn (lib.getExe config.programs.fuzzel.package);
+        "Mod+Shift+O".action = spawn (lib.getExe config.programs.fuzzel.package) "--list-executables-in-path";
+
+        "Mod+Alt+E".action = spawn (lib.getExe' config.services.emacs.package "emacsclient") "-c";
+        "Mod+Alt+Y".action = spawn (lib.getExe (pkgs.writeShellApplication {
+          name = "queue-yt-dlp";
+          runtimeInputs = with pkgs; [ wl-clipboard-rs socat ];
+          text = ''
+            socat STDIO UNIX-CONNECT:"$XDG_RUNTIME_DIR"/yt-dlp.sock <<<$'{ "urls": ["'"$(wl-paste)"$'"] }'
+          '';
+        }));
+        "Mod+Alt+L".action = spawn (lib.getExe (pkgs.writeShellApplication {
+          name = "queue-yt-dlp";
+          runtimeInputs = with pkgs; [ wl-clipboard-rs config.programs.kitty.package ];
+          text = ''
+            exec -- kitty --app-id kitty-play --directory "$HOME"/media mpv "$(wl-paste)"
+          '';
+        }));
+
+        "Mod+U".action = spawn (lib.getExe (pkgs.writeShellApplication {
+          name = "qalc-fuzzel";
+          runtimeInputs = with pkgs; [ wl-clipboard-rs libqalculate config.programs.fuzzel.package coreutils findutils libnotify gnugrep ];
+          text = ''
+            RESULTS_DIR="$HOME/.cache/qalc-fuzzel"
+            prev() {
+              FOUND=false
+              while IFS= read -r line; do
+                [[ -n "$line" ]] || continue
+                FOUND=true
+                echo "$line"
+              done < <(export LC_ALL=C.UTF-8; echo; find "$RESULTS_DIR" -type f -printf $'%T@ %p\n' | sort -n | cut -d' ' -f2- | xargs -r cat)
+              $FOUND || echo
+            }
+            FUZZEL_RES=$(prev | fuzzel --dmenu --prompt "qalc> ") || exit $?
+            if [[ "$FUZZEL_RES" =~ .*\ =\ .* ]]; then
+              QALC_RES="$FUZZEL_RES"
+              QALC_RET=0
+            else
+              QALC_RES=$(qalc "$FUZZEL_RES" 2>&1)
+              QALC_RET=$?
+            fi
+            [[ -n "$QALC_RES" ]] || exit 1
+            EXISTING=false
+            set +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+C".action = focus-workspace-up;
+        "Mod+G".action = focus-adjacent-workspace "down";
+        "Mod+C".action = focus-adjacent-workspace "up";
 
-        "Mod+Shift+G".action = move-column-to-workspace-down;
-        "Mod+Shift+C".action = move-column-to-workspace-up;
+        "Mod+Shift+G".action = move-column-to-adjacent-workspace "down";
+        "Mod+Shift+C".action = move-column-to-adjacent-workspace "up";
 
         "Mod+Shift+Control+G".action = move-workspace-down;
         "Mod+Shift+Control+C".action = move-workspace-up;
 
+        "Mod+ParenLeft".action = focus-workspace "comm";
+        "Mod+Shift+ParenLeft".action = move-column-to-workspace "comm";
+
+        "Mod+ParenRight".action = focus-workspace "web";
+        "Mod+Shift+ParenRight".action = move-column-to-workspace "web";
+
+        "Mod+BraceRight".action = focus-workspace "read";
+        "Mod+Shift+BraceRight".action = move-column-to-workspace "read";
+
+        "Mod+BraceLeft".action = focus-workspace "mon";
+        "Mod+Shift+BraceLeft".action = move-column-to-workspace "mon";
+
+        "Mod+Asterisk".action = focus-workspace "vid";
+        "Mod+Shift+Asterisk".action = move-column-to-workspace "vid";
+
+        "Mod+Plus".action = with-unnamed-workspace-action ''{"Action":{"FocusWorkspace":{"reference":{"Id": .id}}}}'';
+        "Mod+Shift+Plus".action = with-unnamed-workspace-action ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}}}}'';
+
         "Mod+M".action = consume-or-expel-window-left;
         "Mod+W".action = consume-or-expel-window-right;
 
@@ -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+Shift+B".action = toggle-window-floating;
+        "Mod+V".action = switch-focus-between-floating-and-tiling;
+        "Mod+Shift+V".action = toggle-window-floating;
 
         "Mod+Left".action = set-column-width "-10%";
         "Mod+Down".action = set-window-height "-10%";
@@ -245,44 +686,57 @@ in {
           action = spawn (lib.getExe niri) "msg" "action" "power-off-monitors";
           allow-when-locked = true;
         };
-        "Mod+Shift+L" = {
-          action = spawn loginctl "lock-session";
-        };
+        "Mod+Shift+L".action = spawn loginctl "lock-session";
         "Mod+Shift+E".action = quit;
+        "Mod+Shift+Minus" = {
+          action = spawn systemctl "suspend";
+          allow-when-locked = true;
+        };
+        "Mod+Shift+Control+Minus" = {
+          action = spawn systemctl "hibernate";
+          allow-when-locked = true;
+        };
+        "Mod+Shift+P" = {
+          action = spawn (lib.getExe pkgs.playerctl) "-a" "pause";
+          allow-when-locked = true;
+        };
 
         "XF86MonBrightnessUp" = {
-          action = spawn 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+Shift+Semicolon".action = spawn dunstctl "close-all";
-        "Mod+Period".action = spawn dunstctl "context";
-        "Mod+Comma".action = spawn dunstctl "history-pop";
-
-        "Mod+Alt+A".action = focus-or-spawn-action "^com\.saivert\.pwvucontrol$" "pwctl" "pwvucontrol";
-        "Mod+Alt+P".action = focus-or-spawn-action "^org\.keepassxc\.KeePassXC$" "kpxc" "keepassxc";
-        "Mod+Alt+B".action = focus-or-spawn-action "^\.blueman-manager-wrapped$" "bmgr" "blueman-manager";
+        "Mod+Semicolon".action = spawn makoctl "dismiss" "--group";
+        "Mod+Shift+Semicolon".action = spawn makoctl "dismiss" "--all";
+        "Mod+Period".action = spawn makoctl "menu" (lib.getExe config.programs.fuzzel.package) "--dmenu";
+        "Mod+Comma".action = spawn makoctl "restore";
+
+        "Mod+Control+A".action = focus-or-spawn-action-app_id "com.saivert.pwvucontrol" "pwctl" "pwvucontrol";
+        "Mod+Control+O".action = focus-or-spawn-action-app_id "com.github.wwmm.easyeffects" "eff" "easyeffects";
+        "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"
-            "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
+            "custom/keymap"
+            "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "custom/mako" "clock" ];
 
+          "custom/mako" = {
+            format = "{}";
+            return-type = "json";
+            exec = pkgs.writers.writePython3 "mako-silent" { libraries = [ pkgs.python3Packages.dbus-next ]; } ''
+              from dbus_next.aio import MessageBus
+
+              import asyncio
+
+              import json
+
+
+              loop = asyncio.new_event_loop()
+              asyncio.set_event_loop(loop)
+
+
+              async def main():
+                  bus = await MessageBus().connect()
+                  # the introspection xml would normally be included in your project, but
+                  # this is convenient for development
+                  introspection = await bus.introspect('org.freedesktop.Notifications', '/fr/emersion/Mako')  # noqa: E501
+
+                  obj = bus.get_proxy_object('org.freedesktop.Notifications', '/fr/emersion/Mako', introspection)  # noqa: E501
+                  mako = obj.get_interface('fr.emersion.Mako')
+                  properties = obj.get_interface('org.freedesktop.DBus.Properties')
+
+                  async def print_mode():
+                      modes = await mako.get_modes()
+                      is_silent = "silent" in modes
+                      icon = "&#xf009b;" if is_silent else "&#xf009a;"
+                      text = f"<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>"  # noqa: E501
+                      if is_silent:
+                          text = f"<span color=\"#ffffff\">{text}</span>"
+                      print(json.dumps({'text': text, '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
-              for keyboard in json.loads(r.stdout)['keyboards']:
-                  if keyboard['name'] != "at-translated-set-2-keyboard":
-                      continue
-                  output(keyboard['active_keymap'])
+              keyboard_layouts = []
 
               sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-              sock.connect(os.environ["XDG_RUNTIME_DIR"] + "/hypr/" + os.environ["HYPRLAND_INSTANCE_SIGNATURE"] + "/.socket2.sock")  # noqa: E501
-              expected = re.compile(r'^activelayout>>at-translated-set-2-keyboard,(?P<keymap>.+)$')  # noqa: E501
+              sock.connect(os.environ["NIRI_SOCKET"])
+              sock.send(b"\"EventStream\"\n")
               for line in sock.makefile(buffering=1, encoding='utf-8'):
-                  if match := expected.match(line):
-                      output(match.group("keymap"))
+                  if line_json := json.loads(line):
+                      if "KeyboardLayoutsChanged" in line_json:
+                          keyboard_layouts = line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["names"]  # noqa: E501
+                          output(keyboard_layouts[line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["current_idx"]])  # noqa: E501
+                      if "KeyboardLayoutSwitched" in line_json:
+                          output(keyboard_layouts[line_json["KeyboardLayoutSwitched"]["idx"]])  # noqa: E501
             '';
-            on-click = "hyprctl switchxkblayout at-translated-set-2-keyboard next";
+            on-click = "niri msg action switch-layout next";
           };
           "custom/worktime" = {
             interval = 60;
-            exec = lib.getExe pkgs.worktime;
-            tooltip = false;
+            exec = "${lib.getExe pkgs.worktime} time --waybar";
+            return-type = "json";
           };
           "custom/worktime-today" = {
             interval = 60;
-            exec = "${lib.getExe pkgs.worktime} today";
-            tooltip = false;
+            exec = "${lib.getExe pkgs.worktime} today --waybar";
+            return-type = "json";
+          };
+          "niri/workspaces" = {
+            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-down = "lightctl -d -e4 -n1 down";
+            on-scroll-up = "${swayosd-client} --brightness raise";
+            on-scroll-down = "${swayosd-client} --brightness lower";
           };
           wireplumber = {
             format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
@@ -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-down = "volumectl -d -u down";
-            on-click = "volumectl -d toggle-mute";
+            on-scroll-up = "${swayosd-client} --output-volume raise";
+            on-scroll-down = "${swayosd-client} --output-volume lower";
+            on-click = "${swayosd-client} --output-volume mute-toggle";
           };
         }
         {
@@ -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; */