summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_sources/generated.json30
-rw-r--r--_sources/generated.nix30
-rw-r--r--accounts/gkleen@sif/default.nix1
-rw-r--r--accounts/gkleen@sif/niri/default.nix4
-rw-r--r--accounts/gkleen@sif/niri/waybar.nix4
-rw-r--r--flake.lock82
-rw-r--r--flake.nix11
-rw-r--r--overlays/deploy-rs.nix14
-rw-r--r--overlays/nix-monitored.nix8
-rw-r--r--overlays/scutiger.nix2
-rw-r--r--overlays/swayosd/default.nix4
-rw-r--r--overlays/thunderbird.nix11
-rw-r--r--shell.nix4
-rw-r--r--user-profiles/direnv.nix9
-rw-r--r--user-profiles/yt-dlp.nix2
15 files changed, 131 insertions, 85 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index b85cb274..d9868b8e 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -76,12 +76,12 @@
76 "name": null, 76 "name": null,
77 "owner": "Mange", 77 "owner": "Mange",
78 "repo": "emoji-data", 78 "repo": "emoji-data",
79 "rev": "v2.6", 79 "rev": "v2.7",
80 "sha256": "sha256-6nBiT9q139P1pXLqkV1JejE0s2rZn1gUbNsejXJR6RU=", 80 "sha256": "sha256-bUFh0Q7xcnKTBgVBUJU8BH6zzq1Y3krLfJJAgx5TqKs=",
81 "sparseCheckout": [], 81 "sparseCheckout": [],
82 "type": "github" 82 "type": "github"
83 }, 83 },
84 "version": "v2.6" 84 "version": "v2.7"
85 }, 85 },
86 "lesspipe": { 86 "lesspipe": {
87 "cargoLocks": null, 87 "cargoLocks": null,
@@ -99,7 +99,7 @@
99 }, 99 },
100 "mako": { 100 "mako": {
101 "cargoLocks": null, 101 "cargoLocks": null,
102 "date": "2025-03-21", 102 "date": "2025-04-03",
103 "extract": null, 103 "extract": null,
104 "name": "mako", 104 "name": "mako",
105 "passthru": null, 105 "passthru": null,
@@ -109,13 +109,13 @@
109 "fetchSubmodules": false, 109 "fetchSubmodules": false,
110 "leaveDotGit": false, 110 "leaveDotGit": false,
111 "name": null, 111 "name": null,
112 "rev": "2a06a341efae601431a6944f94cfe4965a46cb44", 112 "rev": "2763e92cecd7d0d58a03b5626a0bf1f7649c4ba5",
113 "sha256": "sha256-QH2rxJcNiurHFEtkmq6Ki15k11b6ft6WYiZKbGs7SS0=", 113 "sha256": "sha256-XMrwWVGp2ow1gCvjS1JbCerBNpRXzqsTMePFkSSjVXA=",
114 "sparseCheckout": [], 114 "sparseCheckout": [],
115 "type": "git", 115 "type": "git",
116 "url": "https://github.com/emersion/mako" 116 "url": "https://github.com/emersion/mako"
117 }, 117 },
118 "version": "2a06a341efae601431a6944f94cfe4965a46cb44" 118 "version": "2763e92cecd7d0d58a03b5626a0bf1f7649c4ba5"
119 }, 119 },
120 "mpv-autosave": { 120 "mpv-autosave": {
121 "cargoLocks": null, 121 "cargoLocks": null,
@@ -223,7 +223,7 @@
223 }, 223 },
224 "mpv-subselect": { 224 "mpv-subselect": {
225 "cargoLocks": null, 225 "cargoLocks": null,
226 "date": "2024-12-22", 226 "date": "2025-04-04",
227 "extract": null, 227 "extract": null,
228 "name": "mpv-subselect", 228 "name": "mpv-subselect",
229 "passthru": null, 229 "passthru": null,
@@ -233,13 +233,13 @@
233 "fetchSubmodules": false, 233 "fetchSubmodules": false,
234 "leaveDotGit": false, 234 "leaveDotGit": false,
235 "name": null, 235 "name": null,
236 "rev": "77d0148aa6aa952f07f06212cabe32d54dfdf49e", 236 "rev": "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb",
237 "sha256": "sha256-VxwwTxE8c8rRQt/m2NA7cRC7+7O1ItYFFGv81nxqIxg=", 237 "sha256": "sha256-+eVga4b7KIBnfrtmlgq/0HNjQVS3SK6YWVXCPvOeOOc=",
238 "sparseCheckout": [], 238 "sparseCheckout": [],
239 "type": "git", 239 "type": "git",
240 "url": "https://github.com/CogentRedTester/mpv-sub-select" 240 "url": "https://github.com/CogentRedTester/mpv-sub-select"
241 }, 241 },
242 "version": "77d0148aa6aa952f07f06212cabe32d54dfdf49e" 242 "version": "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb"
243 }, 243 },
244 "mpv-youtube-quality": { 244 "mpv-youtube-quality": {
245 "cargoLocks": null, 245 "cargoLocks": null,
@@ -407,7 +407,7 @@
407 }, 407 },
408 "v4l2loopback": { 408 "v4l2loopback": {
409 "cargoLocks": null, 409 "cargoLocks": null,
410 "date": "2025-03-24", 410 "date": "2025-04-12",
411 "extract": null, 411 "extract": null,
412 "name": "v4l2loopback", 412 "name": "v4l2loopback",
413 "passthru": null, 413 "passthru": null,
@@ -419,12 +419,12 @@
419 "name": null, 419 "name": null,
420 "owner": "umlaeute", 420 "owner": "umlaeute",
421 "repo": "v4l2loopback", 421 "repo": "v4l2loopback",
422 "rev": "84cccedd9d3979f0a8ec5478b100ea57adf29696", 422 "rev": "5fae555286b74a61beb1e5b45b01ba7736a1c234",
423 "sha256": "sha256-o31+j5OdMV0e5GvyoGSR1RK6GjTwz9sfhfUK+vbW+b4=", 423 "sha256": "sha256-cALS7DrSolAdFtE1YJpmNjq81CPbXA38YsFyx2sSLcQ=",
424 "sparseCheckout": [], 424 "sparseCheckout": [],
425 "type": "github" 425 "type": "github"
426 }, 426 },
427 "version": "84cccedd9d3979f0a8ec5478b100ea57adf29696" 427 "version": "5fae555286b74a61beb1e5b45b01ba7736a1c234"
428 }, 428 },
429 "xcompose": { 429 "xcompose": {
430 "cargoLocks": null, 430 "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index ddcbbf10..3376df44 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -42,13 +42,13 @@
42 }; 42 };
43 emoji-data = { 43 emoji-data = {
44 pname = "emoji-data"; 44 pname = "emoji-data";
45 version = "v2.6"; 45 version = "v2.7";
46 src = fetchFromGitHub { 46 src = fetchFromGitHub {
47 owner = "Mange"; 47 owner = "Mange";
48 repo = "emoji-data"; 48 repo = "emoji-data";
49 rev = "v2.6"; 49 rev = "v2.7";
50 fetchSubmodules = true; 50 fetchSubmodules = true;
51 sha256 = "sha256-6nBiT9q139P1pXLqkV1JejE0s2rZn1gUbNsejXJR6RU="; 51 sha256 = "sha256-bUFh0Q7xcnKTBgVBUJU8BH6zzq1Y3krLfJJAgx5TqKs=";
52 }; 52 };
53 }; 53 };
54 lesspipe = { 54 lesspipe = {
@@ -61,17 +61,17 @@
61 }; 61 };
62 mako = { 62 mako = {
63 pname = "mako"; 63 pname = "mako";
64 version = "2a06a341efae601431a6944f94cfe4965a46cb44"; 64 version = "2763e92cecd7d0d58a03b5626a0bf1f7649c4ba5";
65 src = fetchgit { 65 src = fetchgit {
66 url = "https://github.com/emersion/mako"; 66 url = "https://github.com/emersion/mako";
67 rev = "2a06a341efae601431a6944f94cfe4965a46cb44"; 67 rev = "2763e92cecd7d0d58a03b5626a0bf1f7649c4ba5";
68 fetchSubmodules = false; 68 fetchSubmodules = false;
69 deepClone = false; 69 deepClone = false;
70 leaveDotGit = false; 70 leaveDotGit = false;
71 sparseCheckout = [ ]; 71 sparseCheckout = [ ];
72 sha256 = "sha256-QH2rxJcNiurHFEtkmq6Ki15k11b6ft6WYiZKbGs7SS0="; 72 sha256 = "sha256-XMrwWVGp2ow1gCvjS1JbCerBNpRXzqsTMePFkSSjVXA=";
73 }; 73 };
74 date = "2025-03-21"; 74 date = "2025-04-03";
75 }; 75 };
76 mpv-autosave = { 76 mpv-autosave = {
77 pname = "mpv-autosave"; 77 pname = "mpv-autosave";
@@ -136,17 +136,17 @@
136 }; 136 };
137 mpv-subselect = { 137 mpv-subselect = {
138 pname = "mpv-subselect"; 138 pname = "mpv-subselect";
139 version = "77d0148aa6aa952f07f06212cabe32d54dfdf49e"; 139 version = "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb";
140 src = fetchgit { 140 src = fetchgit {
141 url = "https://github.com/CogentRedTester/mpv-sub-select"; 141 url = "https://github.com/CogentRedTester/mpv-sub-select";
142 rev = "77d0148aa6aa952f07f06212cabe32d54dfdf49e"; 142 rev = "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb";
143 fetchSubmodules = false; 143 fetchSubmodules = false;
144 deepClone = false; 144 deepClone = false;
145 leaveDotGit = false; 145 leaveDotGit = false;
146 sparseCheckout = [ ]; 146 sparseCheckout = [ ];
147 sha256 = "sha256-VxwwTxE8c8rRQt/m2NA7cRC7+7O1ItYFFGv81nxqIxg="; 147 sha256 = "sha256-+eVga4b7KIBnfrtmlgq/0HNjQVS3SK6YWVXCPvOeOOc=";
148 }; 148 };
149 date = "2024-12-22"; 149 date = "2025-04-04";
150 }; 150 };
151 mpv-youtube-quality = { 151 mpv-youtube-quality = {
152 pname = "mpv-youtube-quality"; 152 pname = "mpv-youtube-quality";
@@ -254,15 +254,15 @@
254 }; 254 };
255 v4l2loopback = { 255 v4l2loopback = {
256 pname = "v4l2loopback"; 256 pname = "v4l2loopback";
257 version = "84cccedd9d3979f0a8ec5478b100ea57adf29696"; 257 version = "5fae555286b74a61beb1e5b45b01ba7736a1c234";
258 src = fetchFromGitHub { 258 src = fetchFromGitHub {
259 owner = "umlaeute"; 259 owner = "umlaeute";
260 repo = "v4l2loopback"; 260 repo = "v4l2loopback";
261 rev = "84cccedd9d3979f0a8ec5478b100ea57adf29696"; 261 rev = "5fae555286b74a61beb1e5b45b01ba7736a1c234";
262 fetchSubmodules = true; 262 fetchSubmodules = true;
263 sha256 = "sha256-o31+j5OdMV0e5GvyoGSR1RK6GjTwz9sfhfUK+vbW+b4="; 263 sha256 = "sha256-cALS7DrSolAdFtE1YJpmNjq81CPbXA38YsFyx2sSLcQ=";
264 }; 264 };
265 date = "2025-03-24"; 265 date = "2025-04-12";
266 }; 266 };
267 xcompose = { 267 xcompose = {
268 pname = "xcompose"; 268 pname = "xcompose";
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 11f24f31..b54103e1 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -398,7 +398,6 @@ in {
398 fira-code-symbols libreoffice xournalpp google-chrome 398 fira-code-symbols libreoffice xournalpp google-chrome
399 nixos-shell virt-viewer freerdp gnome-icon-theme 399 nixos-shell virt-viewer freerdp gnome-icon-theme
400 paper-icon-theme sshpassSecret weechat element-desktop 400 paper-icon-theme sshpassSecret weechat element-desktop
401 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
402 sieve-connect gimp inkscape udiskie glab nitrokey-app 401 sieve-connect gimp inkscape udiskie glab nitrokey-app
403 pynitrokey gtklock wlrctl remmina openscad spice-record 402 pynitrokey gtklock wlrctl remmina openscad spice-record
404 libguestfs-with-appliance nerd-fonts.fira-mono 403 libguestfs-with-appliance nerd-fonts.fira-mono
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 216a98ea..818266e1 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -455,8 +455,8 @@ in {
455 (plain "layout" [ 455 (plain "layout" [
456 (leaf "gaps" 8) 456 (leaf "gaps" 8)
457 (plain "struts" [ 457 (plain "struts" [
458 (leaf "left" 0) 458 (leaf "left" 26)
459 (leaf "right" 0) 459 (leaf "right" 26)
460 (leaf "top" 0) 460 (leaf "top" 0)
461 (leaf "bottom" 0) 461 (leaf "bottom" 0)
462 ]) 462 ])
diff --git a/accounts/gkleen@sif/niri/waybar.nix b/accounts/gkleen@sif/niri/waybar.nix
index bae818f6..6742e9fc 100644
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ b/accounts/gkleen@sif/niri/waybar.nix
@@ -254,10 +254,10 @@ in {
254 } 254 }
255 255
256 .modules-left { 256 .modules-left {
257 margin-left: 12px; 257 margin-left: 38px;
258 } 258 }
259 .modules-right { 259 .modules-right {
260 margin-right: 12px; 260 margin-right: 38px;
261 } 261 }
262 262
263 .module { 263 .module {
diff --git a/flake.lock b/flake.lock
index 55213878..faa3faff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -202,11 +202,11 @@
202 "flake-registry": { 202 "flake-registry": {
203 "flake": false, 203 "flake": false,
204 "locked": { 204 "locked": {
205 "lastModified": 1734450202, 205 "lastModified": 1744623129,
206 "narHash": "sha256-/3gigrEBFORQs6a8LL5twoHs7biu08y/8Xc5aQmk3b0=", 206 "narHash": "sha256-nlQTQrHqM+ywXN0evDXnYEV6z6WWZB5BFQ2TkXsduKw=",
207 "owner": "NixOS", 207 "owner": "NixOS",
208 "repo": "flake-registry", 208 "repo": "flake-registry",
209 "rev": "02fe640c9e117dd9d6a34efc7bcb8bd09c08111d", 209 "rev": "1322f33d5836ae757d2e6190239252cf8402acf6",
210 "type": "github" 210 "type": "github"
211 }, 211 },
212 "original": { 212 "original": {
@@ -397,11 +397,11 @@
397 "xwayland-satellite-unstable": "xwayland-satellite-unstable" 397 "xwayland-satellite-unstable": "xwayland-satellite-unstable"
398 }, 398 },
399 "locked": { 399 "locked": {
400 "lastModified": 1743186084, 400 "lastModified": 1744480072,
401 "narHash": "sha256-zEPpazywKQLIRWxeTBFnSnacSnGIqM2Qr1iJ5qB94IQ=", 401 "narHash": "sha256-h9MGdfc1ddQLaZ5eXdxUOY4SGvRe0IzIuX/03yVRras=",
402 "owner": "sodiboo", 402 "owner": "sodiboo",
403 "repo": "niri-flake", 403 "repo": "niri-flake",
404 "rev": "111a3afc23fdf64fd76115df48c2e6571fee51b7", 404 "rev": "c845f42f0bf9a02350a1e561cb702911c61428a9",
405 "type": "github" 405 "type": "github"
406 }, 406 },
407 "original": { 407 "original": {
@@ -431,11 +431,11 @@
431 "niri-unstable": { 431 "niri-unstable": {
432 "flake": false, 432 "flake": false,
433 "locked": { 433 "locked": {
434 "lastModified": 1743017820, 434 "lastModified": 1744475937,
435 "narHash": "sha256-EYq2NfWSSO87O7hLrJLPPt0VbgvSjgPzru+58LQ29WI=", 435 "narHash": "sha256-vJXhE2BCJO3AxGUGqL7GW7ReeAL+OKy80ErMYDuILjM=",
436 "owner": "YaLTeR", 436 "owner": "YaLTeR",
437 "repo": "niri", 437 "repo": "niri",
438 "rev": "7cfecf4b1b9b8c11c80061fb31926f888228499d", 438 "rev": "95eafba346a17104a9af71021011fcdc9e13776b",
439 "type": "github" 439 "type": "github"
440 }, 440 },
441 "original": { 441 "original": {
@@ -472,11 +472,11 @@
472 ] 472 ]
473 }, 473 },
474 "locked": { 474 "locked": {
475 "lastModified": 1743306489, 475 "lastModified": 1744518957,
476 "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=", 476 "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=",
477 "owner": "Mic92", 477 "owner": "Mic92",
478 "repo": "nix-index-database", 478 "repo": "nix-index-database",
479 "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d", 479 "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd",
480 "type": "github" 480 "type": "github"
481 }, 481 },
482 "original": { 482 "original": {
@@ -486,6 +486,27 @@
486 "type": "github" 486 "type": "github"
487 } 487 }
488 }, 488 },
489 "nix-monitored": {
490 "inputs": {
491 "nixpkgs": [
492 "nixpkgs"
493 ]
494 },
495 "locked": {
496 "lastModified": 1737219791,
497 "narHash": "sha256-OU0NPjJ3woNDFNx7HtWuUXBb4eI6Ggre/Uj2qhiSjrg=",
498 "owner": "ners",
499 "repo": "nix-monitored",
500 "rev": "6ed8ed4832ff26c616e5856ba19f5b8141d61bd3",
501 "type": "github"
502 },
503 "original": {
504 "owner": "ners",
505 "ref": "master",
506 "repo": "nix-monitored",
507 "type": "github"
508 }
509 },
489 "nixVirt": { 510 "nixVirt": {
490 "inputs": { 511 "inputs": {
491 "nixpkgs": [ 512 "nixpkgs": [
@@ -508,11 +529,11 @@
508 }, 529 },
509 "nixos-hardware": { 530 "nixos-hardware": {
510 "locked": { 531 "locked": {
511 "lastModified": 1743167577, 532 "lastModified": 1744633460,
512 "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", 533 "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=",
513 "owner": "NixOS", 534 "owner": "NixOS",
514 "repo": "nixos-hardware", 535 "repo": "nixos-hardware",
515 "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", 536 "rev": "9a049b4a421076d27fee3eec664a18b2066824cb",
516 "type": "github" 537 "type": "github"
517 }, 538 },
518 "original": { 539 "original": {
@@ -630,11 +651,11 @@
630 }, 651 },
631 "nixpkgs-stable_2": { 652 "nixpkgs-stable_2": {
632 "locked": { 653 "locked": {
633 "lastModified": 1742937945, 654 "lastModified": 1744309437,
634 "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", 655 "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
635 "owner": "NixOS", 656 "owner": "NixOS",
636 "repo": "nixpkgs", 657 "repo": "nixpkgs",
637 "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", 658 "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
638 "type": "github" 659 "type": "github"
639 }, 660 },
640 "original": { 661 "original": {
@@ -678,11 +699,11 @@
678 }, 699 },
679 "nixpkgs_2": { 700 "nixpkgs_2": {
680 "locked": { 701 "locked": {
681 "lastModified": 1743095683, 702 "lastModified": 1744463964,
682 "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", 703 "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
683 "owner": "NixOS", 704 "owner": "NixOS",
684 "repo": "nixpkgs", 705 "repo": "nixpkgs",
685 "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", 706 "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
686 "type": "github" 707 "type": "github"
687 }, 708 },
688 "original": { 709 "original": {
@@ -748,11 +769,11 @@
748 "treefmt-nix": "treefmt-nix" 769 "treefmt-nix": "treefmt-nix"
749 }, 770 },
750 "locked": { 771 "locked": {
751 "lastModified": 1742397518, 772 "lastModified": 1743690424,
752 "narHash": "sha256-nzgO/ZCSBzWjbMkYDxG+yl9Z2eGbCgQu06Oku3ir5D4=", 773 "narHash": "sha256-cX98bUuKuihOaRp8dNV1Mq7u6/CQZWTPth2IJPATBXc=",
753 "owner": "nix-community", 774 "owner": "nix-community",
754 "repo": "poetry2nix", 775 "repo": "poetry2nix",
755 "rev": "b9a98080beff0903a5e5fe431f42cde1e3e50d6b", 776 "rev": "ce2369db77f45688172384bbeb962bc6c2ea6f94",
756 "type": "github" 777 "type": "github"
757 }, 778 },
758 "original": { 779 "original": {
@@ -871,6 +892,7 @@
871 "impermanence": "impermanence", 892 "impermanence": "impermanence",
872 "niri-flake": "niri-flake", 893 "niri-flake": "niri-flake",
873 "nix-index-database": "nix-index-database", 894 "nix-index-database": "nix-index-database",
895 "nix-monitored": "nix-monitored",
874 "nixVirt": "nixVirt", 896 "nixVirt": "nixVirt",
875 "nixos-hardware": "nixos-hardware", 897 "nixos-hardware": "nixos-hardware",
876 "nixpkgs": "nixpkgs_2", 898 "nixpkgs": "nixpkgs_2",
@@ -891,11 +913,11 @@
891 ] 913 ]
892 }, 914 },
893 "locked": { 915 "locked": {
894 "lastModified": 1743305778, 916 "lastModified": 1744518500,
895 "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", 917 "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=",
896 "owner": "Mic92", 918 "owner": "Mic92",
897 "repo": "sops-nix", 919 "repo": "sops-nix",
898 "rev": "8e873886bbfc32163fe027b8676c75637b7da114", 920 "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388",
899 "type": "github" 921 "type": "github"
900 }, 922 },
901 "original": { 923 "original": {
@@ -1000,11 +1022,11 @@
1000 "xwayland-satellite-unstable": { 1022 "xwayland-satellite-unstable": {
1001 "flake": false, 1023 "flake": false,
1002 "locked": { 1024 "locked": {
1003 "lastModified": 1742773235, 1025 "lastModified": 1743346993,
1004 "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", 1026 "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=",
1005 "owner": "Supreeeme", 1027 "owner": "Supreeeme",
1006 "repo": "xwayland-satellite", 1028 "repo": "xwayland-satellite",
1007 "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", 1029 "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3",
1008 "type": "github" 1030 "type": "github"
1009 }, 1031 },
1010 "original": { 1032 "original": {
diff --git a/flake.nix b/flake.nix
index 1cc9782c..116aed21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -194,6 +194,15 @@
194 # niri-unstable.url = "github:gkleen/niri"; 194 # niri-unstable.url = "github:gkleen/niri";
195 }; 195 };
196 }; 196 };
197 nix-monitored = {
198 type = "github";
199 owner = "ners";
200 repo = "nix-monitored";
201 ref = "master";
202 inputs = {
203 nixpkgs.follows = "nixpkgs";
204 };
205 };
197 }; 206 };
198 207
199 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs: 208 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs:
@@ -378,6 +387,6 @@
378 filterEnabled = attrs: mapAttrs (_n: v: filterAttrs (n: _v: n != "enabled") v) (filterAttrs (_n: v: v.enabled or true) attrs); 387 filterEnabled = attrs: mapAttrs (_n: v: filterAttrs (n: _v: n != "enabled") v) (filterAttrs (_n: v: v.enabled or true) attrs);
379 in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides)); 388 in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides));
380 389
381 checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; 390 # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
382 }; 391 };
383} 392}
diff --git a/overlays/deploy-rs.nix b/overlays/deploy-rs.nix
new file mode 100644
index 00000000..0bf1c3b2
--- /dev/null
+++ b/overlays/deploy-rs.nix
@@ -0,0 +1,14 @@
1{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions
2 flakeInputs.deploy-rs.overlays.default
3 (final: prev: {
4 deploy-rs = prev.deploy-rs // {
5 deploy-rs = prev.deploy-rs.deploy-rs.overrideAttrs (oldAttrs: {
6 nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [final.makeWrapper];
7 preFixup = ''
8 wrapProgram $out/bin/deploy \
9 --prefix PATH : ${prev.lib.makeBinPath (with final; [ nix-monitored ])}
10 '';
11 });
12 };
13 })
14 final prev
diff --git a/overlays/nix-monitored.nix b/overlays/nix-monitored.nix
new file mode 100644
index 00000000..9f6caff1
--- /dev/null
+++ b/overlays/nix-monitored.nix
@@ -0,0 +1,8 @@
1{ final, prev, flakeInputs, ... }: prev.lib.composeExtensions
2 flakeInputs.nix-monitored.overlays.default
3 (final: prev: {
4 nix-monitored = prev.nix-monitored.override {
5 withNotify = false;
6 };
7 })
8 final prev
diff --git a/overlays/scutiger.nix b/overlays/scutiger.nix
index 7a56adaf..b00b34a4 100644
--- a/overlays/scutiger.nix
+++ b/overlays/scutiger.nix
@@ -2,7 +2,7 @@
2 scutiger = final.rustPlatform.buildRustPackage { 2 scutiger = final.rustPlatform.buildRustPackage {
3 inherit (sources.scutiger) pname version src; 3 inherit (sources.scutiger) pname version src;
4 4
5 cargoHash = "sha256-d+wJ3trrldCVATsudsbglElU6q4LaS6feRocRyHal2k="; 5 cargoHash = "sha256-FTAEmRuO95ii84uwaALVuImiymnSAQkB2UwZ5yX0WPs=";
6 6
7 nativeBuildInputs = with final; [ pkg-config pcre2.dev zlib.dev git ]; 7 nativeBuildInputs = with final; [ pkg-config pcre2.dev zlib.dev git ];
8 }; 8 };
diff --git a/overlays/swayosd/default.nix b/overlays/swayosd/default.nix
index 2a3a0f2b..b535f7f9 100644
--- a/overlays/swayosd/default.nix
+++ b/overlays/swayosd/default.nix
@@ -1,10 +1,10 @@
1{ final, prev, sources, ... }: { 1{ final, prev, sources, ... }: {
2 swayosd = prev.swayosd.overrideAttrs (oldAttrs: rec { 2 swayosd = prev.swayosd.overrideAttrs (oldAttrs: rec {
3 inherit (sources.swayosd) version src; 3 inherit (sources.swayosd) version src;
4 cargoDeps = prev.rustPlatform.fetchCargoTarball { 4 cargoDeps = prev.rustPlatform.fetchCargoVendor {
5 inherit (oldAttrs) pname; 5 inherit (oldAttrs) pname;
6 inherit version src; 6 inherit version src;
7 hash = "sha256-s2vgyQP6J3i0q2o/Tt8dYoamBH3vrI/FNJYteHO8v5Q="; 7 hash = "sha256-b5Ei6k9p/KiyiSSl5zxDXrTgGAq24O5ll0BvyJ/41F8=";
8 }; 8 };
9 patches = (oldAttrs.patches or []) ++ [ 9 patches = (oldAttrs.patches or []) ++ [
10 ./exponential.patch 10 ./exponential.patch
diff --git a/overlays/thunderbird.nix b/overlays/thunderbird.nix
deleted file mode 100644
index 48ae2ccb..00000000
--- a/overlays/thunderbird.nix
+++ /dev/null
@@ -1,11 +0,0 @@
1{ final, prev, ... }: {
2 thunderbird-unwrapped = prev.thunderbird-unwrapped.overrideAttrs (oldAttrs: {
3 patches = (oldAttrs.patches or [])
4 ++ prev.lib.optional (prev.lib.versionAtLeast oldAttrs.version "136") (prev.fetchpatch {
5 url = "https://hg.mozilla.org/comm-central/raw-rev/a82bd8fc0bc0";
6 hash = "sha256-7t8IqxwcZJqXmOevpGof1mcrFKZvXtCcY2EOIsP47EY=";
7 stripLen = 1;
8 extraPrefix = "comm/";
9 });
10 });
11}
diff --git a/shell.nix b/shell.nix
index 5bcb8180..b6059799 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,4 @@
1inputs@{ system, self, deploy-rs, nvfetcher, nixpkgs, ca-util, ... }: 1inputs@{ system, self, nvfetcher, nixpkgs, ca-util, ... }:
2let 2let
3 pkgs = self.legacyPackages.${system}; 3 pkgs = self.legacyPackages.${system};
4 utils = import ./utils { inherit (nixpkgs) lib; }; 4 utils = import ./utils { inherit (nixpkgs) lib; };
@@ -9,7 +9,7 @@ in pkgs.mkShell {
9 wireguard-tools 9 wireguard-tools
10 gup 10 gup
11 nftables 11 nftables
12 deploy-rs.packages.${system}.deploy-rs 12 deploy-rs.deploy-rs
13 knot-dns 13 knot-dns
14 yq 14 yq
15 nvfetcher.packages.${system}.default 15 nvfetcher.packages.${system}.default
diff --git a/user-profiles/direnv.nix b/user-profiles/direnv.nix
index 7887d765..3cc1af3e 100644
--- a/user-profiles/direnv.nix
+++ b/user-profiles/direnv.nix
@@ -1,9 +1,14 @@
1{ userName, ... }: 1{ userName, pkgs, ... }:
2{ 2{
3 home-manager.users.${userName} = { 3 home-manager.users.${userName} = {
4 programs.direnv = { 4 programs.direnv = {
5 enable = true; 5 enable = true;
6 nix-direnv.enable = true; 6 nix-direnv = {
7 enable = true;
8 package = pkgs.nix-direnv.override {
9 nix = pkgs.nix-monitored;
10 };
11 };
7 }; 12 };
8 }; 13 };
9} 14}
diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix
index 456f0ace..ef0be87e 100644
--- a/user-profiles/yt-dlp.nix
+++ b/user-profiles/yt-dlp.nix
@@ -28,7 +28,7 @@
28 # "youtube:formats=dashy" 28 # "youtube:formats=dashy"
29 # ]; 29 # ];
30 remux-video = "mp4>mkv"; 30 remux-video = "mp4>mkv";
31 output = lib.mkDefault "\"(modified_date>%Y%m%d,release_date>%Y%m%d,upload_date>%Y%m%d) s%(title)s [%(uploader)s %(webpage_url)s].%(ext)s\""; 31 output = lib.mkDefault "\"%(modified_date>%Y%m%d,release_date>%Y%m%d,upload_date>%Y%m%d)s %(title)s [%(uploader)s %(webpage_url)s].%(ext)s\"";
32 }; 32 };
33 }; 33 };
34 }; 34 };
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-16 00:29:53 +0000