bump

3 files changed, 16 insertions, 5 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 1c2031b5..3b3c7fc5 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -398,7 +398,7 @@ in {
           fira-code-symbols libreoffice xournalpp google-chrome
           nixos-shell virt-viewer freerdp gnome-icon-theme
           paper-icon-theme sshpassSecret weechat element-desktop
-          sieve-connect gimp inkscape udiskie glab nitrokey-app
+          sieve-connect gimp3 inkscape udiskie glab nitrokey-app
           pynitrokey gtklock wlrctl remmina openscad spice-record
           libguestfs-with-appliance nerd-fonts.fira-mono
           nerd-fonts.symbols-only nerd-fonts.fira-code powerline-fonts
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index b5347d6f..0e25fc95 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -273,8 +273,6 @@ in {
               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)
@@ -299,8 +297,6 @@ in {
 
           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)
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index c628e2e9..362943f3 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -300,6 +300,21 @@ dichotomic_search() {
   echo $min
 }
 
+sieve-edit() {
+  case "$host" in
+    surtr)
+      sieve-connect -s surtr.yggdrasil.li -m EXTERNAL --clientkey <(nix run nixos'#'sops -- decrypt ~flk/hosts/surtr/email/ca/gkleen@sif.key) --clientcert ~flk/hosts/surtr/email/ca/gkleen@sif.crt --edit --remotesieve sieve
+      ;;
+    ymir)
+      sieve-connect -s ymir.yggdrasil.li -u gkleen --edit --remotesieve sieve
+      ;;
+    *)
+      echo "Unknown host: ‘$host’" >&2
+      exit 2
+      ;;
+  esac
+}
+
 while read -r -d $'\0' d _ s; do
   hash -d ${s}=${d}
 done < <(find ~/projects ~/uni -regextype posix-extended -maxdepth 2 -type d -regex '\S+/[0-9]{2}[ws]/\S+' -print0 2>/dev/null | \