summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_sources/generated.json20
-rw-r--r--_sources/generated.nix20
-rw-r--r--accounts/gkleen@sif/default.nix2
-rw-r--r--accounts/gkleen@sif/niri/mako.nix3
-rw-r--r--accounts/gkleen@sif/zshrc4
-rw-r--r--flake.lock60
-rw-r--r--modules/postsrsd.nix6
-rw-r--r--overlays/etesync-dav.nix32
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 @@
91 "passthru": null, 91 "passthru": null,
92 "pinned": false, 92 "pinned": false,
93 "src": { 93 "src": {
94 "sha256": "sha256-GCtcIXGrMH6LOKxjnB2SkUSChQnMj5d939i2atvqK+Q=", 94 "sha256": "sha256-V+fB5KkbBRhVSDgB/e7oVEyMKQ7HbR82XQYlqxcLZyQ=",
95 "type": "tarball", 95 "type": "tarball",
96 "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.18.tar.gz" 96 "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.19.tar.gz"
97 }, 97 },
98 "version": "2.18" 98 "version": "2.19"
99 }, 99 },
100 "mako": { 100 "mako": {
101 "cargoLocks": null, 101 "cargoLocks": null,
@@ -437,7 +437,7 @@
437 }, 437 },
438 "v4l2loopback": { 438 "v4l2loopback": {
439 "cargoLocks": null, 439 "cargoLocks": null,
440 "date": "2025-07-08", 440 "date": "2025-07-16",
441 "extract": null, 441 "extract": null,
442 "name": "v4l2loopback", 442 "name": "v4l2loopback",
443 "passthru": null, 443 "passthru": null,
@@ -449,12 +449,12 @@
449 "name": null, 449 "name": null,
450 "owner": "umlaeute", 450 "owner": "umlaeute",
451 "repo": "v4l2loopback", 451 "repo": "v4l2loopback",
452 "rev": "e3fb6825ebb4bc6da2e15a515e24769d76c93332", 452 "rev": "7546a42a66d856933a75c2b0896cb735e3ca00c0",
453 "sha256": "sha256-cgxdWuIwmNaOIYmMA1mEvC+1FQFhTGsffVv71md5yXo=", 453 "sha256": "sha256-jlTmdww0yXb4JXDxbjmPj1M1i+x00oknctVRHhixcwM=",
454 "sparseCheckout": [], 454 "sparseCheckout": [],
455 "type": "github" 455 "type": "github"
456 }, 456 },
457 "version": "e3fb6825ebb4bc6da2e15a515e24769d76c93332" 457 "version": "7546a42a66d856933a75c2b0896cb735e3ca00c0"
458 }, 458 },
459 "xcompose": { 459 "xcompose": {
460 "cargoLocks": null, 460 "cargoLocks": null,
@@ -486,10 +486,10 @@
486 "pinned": false, 486 "pinned": false,
487 "src": { 487 "src": {
488 "name": null, 488 "name": null,
489 "sha256": "sha256-bQroVcClW/zCjf+6gE7IUlublV00pBGRoVYaTOwD2L0=", 489 "sha256": "sha256-Rvu1Pqsa++GExFtMF+mm66YUvmgOTAneWLeCYp0Nf0M=",
490 "type": "url", 490 "type": "url",
491 "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.6.30.tar.gz" 491 "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.7.21.tar.gz"
492 }, 492 },
493 "version": "2025.6.30" 493 "version": "2025.7.21"
494 } 494 }
495} \ No newline at end of file 495} \ 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 @@
53 }; 53 };
54 lesspipe = { 54 lesspipe = {
55 pname = "lesspipe"; 55 pname = "lesspipe";
56 version = "2.18"; 56 version = "2.19";
57 src = fetchTarball { 57 src = fetchTarball {
58 url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.18.tar.gz"; 58 url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.19.tar.gz";
59 sha256 = "sha256-GCtcIXGrMH6LOKxjnB2SkUSChQnMj5d939i2atvqK+Q="; 59 sha256 = "sha256-V+fB5KkbBRhVSDgB/e7oVEyMKQ7HbR82XQYlqxcLZyQ=";
60 }; 60 };
61 }; 61 };
62 mako = { 62 mako = {
@@ -270,15 +270,15 @@
270 }; 270 };
271 v4l2loopback = { 271 v4l2loopback = {
272 pname = "v4l2loopback"; 272 pname = "v4l2loopback";
273 version = "e3fb6825ebb4bc6da2e15a515e24769d76c93332"; 273 version = "7546a42a66d856933a75c2b0896cb735e3ca00c0";
274 src = fetchFromGitHub { 274 src = fetchFromGitHub {
275 owner = "umlaeute"; 275 owner = "umlaeute";
276 repo = "v4l2loopback"; 276 repo = "v4l2loopback";
277 rev = "e3fb6825ebb4bc6da2e15a515e24769d76c93332"; 277 rev = "7546a42a66d856933a75c2b0896cb735e3ca00c0";
278 fetchSubmodules = true; 278 fetchSubmodules = true;
279 sha256 = "sha256-cgxdWuIwmNaOIYmMA1mEvC+1FQFhTGsffVv71md5yXo="; 279 sha256 = "sha256-jlTmdww0yXb4JXDxbjmPj1M1i+x00oknctVRHhixcwM=";
280 }; 280 };
281 date = "2025-07-08"; 281 date = "2025-07-16";
282 }; 282 };
283 xcompose = { 283 xcompose = {
284 pname = "xcompose"; 284 pname = "xcompose";
@@ -294,10 +294,10 @@
294 }; 294 };
295 yt-dlp = { 295 yt-dlp = {
296 pname = "yt-dlp"; 296 pname = "yt-dlp";
297 version = "2025.6.30"; 297 version = "2025.7.21";
298 src = fetchurl { 298 src = fetchurl {
299 url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.6.30.tar.gz"; 299 url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.7.21.tar.gz";
300 sha256 = "sha256-bQroVcClW/zCjf+6gE7IUlublV00pBGRoVYaTOwD2L0="; 300 sha256 = "sha256-Rvu1Pqsa++GExFtMF+mm66YUvmgOTAneWLeCYp0Nf0M=";
301 }; 301 };
302 }; 302 };
303} 303}
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 {
234 config.programs.ssh.package 234 config.programs.ssh.package
235 gnused 235 gnused
236 miniserve 236 miniserve
237 p7zip
237 ]; 238 ];
238 execer = with pkgs; [ 239 execer = with pkgs; [
239 "cannot:${lib.getExe' rpm "rpm2cpio"}" 240 "cannot:${lib.getExe' rpm "rpm2cpio"}"
@@ -246,6 +247,7 @@ in {
246 "cannot:${lib.getExe less}" 247 "cannot:${lib.getExe less}"
247 "cannot:${lib.getExe' config.systemd.package "systemctl"}" 248 "cannot:${lib.getExe' config.systemd.package "systemctl"}"
248 "cannot:${lib.getExe config.programs.ssh.package}" 249 "cannot:${lib.getExe config.programs.ssh.package}"
250 "cannot:${lib.getExe' p7zip "7z"}"
249 ]; 251 ];
250 wrapper = with pkgs; [ 252 wrapper = with pkgs; [
251 "${lib.getExe' magickWrapped "magick"}:${lib.getExe' imagemagick "magick"}" 253 "${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 @@
14 outer-margin = 1; 14 outer-margin = 1;
15 max-history = 100; 15 max-history = 100;
16 max-icon-size = 48; 16 max-icon-size = 48;
17 }; 17
18 criteria = {
19 grouped.format = "<b>(%g)</b> <i>%s</i>\\n%b"; 18 grouped.format = "<b>(%g)</b> <i>%s</i>\\n%b";
20 "urgency=low".text-color = "#999999ff"; 19 "urgency=low".text-color = "#999999ff";
21 "urgency=critical".background-color = "#900000dd"; 20 "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() {
132 unpack=false 132 unpack=false
133 fi 133 fi
134 ;; 134 ;;
135 application/x-iso9660-image)
136 7z x ${templateArchive}
137 unpack=false
138 ;;
135 *) 139 *)
136 tar -xvaf ${templateArchive} 140 tar -xvaf ${templateArchive}
137 unpack=false 141 unpack=false
diff --git a/flake.lock b/flake.lock
index 9dff76d1..9a1470a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -406,11 +406,11 @@
406 ] 406 ]
407 }, 407 },
408 "locked": { 408 "locked": {
409 "lastModified": 1746904907, 409 "lastModified": 1753177987,
410 "narHash": "sha256-XYo6bwc7xwo4lO6a/D2ttYRN4yDmsAjyt5O1E0vOLDg=", 410 "narHash": "sha256-PkCc+YTrl0A/H6EV09DCr5yZpvQZ9DkuFXj/NNaEvHs=",
411 "owner": "gkleen", 411 "owner": "gkleen",
412 "repo": "home-manager", 412 "repo": "home-manager",
413 "rev": "696495266c65b76f08d8196b87aa7bd835906570", 413 "rev": "b493410fc6e427129a1caee8f50970d152a27daa",
414 "type": "github" 414 "type": "github"
415 }, 415 },
416 "original": { 416 "original": {
@@ -507,11 +507,11 @@
507 "xwayland-satellite-unstable": "xwayland-satellite-unstable" 507 "xwayland-satellite-unstable": "xwayland-satellite-unstable"
508 }, 508 },
509 "locked": { 509 "locked": {
510 "lastModified": 1752569955, 510 "lastModified": 1753514742,
511 "narHash": "sha256-a21pjNhJYJ+OTQmBJ3NluU65PvMb54/mA7aEWJh5s/4=", 511 "narHash": "sha256-OP7hZTjnOLP3X6cWldPLcxQ4vvDYid6SlOf1mw+XRCg=",
512 "owner": "sodiboo", 512 "owner": "sodiboo",
513 "repo": "niri-flake", 513 "repo": "niri-flake",
514 "rev": "8fc18813bf6ceaabb3063050819a20807e11279b", 514 "rev": "af1af659e690b3e535d94c54a64700767bfc9544",
515 "type": "github" 515 "type": "github"
516 }, 516 },
517 "original": { 517 "original": {
@@ -541,11 +541,11 @@
541 "niri-unstable": { 541 "niri-unstable": {
542 "flake": false, 542 "flake": false,
543 "locked": { 543 "locked": {
544 "lastModified": 1752565554, 544 "lastModified": 1752870529,
545 "narHash": "sha256-BLLMN6oOarMdIm59AX8uypaXZHBhGfd6L3VURfqQTX8=", 545 "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=",
546 "owner": "YaLTeR", 546 "owner": "YaLTeR",
547 "repo": "niri", 547 "repo": "niri",
548 "rev": "007d35541db1bae32b7b43891af88831325ba068", 548 "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2",
549 "type": "github" 549 "type": "github"
550 }, 550 },
551 "original": { 551 "original": {
@@ -582,11 +582,11 @@
582 ] 582 ]
583 }, 583 },
584 "locked": { 584 "locked": {
585 "lastModified": 1752441837, 585 "lastModified": 1752985182,
586 "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", 586 "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=",
587 "owner": "Mic92", 587 "owner": "Mic92",
588 "repo": "nix-index-database", 588 "repo": "nix-index-database",
589 "rev": "839e02dece5845be3a322e507a79712b73a96ba2", 589 "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c",
590 "type": "github" 590 "type": "github"
591 }, 591 },
592 "original": { 592 "original": {
@@ -639,11 +639,11 @@
639 }, 639 },
640 "nixos-hardware": { 640 "nixos-hardware": {
641 "locked": { 641 "locked": {
642 "lastModified": 1752048960, 642 "lastModified": 1753122741,
643 "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", 643 "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
644 "owner": "NixOS", 644 "owner": "NixOS",
645 "repo": "nixos-hardware", 645 "repo": "nixos-hardware",
646 "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", 646 "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
647 "type": "github" 647 "type": "github"
648 }, 648 },
649 "original": { 649 "original": {
@@ -780,11 +780,11 @@
780 }, 780 },
781 "nixpkgs-stable_3": { 781 "nixpkgs-stable_3": {
782 "locked": { 782 "locked": {
783 "lastModified": 1752308619, 783 "lastModified": 1753345091,
784 "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", 784 "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
785 "owner": "NixOS", 785 "owner": "NixOS",
786 "repo": "nixpkgs", 786 "repo": "nixpkgs",
787 "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", 787 "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
788 "type": "github" 788 "type": "github"
789 }, 789 },
790 "original": { 790 "original": {
@@ -828,11 +828,11 @@
828 }, 828 },
829 "nixpkgs_2": { 829 "nixpkgs_2": {
830 "locked": { 830 "locked": {
831 "lastModified": 1752480373, 831 "lastModified": 1753429684,
832 "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", 832 "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
833 "owner": "NixOS", 833 "owner": "NixOS",
834 "repo": "nixpkgs", 834 "repo": "nixpkgs",
835 "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", 835 "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
836 "type": "github" 836 "type": "github"
837 }, 837 },
838 "original": { 838 "original": {
@@ -1073,11 +1073,11 @@
1073 ] 1073 ]
1074 }, 1074 },
1075 "locked": { 1075 "locked": {
1076 "lastModified": 1752574539, 1076 "lastModified": 1753063383,
1077 "narHash": "sha256-Dl/TGWnrsmmyFVApbpoVosAwOjocJRP2VAoOVbYK+KA=", 1077 "narHash": "sha256-H+gLv6424OjJSD+l1OU1ejxkN/v0U+yaoQdh2huCXYI=",
1078 "owner": "pyproject-nix", 1078 "owner": "pyproject-nix",
1079 "repo": "build-system-pkgs", 1079 "repo": "build-system-pkgs",
1080 "rev": "dfa1792728c7a3c34e22491e9fa272ed24e53012", 1080 "rev": "45888b7fd4bf36c57acc55f07917bdf49ec89ec9",
1081 "type": "github" 1081 "type": "github"
1082 }, 1082 },
1083 "original": { 1083 "original": {
@@ -1093,11 +1093,11 @@
1093 ] 1093 ]
1094 }, 1094 },
1095 "locked": { 1095 "locked": {
1096 "lastModified": 1752573330, 1096 "lastModified": 1753063596,
1097 "narHash": "sha256-mBE8Bg1Mwd0XJSf1RTLpICO7PoNvKlc0gRoRQPyxO6o=", 1097 "narHash": "sha256-el1vFxDk6DR2hKGYnMfQHR7+K4aMiJDKQRMP3gdh+ZI=",
1098 "owner": "pyproject-nix", 1098 "owner": "pyproject-nix",
1099 "repo": "pyproject.nix", 1099 "repo": "pyproject.nix",
1100 "rev": "f91edf6a888b75437d959502d2935f7e90578054", 1100 "rev": "cac90713492f23be5f1072bae88406890b9c68f6",
1101 "type": "github" 1101 "type": "github"
1102 }, 1102 },
1103 "original": { 1103 "original": {
@@ -1240,11 +1240,11 @@
1240 ] 1240 ]
1241 }, 1241 },
1242 "locked": { 1242 "locked": {
1243 "lastModified": 1752545833, 1243 "lastModified": 1753400079,
1244 "narHash": "sha256-mnYQICW9vf9F6wTgfUGlb32ie1OHxHRv2Delxul2LIU=", 1244 "narHash": "sha256-VC76rfCgtaKPopaLOyAEZ80bpOTQDr7wEZRUCMjoacE=",
1245 "owner": "pyproject-nix", 1245 "owner": "pyproject-nix",
1246 "repo": "uv2nix", 1246 "repo": "uv2nix",
1247 "rev": "24a98828b90224ed8a811d7a54315e0f9d0ec3cd", 1247 "rev": "350ae196e0e414c03db118d385eabaf50e2a0a53",
1248 "type": "github" 1248 "type": "github"
1249 }, 1249 },
1250 "original": { 1250 "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
101 type = lib.types.lines; 101 type = lib.types.lines;
102 default = ""; 102 default = "";
103 }; 103 };
104
105 configurePostfix = lib.mkOption {
106 type = lib.types.bool;
107 default = false;
108 description = "noop";
109 };
104 }; 110 };
105 }; 111 };
106 112
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 @@
1{ final, prev, ... }: {
2 etesync-dav = final.python3Packages.buildPythonApplication rec {
3 pname = "etesync-dav";
4 version = "0.35.0";
5 format = "pyproject";
6
7 src = prev.fetchFromGitHub {
8 owner = "etesync";
9 repo = "etesync-dav";
10 tag = "v${version}";
11 hash = "sha256-CD02nuA9GD/oe7mjExUHIftkPxM1pZQKyDalXSoOhXY=";
12 };
13
14 build-system = with final.python3Packages; [ setuptools ];
15
16 pythonRelaxDeps = [ "radicale" ];
17
18 dependencies = with final.python3Packages; [
19 appdirs
20 etebase
21 etesync
22 flask
23 flask-wtf
24 msgpack
25 (final.python3Packages.toPythonModule (final.radicale.override { inherit (final) python3; }))
26 requests
27 requests.optional-dependencies.socks
28 ];
29
30 doCheck = false;
31 };
32}