4 files changed, 0 insertions, 1149 deletions
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
deleted file mode 100644
index 4a207589..00000000
--- a/accounts/gkleen@sif/niri/default.nix
+++ /dev/null
@@ -1,628 +0,0 @@
-{ config, hostConfig, pkgs, lib, ... }:
-let
-  niri = config.programs.niri.package;
-  terminal = lib.getExe config.programs.kitty.package;
-  makoctl = lib.getExe' config.services.mako.package "makoctl";
-  loginctl = lib.getExe' hostConfig.systemd.package "loginctl";
-  systemctl = lib.getExe' hostConfig.systemd.package "systemctl";
-  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
-  focus_or_spawn = pkgs.writeShellApplication {
-    name = "focus-or-spawn";
-    runtimeInputs = [ niri pkgs.gojq pkgs.gnugrep pkgs.socat ];
-    text = ''
-      window_select="$1"
-      shift
-      workspace_name="$1"
-      shift
-      workspaces_json="$(niri msg -j workspaces)"
-      workspace_output="$(jq -r --arg workspace_name "$workspace_name" '.[] | select(.name == $workspace_name) | .output' <<<"$workspaces_json")"
-      # active_workspace="$(jq -r --arg workspace_output "$workspace_output" '.[] | select(.output == $workspace_output and .is_active) | .id' <<<"$workspaces_json")"
-      active_output="$(jq -r '.[] | select(.is_focused) | .output' <<<"$workspaces_json")"
-      if [[ $workspace_output != "$active_output" ]]; then
-        niri msg action move-workspace-to-monitor --reference "$workspace_name" "$active_output"
-        # socat STDIO "$NIRI_SOCKET" <<<'{"Action":{"FocusWorkspace":{"reference":{"Id":'"''${active_workspace}"'}}}}'
-        # niri msg action move-workspace-to-index --reference "$workspace_name" 1
-      fi
-      while IFS=$'\n' read -r window_json; do
-        if [[ -n $(jq -c "$window_select" <<<"$window_json") ]]; then
-          niri msg action focus-window --id "$(jq -r '.id' <<<"$window_json")"
-          exit 0
-        fi
-      done < <(niri msg -j windows | jq -c '.[]')
-      exec "$@"
-    '';
-  };
-  focus-or-spawn-action = config.lib.niri.actions.spawn (lib.getExe focus_or_spawn);
-  focus-or-spawn-action-app_id = app_id: focus-or-spawn-action ''select(.app_id == "${app_id}")'';
-  with_adjacent_workspace = pkgs.writeShellApplication {
-    name = "with-adjacent-workspace";
-    runtimeInputs = [ niri pkgs.gojq pkgs.socat ];
-    text = ''
-      blacklist="$1"
-      shift
-      direction="$1"
-      shift
-      action="$1"
-      shift
-      workspaces_json="$(niri msg -j workspaces)"
-      active_workspace="$(jq -r '.[] | select(.is_focused) | .id' <<<"$workspaces_json")"
-      workspace_output="$(jq -r --arg active_workspace "$active_workspace" '.[] | select(.id == ($active_workspace | tonumber)) | .output' <<<"$workspaces_json")"
-      workspace_idx="$(jq -r '.[] | select(.is_focused) | .idx' <<<"$workspaces_json")"
-      jq_script='map(select('
-      case "$direction" in
-        down)
-          # shellcheck disable=SC2016
-          jq_script=''${jq_script}'.idx > ($workspace_idx | tonumber)';;
-        up)
-          # shellcheck disable=SC2016
-          jq_script=''${jq_script}'.idx < ($workspace_idx | tonumber)';;
-      esac
-      # shellcheck disable=SC2016
-      jq_script=''${jq_script}' and .output == $workspace_output and ((.name == null) or (.name | test($blacklist) | not)))) | sort_by(.idx)'
-      [[ $direction == "up" ]] && jq_script=''${jq_script}' | reverse'
-      jq_script=''${jq_script}' | .[0]'
-      workspace_json=$(jq -c --arg blacklist "$blacklist" --arg workspace_output "$workspace_output" --arg workspace_idx "$workspace_idx" "$jq_script" <<<"$workspaces_json")
-      [[ -n $workspace_json && $workspace_json != null  ]] || exit 0
-      jq --arg active_workspace "$active_workspace" -c "$action" <<<"$workspace_json" | tee /dev/stderr | socat STDIO "$NIRI_SOCKET"
-    '';
-  };
-  with-adjacent-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_adjacent_workspace) "^pwctl|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")"
-      workspace_json="$(jq -c --arg active_output "$active_output" 'map(select(.output == $active_output and .name == null)) | sort_by(.idx) | .[0]' <<<"$workspaces_json")"
-      [[ -n $workspace_json && $workspace_json != null ]] || exit 0
-      jq --arg active_workspace "$active_workspace" -c "$action" <<<"$workspace_json" | tee /dev/stderr | socat STDIO "$NIRI_SOCKET"
-    '';
-  };
-  with-unnamed-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_unnamed_workspace);
-  with_select_window = pkgs.writeShellApplication {
-    name = "with-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 = {
-    systemd.user.services.xwayland-satellite = {
-      Unit = {
-        BindsTo = [ "graphical-session.target" ];
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session.target" ];
-        Requisite = [ "graphical-session.target" ];
-      };
-      Service = {
-        Type = "notify";
-        NotifyAccess = "all";
-        Environment = [ "DISPLAY=:0" ];
-        ExecStart = ''${lib.getExe pkgs.xwayland-satellite-unstable} ''${DISPLAY}'';
-        ExecStartPre = "${systemctl} --user import-environment DISPLAY";
-        StandardOutput = "journal";
-      };
-      Install = {
-        WantedBy = [ "graphical-session.target" ];
-      };
-    };
-    services.swayidle = {
-      events = [
-        { event = "after-resume"; command = "${lib.getExe niri} msg action power-on-monitors"; }
-      ];
-      timeouts = [
-        { timeout = 300;
-          command = "${lib.getExe niri} msg action power-off-monitors";
-        }
-      ];
-    };
-    programs.niri.settings = {
-      prefer-no-csd = true;
-      screenshot-path = "${config.home.homeDirectory}/screenshots";
-      hotkey-overlay.skip-at-startup = true;
-      input = {
-        keyboard = {
-          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;
-        # focus-follows-mouse.enable = true;
-        warp-mouse-to-focus = true;
-      };
-      outputs = {
-        "eDP-1" = {
-          scale = 1.5;
-          position = { x = 0; y = 0; };
-        };
-        "Ancor Communications Inc ASUS PB287Q 0x0000DD9B" = {
-          scale = 1.5;
-          position = { x = 2560; y = 0; };
-        };
-        "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;
-      };
-      layout = {
-        gaps = 8;
-        struts = { left = 0; right = 0; top = 0; bottom = 0; };
-        focus-ring = {
-          width = 2;
-          active.gradient = {
-            from = "hsla(195 100% 60% 0.75)";
-            to = "hsla(155 100% 50% 0.75)";
-            angle = 29;
-            relative-to = "workspace-view";
-          };
-          inactive.gradient = {
-            from = "hsla(0 0% 42% 0.66)";
-            to = "hsla(0 0% 35% 0.66)";
-            angle = 29;
-            relative-to = "workspace-view";
-          };
-        };
-        preset-column-widths = [
-          { proportion = 1. / 4.; }
-          { proportion = 1. / 3.; }
-          { proportion = 1. / 2.; }
-          { proportion = 2. / 3.; }
-          { proportion = 3. / 4.; }
-        ];
-        default-column-width.proportion = 1. / 2.;
-        preset-window-heights = [
-          { proportion = 1. / 3.; }
-          { proportion = 1. / 2.; }
-          { proportion = 2. / 3.; }
-          { proportion = 1.; }
-        ];
-        always-center-single-column = true;
-      };
-      cursor.hide-when-typing = true;
-      input = {
-        touchpad.enable = false;
-        trackball = {
-          scroll-method = "on-button-down";
-          scroll-button = 278;
-        };
-      };
-      workspaces = {
-        "001" = { name = "pwctl"; open-on-output = "eDP-1"; };
-        "002" = { name = "kpxc"; open-on-output = "eDP-1"; };
-        "003" = { name = "bmgr"; open-on-output = "eDP-1"; };
-        "004" = { name = "term"; open-on-output = "eDP-1"; };
-        "005" = { name = "edit"; open-on-output = "eDP-1"; };
-        "006" = { name = "eff"; open-on-output = "eDP-1"; };
-        "101".name = "comm";
-        "102".name = "web";
-        # "104".name = "read";
-        # "105".name = "mon";
-        "110".name = "vid";
-        "120".name = "bmr";
-      };
-      window-rules = [
-        # {
-        #   geometry-corner-radius =
-        #     let
-        #       allCorners = r: { bottom-left = r; bottom-right = r; top-left = r; top-right = r; };
-        #     in allCorners 4.;
-        #   clip-to-geometry = true;
-        # }
-        {
-          matches = [ { app-id = "^com\.saivert\.pwvucontrol$"; } ];
-          open-on-workspace = "pwctl";
-          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$"; }
-          ];
-          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 = "^mpv$"; } ];
-          open-on-workspace = "vid";
-          default-column-width.proportion = 1.;
-          variable-refresh-rate = true;
-        }
-        {
-          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 = "^Gimp-"; title = "^Quit GIMP$"; }
-            { app-id = "^org\.kde\.polkit-kde-authentication-agent-1$"; }
-          ];
-          open-floating = true;
-        }
-      ];
-      layer-rules = [
-        { matches = [
-            { namespace = "^notifications$"; }
-            { namespace = "^waybar$"; }
-          ];
-          block-out-from = "screencast";
-        }
-      ];
-      binds = with config.lib.niri.actions; {
-        "Mod+Slash".action = show-hotkey-overlay;
-        "Mod+Return".action = spawn terminal;
-        "Mod+Q".action = close-window;
-        "Mod+O".action = spawn (lib.getExe config.programs.fuzzel.package);
-        "Mod+Shift+O".action = spawn (lib.getExe config.programs.fuzzel.package) "--list-executables-in-path";
-        "Mod+Alt+E".action = spawn (lib.getExe' config.services.emacs.package "emacsclient") "-c";
-        "Mod+Alt+Y".action = spawn (lib.getExe (pkgs.writeShellApplication {
-          name = "queue-yt-dlp";
-          runtimeInputs = with pkgs; [ wl-clipboard-rs socat ];
-          text = ''
-            socat STDIO UNIX-CONNECT:"$XDG_RUNTIME_DIR"/yt-dlp.sock <<<$'{ "urls": ["'"$(wl-paste)"$'"] }'
-          '';
-        }));
-        "Mod+Alt+L".action = spawn (lib.getExe (pkgs.writeShellApplication {
-          name = "queue-yt-dlp";
-          runtimeInputs = with pkgs; [ wl-clipboard-rs config.programs.kitty.package ];
-          text = ''
-            exec -- kitty --app-id kitty-play --directory "$HOME"/media mpv "$(wl-paste)"
-          '';
-        }));
-        "Mod+U".action = spawn (lib.getExe (pkgs.writeShellApplication {
-          name = "qalc-fuzzel";
-          runtimeInputs = with pkgs; [ wl-clipboard-rs libqalculate config.programs.fuzzel.package coreutils findutils libnotify gnugrep ];
-          text = ''
-            RESULTS_DIR="$HOME/.cache/qalc-fuzzel"
-            prev() {
-              FOUND=false
-              while IFS= read -r line; do
-                [[ -n "$line" ]] || continue
-                FOUND=true
-                echo "$line"
-              done < <(export LC_ALL=C.UTF-8; echo; find "$RESULTS_DIR" -type f -printf $'%T@ %p\n' | sort -n | cut -d' ' -f2- | xargs -r cat)
-              $FOUND || echo
-            }
-            FUZZEL_RES=$(prev | fuzzel --dmenu --prompt "qalc> ") || exit $?
-            if [[ "$FUZZEL_RES" =~ .*\ =\ .* ]]; then
-              QALC_RES="$FUZZEL_RES"
-              QALC_RET=0
-            else
-              QALC_RES=$(qalc "$FUZZEL_RES" 2>&1)
-              QALC_RET=$?
-            fi
-            [[ -n "$QALC_RES" ]] || exit 1
-            EXISTING=false
-            set +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;
-        "Mod+N".action = focus-window-up;
-        "Mod+S".action = focus-column-right;
-        "Mod+Shift+H".action = move-column-left;
-        "Mod+Shift+T".action = move-window-down;
-        "Mod+Shift+N".action = move-window-up;
-        "Mod+Shift+S".action = move-column-right;
-        "Mod+Control+H".action = focus-monitor-left;
-        "Mod+Control+T".action = focus-monitor-down;
-        "Mod+Control+N".action = focus-monitor-up;
-        "Mod+Control+S".action = focus-monitor-right;
-        "Mod+Shift+Control+H".action = move-workspace-to-monitor-left;
-        "Mod+Shift+Control+T".action = move-workspace-to-monitor-down;
-        "Mod+Shift+Control+N".action = move-workspace-to-monitor-up;
-        "Mod+Shift+Control+S".action = move-workspace-to-monitor-right;
-        "Mod+G".action = focus-adjacent-workspace "down";
-        "Mod+C".action = focus-adjacent-workspace "up";
-        "Mod+Shift+G".action = move-column-to-adjacent-workspace "down";
-        "Mod+Shift+C".action = move-column-to-adjacent-workspace "up";
-        "Mod+Shift+Control+G".action = move-workspace-down;
-        "Mod+Shift+Control+C".action = move-workspace-up;
-        "Mod+ParenLeft".action = focus-workspace "comm";
-        "Mod+Shift+ParenLeft".action = move-column-to-workspace "comm";
-        "Mod+ParenRight".action = focus-workspace "web";
-        "Mod+Shift+ParenRight".action = move-column-to-workspace "web";
-        "Mod+BraceRight".action = focus-workspace "read";
-        "Mod+Shift+BraceRight".action = move-column-to-workspace "read";
-        "Mod+BraceLeft".action = focus-workspace "mon";
-        "Mod+Shift+BraceLeft".action = move-column-to-workspace "mon";
-        "Mod+Asterisk".action = focus-workspace "vid";
-        "Mod+Shift+Asterisk".action = move-column-to-workspace "vid";
-        "Mod+Plus".action = with-unnamed-workspace-action ''{"Action":{"FocusWorkspace":{"reference":{"Id": .id}}}}'';
-        "Mod+Shift+Plus".action = with-unnamed-workspace-action ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}}}}'';
-        "Mod+M".action = consume-or-expel-window-left;
-        "Mod+W".action = consume-or-expel-window-right;
-        "Mod+R".action = switch-preset-column-width;
-        "Mod+Shift+R".action = switch-preset-window-height;
-        "Mod+F".action = center-column;
-        "Mod+Shift+F".action = maximize-column;
-        "Mod+Shift+Ctrl+F".action = fullscreen-window;
-        "Mod+V".action = switch-focus-between-floating-and-tiling;
-        "Mod+Shift+V".action = toggle-window-floating;
-        "Mod+Left".action = set-column-width "-10%";
-        "Mod+Down".action = set-window-height "-10%";
-        "Mod+Up".action = set-window-height "+10%";
-        "Mod+Right".action = set-column-width "+10%";
-        "Mod+Shift+Z" = {
-          action = spawn (lib.getExe niri) "msg" "action" "power-off-monitors";
-          allow-when-locked = true;
-        };
-        "Mod+Shift+L".action = spawn loginctl "lock-session";
-        "Mod+Shift+E".action = quit;
-        "Mod+Shift+Minus" = {
-          action = spawn systemctl "suspend";
-          allow-when-locked = true;
-        };
-        "Mod+Shift+Control+Minus" = {
-          action = spawn systemctl "hibernate";
-          allow-when-locked = true;
-        };
-        "Mod+Shift+P" = {
-          action = spawn (lib.getExe pkgs.playerctl) "-a" "pause";
-          allow-when-locked = true;
-        };
-        "XF86MonBrightnessUp" = {
-          action = spawn swayosd-client "--brightness" "raise";
-          allow-when-locked = true;
-        };
-        "XF86MonBrightnessDown" = {
-          action = spawn swayosd-client "--brightness" "lower";
-          allow-when-locked = true;
-        };
-        "XF86AudioRaiseVolume" = {
-          action = spawn swayosd-client "--output-volume" "raise";
-          allow-when-locked = true;
-        };
-        "XF86AudioLowerVolume" = {
-          action = spawn swayosd-client "--output-volume" "lower";
-          allow-when-locked = true;
-        };
-        "XF86AudioMute" = {
-          action = spawn swayosd-client "--output-volume" "mute-toggle";
-          allow-when-locked = true;
-        };
-        "XF86AudioMicMute" = {
-          action = spawn swayosd-client "--input-volume" "mute-toggle";
-          allow-when-locked = true;
-        };
-        "Mod+Semicolon".action = spawn makoctl "dismiss" "--group";
-        "Mod+Shift+Semicolon".action = spawn makoctl "dismiss" "--all";
-        "Mod+Period".action = spawn makoctl "menu" (lib.getExe config.programs.fuzzel.package) "--dmenu";
-        "Mod+Comma".action = spawn makoctl "restore";
-        "Mod+Control+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
deleted file mode 100644
index 0a10555a..00000000
--- a/accounts/gkleen@sif/niri/mako.nix
+++ /dev/null
@@ -1,115 +0,0 @@
-{ 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
deleted file mode 100644
index 984927c2..00000000
--- a/accounts/gkleen@sif/niri/swayosd.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ 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
deleted file mode 100644
index c3820508..00000000
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ /dev/null
@@ -1,341 +0,0 @@
-{ lib, config, pkgs, ... }:
-let
-  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
-in {
-  config = {
-    programs.waybar = {
-      enable = true;
-      systemd = {
-        enable = true;
-        target = "graphical-session.target";
-      };
-      settings = let
-        windowRewrites = {
-          "(.*) — Mozilla Firefox" = "$1";
-          "(.*) - Mozilla Thunderbird" = "$1";
-          "(.*) - mpv" = "$1";
-        };
-        iconSize = 11;
-      in [
-        {
-          layer = "top";
-          position = "top";
-          height = 14;
-          output = [ "eDP-1" "DP-2" "DP-3" ];
-          modules-left = [ "niri/workspaces" ];
-          modules-center = [ "niri/window" ];
-          modules-right = [ "custom/worktime" "custom/worktime-today"
-            "custom/weather"
-            "custom/keymap"
-            "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "custom/mako" "clock" ];
-          "custom/mako" = {
-            format = "{}";
-            return-type = "json";
-            exec = pkgs.writers.writePython3 "mako-silent" { libraries = [ pkgs.python3Packages.dbus-next ]; } ''
-              from dbus_next.aio import MessageBus
-              import asyncio
-              import json
-              loop = asyncio.new_event_loop()
-              asyncio.set_event_loop(loop)
-              async def main():
-                  bus = await MessageBus().connect()
-                  # the introspection xml would normally be included in your project, but
-                  # this is convenient for development
-                  introspection = await bus.introspect('org.freedesktop.Notifications', '/fr/emersion/Mako')  # noqa: E501
-                  obj = bus.get_proxy_object('org.freedesktop.Notifications', '/fr/emersion/Mako', introspection)  # noqa: E501
-                  mako = obj.get_interface('fr.emersion.Mako')
-                  properties = obj.get_interface('org.freedesktop.DBus.Properties')
-                  async def print_mode():
-                      modes = await mako.get_modes()
-                      is_silent = "silent" in modes
-                      icon = "&#xf009b;" if is_silent else "&#xf009a;"
-                      text = f"<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>"  # noqa: E501
-                      if is_silent:
-                          text = f"<span color=\"#ffffff\">{text}</span>"
-                      print(json.dumps({'text': text}, separators=(',', ':')), flush=True)  # noqa: E501
-                  async def on_properties_changed(interface_name, changed_properties, invalidated_properties):  # noqa: E501
-                      if "Modes" not in invalidated_properties:
-                          return
-                      await print_mode()
-                  properties.on_properties_changed(on_properties_changed)
-                  await print_mode()
-                  await loop.create_future()
-              loop.run_until_complete(main())
-            '';
-            on-click = "makoctl mode -t silent";
-          };
-          "custom/weather" = {
-            format = "{}";
-            tooltip = true;
-            interval = 3600;
-            exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"100%\\\">{ICON}</span> {FeelsLikeC}°\"";
-            return-type = "json";
-          };
-          "custom/keymap" = {
-            format = "{}";
-            tooltip = true;
-            return-type = "json";
-            exec = pkgs.writers.writePython3 "keymap" {} ''
-              import os
-              import socket
-              import json
-              def output(keymap):
-                  short = keymap
-                  if keymap == "English (programmer Dvorak)":
-                      short = "dvp"
-                  elif keymap == "English (US)":
-                      short = "<span color=\"#ffffff\">us</span>"
-                  print(json.dumps({'text': short, 'tooltip': keymap}, separators=(',', ':')), flush=True)  # noqa: E501
-              keyboard_layouts = []
-              sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-              sock.connect(os.environ["NIRI_SOCKET"])
-              sock.send(b"\"EventStream\"\n")
-              for line in sock.makefile(buffering=1, encoding='utf-8'):
-                  if line_json := json.loads(line):
-                      if "KeyboardLayoutsChanged" in line_json:
-                          keyboard_layouts = line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["names"]  # noqa: E501
-                          output(keyboard_layouts[line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["current_idx"]])  # noqa: E501
-                      if "KeyboardLayoutSwitched" in line_json:
-                          output(keyboard_layouts[line_json["KeyboardLayoutSwitched"]["idx"]])  # noqa: E501
-            '';
-            on-click = "niri msg action switch-layout next";
-          };
-          "custom/worktime" = {
-            interval = 60;
-            exec = lib.getExe pkgs.worktime;
-            tooltip = false;
-          };
-          "custom/worktime-today" = {
-            interval = 60;
-            exec = "${lib.getExe pkgs.worktime} today";
-            tooltip = false;
-          };
-          "niri/workspaces" = {
-            ignore = ["eff" "pwctl" "kpxc" "bmgr" "edit" "term"];
-          };
-          "niri/window" = {
-            separate-outputs = true;
-            icon = true;
-            icon-size = 14;
-            rewrite = windowRewrites;
-          };
-          clock = {
-              interval = 1;
-              # timezone = "Europe/Berlin";
-              format = "W{:%V-%u %F %H:%M:%S%Ez}";
-              tooltip-format = "<tt><small>{calendar}</small></tt>";
-              calendar = {
-                mode = "year";
-                mode-mon-col = 3;
-                weeks-pos = "left";
-                on-scroll = 1;
-                format = {
-                  months = "<span color='#ffead3'><b>{}</b></span>";
-                  days = "{}";
-                  weeks = "<span color='#99ffdd'><b>{}</b></span>";
-                  weekdays = "<span color='#ffcc66'><b>{}</b></span>";
-                  today = "<span color='#ff6699'><b>{}</b></span>";
-                };
-              };
-          };
-          battery = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize - 2;
-            states = { warning = 30; critical = 15; };
-            format-icons = ["&#xf008e;" "&#xf007a;" "&#xf007b;" "&#xf007c;" "&#xf007d;" "&#xf007e;" "&#xf007f;" "&#xf0080;" "&#xf0081;" "&#xf0082;" "&#xf0079;" ];
-            format-charging = "&#xf0084;";
-            format-plugged = "&#xf06a5;";
-            tooltip-format = "{capacity}% {timeTo}";
-            interval = 20;
-          };
-          tray = {
-            icon-size = 16;
-            # show-passive-items = true;
-            spacing = 1;
-          };
-          privacy = {
-            icon-spacing = 7;
-            icon-size = iconSize;
-            modules = [
-              { type = "screenshare"; }
-              { type = "audio-in"; }
-            ];
-          };
-          idle_inhibitor = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize;
-            format-icons = { activated = "&#xf0208;"; deactivated = "&#xf0209;"; };
-            timeout = 120;
-          };
-          backlight = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize;
-            tooltip-format = "{percent}%";
-            format-icons = ["&#xf00da;" "&#xf00db;" "&#xf00dc;" "&#xf00dd;" "&#xf00de;" "&#xf00df;" "&#xf00e0;"];
-            on-scroll-up = "${swayosd-client} --brightness raise";
-            on-scroll-down = "${swayosd-client} --brightness lower";
-          };
-          wireplumber = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize;
-            tooltip-format = "{volume}% {node_name}";
-            format-icons = ["&#xf057f;" "&#xf0580;" "&#xf057e;"];
-            format-muted = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">&#xf075f;</span>";
-            # ignored-sinks = ["Easy Effects Sink"];
-            on-scroll-up = "${swayosd-client} --output-volume raise";
-            on-scroll-down = "${swayosd-client} --output-volume lower";
-            on-click = "${swayosd-client} --output-volume mute-toggle";
-          };
-        }
-        {
-          layer = "top";
-          position = "top";
-          height = 14;
-          output = [ "!eDP-1" "!DP-2" "!DP-3" ];
-          modules-left = [ "niri/workspaces" ];
-          modules-center = [ "niri/window" ];
-          modules-right = [ "clock" ];
-          "niri/workspaces" = {
-            ignore = ["pwctl" "kpxc" "bmgr" "edit" "term"];
-          };
-          "niri/window" = {
-            separate-outputs = true;
-            icon = true;
-            icon-size = 14;
-            rewrite = windowRewrites;
-          };
-          clock = {
-              interval = 1;
-              # timezone = "Europe/Berlin";
-              format = "{:%H:%M}";
-              tooltip-format = "W{:%V-%u %F %H:%M:%S%Ez}";
-          };
-        }
-      ];
-      style = ''
-        @define-color white #ffffff;
-        @define-color grey #555555;
-        @define-color blue #1a8fff;
-        @define-color green #23fd00;
-        @define-color orange #f28a21;
-        @define-color red #f2201f;
-        * {
-          border: none;
-          font-family: "Fira Sans";
-          font-size: 10pt;
-          min-height: 0;
-        }
-        window#waybar {
-          background-color: rgba(0, 0, 0, 0.66);
-          color: @white;
-        }
-        .modules-left {
-          margin-left: 12px;
-        }
-        .modules-right {
-          margin-right: 12px;
-        }
-        .module {
-          margin: 0 5px;
-        }
-        #workspaces button {
-          color: @white;
-          padding: 2px 5px;
-        }
-        #workspaces button.empty {
-          color: @grey;
-        }
-        #workspaces button.active {
-          color: @green;
-        }
-        #workspaces button.urgent {
-          color: @red;
-        }
-        #custom-weather, #custom-keymap, #custom-worktime, #custom-worktime-today {
-          color: @grey;
-          margin: 0 5px;
-        }
-        #custom-weather {
-          margin-right: 3px;
-        }
-        #custom-keymap {
-          margin-left: 3px;
-          margin-right: 3px;
-        }
-        #tray {
-          margin: 0;
-        }
-        #battery, #idle_inhibitor, #backlight, #wireplumber, #custom-mako {
-          color: @grey;
-          margin: 0 5px 0 2px;
-        }
-        #idle_inhibitor {
-          margin-right: 4px;
-          margin-left: 6px;
-        }
-        #custom-mako {
-          margin-right: 2px;
-          margin-left: 3px;
-        }
-        #battery {
-          margin-right: 3px;
-        }
-        #battery.discharging {
-          color: @white;
-        }
-        #battery.warning {
-          color: @orange;
-        }
-        #battery.critical {
-          color: @red;
-        }
-        #battery.charging {
-          color: @white;
-        }
-        #idle_inhibitor.activated {
-          color: @white;
-        }
-        #idle_inhibitor {
-          padding-top: 1px;
-        }
-        #privacy {
-          color: @red;
-          margin: -1px 4px 0px 3px;
-        }
-        #clock {
-          /* margin-right: 5px; */
-        }
-      '';
-    };
-  };
-}