...

8 files changed, 63 insertions, 84 deletions

diff --git a/_sources/generated.json b/_sources/generated.json
index 4498b987..802099d7 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -91,11 +91,11 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "sha256-GCtcIXGrMH6LOKxjnB2SkUSChQnMj5d939i2atvqK+Q=",
+            "sha256": "sha256-V+fB5KkbBRhVSDgB/e7oVEyMKQ7HbR82XQYlqxcLZyQ=",
             "type": "tarball",
-            "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.18.tar.gz"
+            "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.19.tar.gz"
         },
-        "version": "2.18"
+        "version": "2.19"
     },
     "mako": {
         "cargoLocks": null,
@@ -437,7 +437,7 @@
     },
     "v4l2loopback": {
         "cargoLocks": null,
-        "date": "2025-07-08",
+        "date": "2025-07-16",
         "extract": null,
         "name": "v4l2loopback",
         "passthru": null,
@@ -449,12 +449,12 @@
             "name": null,
             "owner": "umlaeute",
             "repo": "v4l2loopback",
-            "rev": "e3fb6825ebb4bc6da2e15a515e24769d76c93332",
-            "sha256": "sha256-cgxdWuIwmNaOIYmMA1mEvC+1FQFhTGsffVv71md5yXo=",
+            "rev": "7546a42a66d856933a75c2b0896cb735e3ca00c0",
+            "sha256": "sha256-jlTmdww0yXb4JXDxbjmPj1M1i+x00oknctVRHhixcwM=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "e3fb6825ebb4bc6da2e15a515e24769d76c93332"
+        "version": "7546a42a66d856933a75c2b0896cb735e3ca00c0"
     },
     "xcompose": {
         "cargoLocks": null,
@@ -486,10 +486,10 @@
         "pinned": false,
         "src": {
             "name": null,
-            "sha256": "sha256-bQroVcClW/zCjf+6gE7IUlublV00pBGRoVYaTOwD2L0=",
+            "sha256": "sha256-Rvu1Pqsa++GExFtMF+mm66YUvmgOTAneWLeCYp0Nf0M=",
             "type": "url",
-            "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.6.30.tar.gz"
+            "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.7.21.tar.gz"
         },
-        "version": "2025.6.30"
+        "version": "2025.7.21"
     }
 }
\ No newline at end of file
diff --git a/_sources/generated.nix b/_sources/generated.nix
index f470ad9e..75373a48 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -53,10 +53,10 @@
   };
   lesspipe = {
     pname = "lesspipe";
-    version = "2.18";
+    version = "2.19";
     src = fetchTarball {
-      url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.18.tar.gz";
-      sha256 = "sha256-GCtcIXGrMH6LOKxjnB2SkUSChQnMj5d939i2atvqK+Q=";
+      url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.19.tar.gz";
+      sha256 = "sha256-V+fB5KkbBRhVSDgB/e7oVEyMKQ7HbR82XQYlqxcLZyQ=";
     };
   };
   mako = {
@@ -270,15 +270,15 @@
   };
   v4l2loopback = {
     pname = "v4l2loopback";
-    version = "e3fb6825ebb4bc6da2e15a515e24769d76c93332";
+    version = "7546a42a66d856933a75c2b0896cb735e3ca00c0";
     src = fetchFromGitHub {
       owner = "umlaeute";
       repo = "v4l2loopback";
-      rev = "e3fb6825ebb4bc6da2e15a515e24769d76c93332";
+      rev = "7546a42a66d856933a75c2b0896cb735e3ca00c0";
       fetchSubmodules = true;
-      sha256 = "sha256-cgxdWuIwmNaOIYmMA1mEvC+1FQFhTGsffVv71md5yXo=";
+      sha256 = "sha256-jlTmdww0yXb4JXDxbjmPj1M1i+x00oknctVRHhixcwM=";
     };
-    date = "2025-07-08";
+    date = "2025-07-16";
   };
   xcompose = {
     pname = "xcompose";
@@ -294,10 +294,10 @@
   };
   yt-dlp = {
     pname = "yt-dlp";
-    version = "2025.6.30";
+    version = "2025.7.21";
     src = fetchurl {
-      url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.6.30.tar.gz";
-      sha256 = "sha256-bQroVcClW/zCjf+6gE7IUlublV00pBGRoVYaTOwD2L0=";
+      url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.7.21.tar.gz";
+      sha256 = "sha256-Rvu1Pqsa++GExFtMF+mm66YUvmgOTAneWLeCYp0Nf0M=";
     };
   };
 }
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 2eec064b..64434bb8 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -234,6 +234,7 @@ in {
                   config.programs.ssh.package
                   gnused
                   miniserve
+                  p7zip
                 ];
                 execer = with pkgs; [
                   "cannot:${lib.getExe' rpm "rpm2cpio"}"
@@ -246,6 +247,7 @@ in {
                   "cannot:${lib.getExe less}"
                   "cannot:${lib.getExe' config.systemd.package "systemctl"}"
                   "cannot:${lib.getExe config.programs.ssh.package}"
+                  "cannot:${lib.getExe' p7zip "7z"}"
                 ];
                 wrapper = with pkgs; [
                   "${lib.getExe' magickWrapped "magick"}:${lib.getExe' imagemagick "magick"}"
diff --git a/accounts/gkleen@sif/niri/mako.nix b/accounts/gkleen@sif/niri/mako.nix
index eba26caa..703d5f7b 100644
--- a/accounts/gkleen@sif/niri/mako.nix
+++ b/accounts/gkleen@sif/niri/mako.nix
@@ -14,8 +14,7 @@
         outer-margin = 1;
         max-history = 100;
         max-icon-size = 48;
-      };
-      criteria = {
+
         grouped.format = "<b>(%g)</b> <i>%s</i>\\n%b";
         "urgency=low".text-color = "#999999ff";
         "urgency=critical".background-color = "#900000dd";
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index b24ff257..702990c3 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -132,6 +132,10 @@ dir() {
                                unpack=false
                             fi
                         ;;
+                        application/x-iso9660-image)
+                          7z x ${templateArchive}
+                          unpack=false
+                        ;;
                         *)
                             tar -xvaf ${templateArchive}
                             unpack=false
diff --git a/flake.lock b/flake.lock
index 9dff76d1..9a1470a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -406,11 +406,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746904907,
-        "narHash": "sha256-XYo6bwc7xwo4lO6a/D2ttYRN4yDmsAjyt5O1E0vOLDg=",
+        "lastModified": 1753177987,
+        "narHash": "sha256-PkCc+YTrl0A/H6EV09DCr5yZpvQZ9DkuFXj/NNaEvHs=",
         "owner": "gkleen",
         "repo": "home-manager",
-        "rev": "696495266c65b76f08d8196b87aa7bd835906570",
+        "rev": "b493410fc6e427129a1caee8f50970d152a27daa",
         "type": "github"
       },
       "original": {
@@ -507,11 +507,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1752569955,
-        "narHash": "sha256-a21pjNhJYJ+OTQmBJ3NluU65PvMb54/mA7aEWJh5s/4=",
+        "lastModified": 1753514742,
+        "narHash": "sha256-OP7hZTjnOLP3X6cWldPLcxQ4vvDYid6SlOf1mw+XRCg=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "8fc18813bf6ceaabb3063050819a20807e11279b",
+        "rev": "af1af659e690b3e535d94c54a64700767bfc9544",
         "type": "github"
       },
       "original": {
@@ -541,11 +541,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1752565554,
-        "narHash": "sha256-BLLMN6oOarMdIm59AX8uypaXZHBhGfd6L3VURfqQTX8=",
+        "lastModified": 1752870529,
+        "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "007d35541db1bae32b7b43891af88831325ba068",
+        "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2",
         "type": "github"
       },
       "original": {
@@ -582,11 +582,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752441837,
-        "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=",
+        "lastModified": 1752985182,
+        "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "839e02dece5845be3a322e507a79712b73a96ba2",
+        "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c",
         "type": "github"
       },
       "original": {
@@ -639,11 +639,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1752048960,
-        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
+        "lastModified": 1753122741,
+        "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
+        "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
         "type": "github"
       },
       "original": {
@@ -780,11 +780,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1752308619,
-        "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=",
+        "lastModified": 1753345091,
+        "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058",
+        "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
         "type": "github"
       },
       "original": {
@@ -828,11 +828,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1752480373,
-        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+        "lastModified": 1753429684,
+        "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+        "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
         "type": "github"
       },
       "original": {
@@ -1073,11 +1073,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752574539,
-        "narHash": "sha256-Dl/TGWnrsmmyFVApbpoVosAwOjocJRP2VAoOVbYK+KA=",
+        "lastModified": 1753063383,
+        "narHash": "sha256-H+gLv6424OjJSD+l1OU1ejxkN/v0U+yaoQdh2huCXYI=",
         "owner": "pyproject-nix",
         "repo": "build-system-pkgs",
-        "rev": "dfa1792728c7a3c34e22491e9fa272ed24e53012",
+        "rev": "45888b7fd4bf36c57acc55f07917bdf49ec89ec9",
         "type": "github"
       },
       "original": {
@@ -1093,11 +1093,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752573330,
-        "narHash": "sha256-mBE8Bg1Mwd0XJSf1RTLpICO7PoNvKlc0gRoRQPyxO6o=",
+        "lastModified": 1753063596,
+        "narHash": "sha256-el1vFxDk6DR2hKGYnMfQHR7+K4aMiJDKQRMP3gdh+ZI=",
         "owner": "pyproject-nix",
         "repo": "pyproject.nix",
-        "rev": "f91edf6a888b75437d959502d2935f7e90578054",
+        "rev": "cac90713492f23be5f1072bae88406890b9c68f6",
         "type": "github"
       },
       "original": {
@@ -1240,11 +1240,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752545833,
-        "narHash": "sha256-mnYQICW9vf9F6wTgfUGlb32ie1OHxHRv2Delxul2LIU=",
+        "lastModified": 1753400079,
+        "narHash": "sha256-VC76rfCgtaKPopaLOyAEZ80bpOTQDr7wEZRUCMjoacE=",
         "owner": "pyproject-nix",
         "repo": "uv2nix",
-        "rev": "24a98828b90224ed8a811d7a54315e0f9d0ec3cd",
+        "rev": "350ae196e0e414c03db118d385eabaf50e2a0a53",
         "type": "github"
       },
       "original": {
diff --git a/modules/postsrsd.nix b/modules/postsrsd.nix
index 205e669d..bc941e3e 100644
--- a/modules/postsrsd.nix
+++ b/modules/postsrsd.nix
@@ -101,6 +101,12 @@ in
         type = lib.types.lines;
         default = "";
       };
+
+      configurePostfix = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "noop";
+      };
     };
   };
 
diff --git a/overlays/etesync-dav.nix b/overlays/etesync-dav.nix
deleted file mode 100644
index f7a5146f..00000000
--- a/overlays/etesync-dav.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ final, prev, ... }: {
-  etesync-dav = final.python3Packages.buildPythonApplication rec {
-    pname = "etesync-dav";
-    version = "0.35.0";
-    format = "pyproject";
-
-    src = prev.fetchFromGitHub {
-      owner = "etesync";
-      repo = "etesync-dav";
-      tag = "v${version}";
-      hash = "sha256-CD02nuA9GD/oe7mjExUHIftkPxM1pZQKyDalXSoOhXY=";
-    };
-
-    build-system = with final.python3Packages; [ setuptools ];
-
-    pythonRelaxDeps = [ "radicale" ];
-
-    dependencies = with final.python3Packages; [
-      appdirs
-      etebase
-      etesync
-      flask
-      flask-wtf
-      msgpack
-      (final.python3Packages.toPythonModule (final.radicale.override { inherit (final) python3; }))
-      requests
-      requests.optional-dependencies.socks
-    ];
-
-    doCheck = false;
-  };
-}