summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_sources/generated.json20
-rw-r--r--_sources/generated.nix20
-rw-r--r--flake.lock150
-rw-r--r--hosts/sif/default.nix13
-rw-r--r--hosts/surtr/prometheus/default.nix2
-rw-r--r--hosts/surtr/vpn/default.nix1
-rw-r--r--hosts/vidhar/default.nix2
-rw-r--r--hosts/vidhar/prometheus/default.nix2
-rw-r--r--hosts/vidhar/samba.nix32
-rw-r--r--overlays/waybar.nix9
-rw-r--r--system-profiles/bcachefs.nix5
-rw-r--r--system-profiles/networkmanager.nix4
-rw-r--r--system-profiles/zfs.nix9
13 files changed, 110 insertions, 159 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index 0c6662c8..d27b0387 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -28,11 +28,11 @@
28 "passthru": null, 28 "passthru": null,
29 "pinned": false, 29 "pinned": false,
30 "src": { 30 "src": {
31 "sha256": "sha256-0qcs0Cuq72u6yVa5aEtdMC9SpfiwN9HPC6szERT3TJI=", 31 "sha256": "sha256-NHwYD3gWxXg5UC03uLk8o30rI9YvBoE8yFydHGEPK7s=",
32 "type": "tarball", 32 "type": "tarball",
33 "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.2.tar.gz" 33 "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.3.tar.gz"
34 }, 34 },
35 "version": "2024.2" 35 "version": "2024.3"
36 }, 36 },
37 "bpf-examples": { 37 "bpf-examples": {
38 "cargoLocks": null, 38 "cargoLocks": null,
@@ -105,11 +105,11 @@
105 "passthru": null, 105 "passthru": null,
106 "pinned": false, 106 "pinned": false,
107 "src": { 107 "src": {
108 "sha256": "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=", 108 "sha256": "sha256-k8i+UQjj5fxV7tj+zfw7cl8d6pZ9DDokRsVgcIc3wqI=",
109 "type": "tarball", 109 "type": "tarball",
110 "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.14.tar.gz" 110 "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.15.tar.gz"
111 }, 111 },
112 "version": "2.14" 112 "version": "2.15"
113 }, 113 },
114 "mpv-autosave": { 114 "mpv-autosave": {
115 "cargoLocks": null, 115 "cargoLocks": null,
@@ -367,7 +367,7 @@
367 }, 367 },
368 "v4l2loopback": { 368 "v4l2loopback": {
369 "cargoLocks": null, 369 "cargoLocks": null,
370 "date": "2024-05-24", 370 "date": "2024-09-12",
371 "extract": null, 371 "extract": null,
372 "name": "v4l2loopback", 372 "name": "v4l2loopback",
373 "passthru": null, 373 "passthru": null,
@@ -379,12 +379,12 @@
379 "name": null, 379 "name": null,
380 "owner": "umlaeute", 380 "owner": "umlaeute",
381 "repo": "v4l2loopback", 381 "repo": "v4l2loopback",
382 "rev": "2d44c2f3a33844dfd9928dc536288283289bbc34", 382 "rev": "e34bc188f1099b82b76352df017ae4f6f37c20ea",
383 "sha256": "sha256-6YWF1zM9glDTnJNVxlNWWqqkD0Z6sNscOoGTJsU6iCQ=", 383 "sha256": "sha256-PnqpGhUfLpPvXDMH1h/9qH6or//LObGl4SKgm4i2Md8=",
384 "sparseCheckout": [], 384 "sparseCheckout": [],
385 "type": "github" 385 "type": "github"
386 }, 386 },
387 "version": "2d44c2f3a33844dfd9928dc536288283289bbc34" 387 "version": "e34bc188f1099b82b76352df017ae4f6f37c20ea"
388 }, 388 },
389 "xcompose": { 389 "xcompose": {
390 "cargoLocks": null, 390 "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 8c3074ab..edd35298 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -18,10 +18,10 @@
18 }; 18 };
19 batman-adv = { 19 batman-adv = {
20 pname = "batman-adv"; 20 pname = "batman-adv";
21 version = "2024.2"; 21 version = "2024.3";
22 src = fetchTarball { 22 src = fetchTarball {
23 url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.2.tar.gz"; 23 url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2024.3.tar.gz";
24 sha256 = "sha256-0qcs0Cuq72u6yVa5aEtdMC9SpfiwN9HPC6szERT3TJI="; 24 sha256 = "sha256-NHwYD3gWxXg5UC03uLk8o30rI9YvBoE8yFydHGEPK7s=";
25 }; 25 };
26 }; 26 };
27 bpf-examples = { 27 bpf-examples = {
@@ -61,10 +61,10 @@
61 }; 61 };
62 lesspipe = { 62 lesspipe = {
63 pname = "lesspipe"; 63 pname = "lesspipe";
64 version = "2.14"; 64 version = "2.15";
65 src = fetchTarball { 65 src = fetchTarball {
66 url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.14.tar.gz"; 66 url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.15.tar.gz";
67 sha256 = "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc="; 67 sha256 = "sha256-k8i+UQjj5fxV7tj+zfw7cl8d6pZ9DDokRsVgcIc3wqI=";
68 }; 68 };
69 }; 69 };
70 mpv-autosave = { 70 mpv-autosave = {
@@ -226,15 +226,15 @@
226 }; 226 };
227 v4l2loopback = { 227 v4l2loopback = {
228 pname = "v4l2loopback"; 228 pname = "v4l2loopback";
229 version = "2d44c2f3a33844dfd9928dc536288283289bbc34"; 229 version = "e34bc188f1099b82b76352df017ae4f6f37c20ea";
230 src = fetchFromGitHub { 230 src = fetchFromGitHub {
231 owner = "umlaeute"; 231 owner = "umlaeute";
232 repo = "v4l2loopback"; 232 repo = "v4l2loopback";
233 rev = "2d44c2f3a33844dfd9928dc536288283289bbc34"; 233 rev = "e34bc188f1099b82b76352df017ae4f6f37c20ea";
234 fetchSubmodules = true; 234 fetchSubmodules = true;
235 sha256 = "sha256-6YWF1zM9glDTnJNVxlNWWqqkD0Z6sNscOoGTJsU6iCQ="; 235 sha256 = "sha256-PnqpGhUfLpPvXDMH1h/9qH6or//LObGl4SKgm4i2Md8=";
236 }; 236 };
237 date = "2024-05-24"; 237 date = "2024-09-12";
238 }; 238 };
239 xcompose = { 239 xcompose = {
240 pname = "xcompose"; 240 pname = "xcompose";
diff --git a/flake.lock b/flake.lock
index df28d666..2158ef8d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -66,11 +66,11 @@
66 ] 66 ]
67 }, 67 },
68 "locked": { 68 "locked": {
69 "lastModified": 1718194053, 69 "lastModified": 1727447169,
70 "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", 70 "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
71 "owner": "serokell", 71 "owner": "serokell",
72 "repo": "deploy-rs", 72 "repo": "deploy-rs",
73 "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", 73 "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
74 "type": "github" 74 "type": "github"
75 }, 75 },
76 "original": { 76 "original": {
@@ -99,11 +99,11 @@
99 "flake-compat_2": { 99 "flake-compat_2": {
100 "flake": false, 100 "flake": false,
101 "locked": { 101 "locked": {
102 "lastModified": 1673956053, 102 "lastModified": 1696426674,
103 "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", 103 "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
104 "owner": "edolstra", 104 "owner": "edolstra",
105 "repo": "flake-compat", 105 "repo": "flake-compat",
106 "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", 106 "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
107 "type": "github" 107 "type": "github"
108 }, 108 },
109 "original": { 109 "original": {
@@ -168,11 +168,11 @@
168 "nixpkgs-lib": "nixpkgs-lib_2" 168 "nixpkgs-lib": "nixpkgs-lib_2"
169 }, 169 },
170 "locked": { 170 "locked": {
171 "lastModified": 1690933134, 171 "lastModified": 1726153070,
172 "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", 172 "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
173 "owner": "hercules-ci", 173 "owner": "hercules-ci",
174 "repo": "flake-parts", 174 "repo": "flake-parts",
175 "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", 175 "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
176 "type": "github" 176 "type": "github"
177 }, 177 },
178 "original": { 178 "original": {
@@ -220,29 +220,11 @@
220 "systems": "systems" 220 "systems": "systems"
221 }, 221 },
222 "locked": { 222 "locked": {
223 "lastModified": 1685518550, 223 "lastModified": 1726560853,
224 "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", 224 "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
225 "owner": "numtide",
226 "repo": "flake-utils",
227 "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
228 "type": "github"
229 },
230 "original": {
231 "owner": "numtide",
232 "repo": "flake-utils",
233 "type": "github"
234 }
235 },
236 "flake-utils_2": {
237 "inputs": {
238 "systems": "systems_2"
239 },
240 "locked": {
241 "lastModified": 1710146030,
242 "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
243 "owner": "numtide", 225 "owner": "numtide",
244 "repo": "flake-utils", 226 "repo": "flake-utils",
245 "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", 227 "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
246 "type": "github" 228 "type": "github"
247 }, 229 },
248 "original": { 230 "original": {
@@ -252,7 +234,7 @@
252 "type": "github" 234 "type": "github"
253 } 235 }
254 }, 236 },
255 "flake-utils_3": { 237 "flake-utils_2": {
256 "locked": { 238 "locked": {
257 "lastModified": 1667395993, 239 "lastModified": 1667395993,
258 "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", 240 "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@@ -298,11 +280,11 @@
298 ] 280 ]
299 }, 281 },
300 "locked": { 282 "locked": {
301 "lastModified": 1660459072, 283 "lastModified": 1709087332,
302 "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", 284 "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
303 "owner": "hercules-ci", 285 "owner": "hercules-ci",
304 "repo": "gitignore.nix", 286 "repo": "gitignore.nix",
305 "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", 287 "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
306 "type": "github" 288 "type": "github"
307 }, 289 },
308 "original": { 290 "original": {
@@ -377,11 +359,11 @@
377 }, 359 },
378 "impermanence": { 360 "impermanence": {
379 "locked": { 361 "locked": {
380 "lastModified": 1725690722, 362 "lastModified": 1729068498,
381 "narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=", 363 "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
382 "owner": "nix-community", 364 "owner": "nix-community",
383 "repo": "impermanence", 365 "repo": "impermanence",
384 "rev": "63f4d0443e32b0dd7189001ee1894066765d18a5", 366 "rev": "e337457502571b23e449bf42153d7faa10c0a562",
385 "type": "github" 367 "type": "github"
386 }, 368 },
387 "original": { 369 "original": {
@@ -411,11 +393,11 @@
411 ] 393 ]
412 }, 394 },
413 "locked": { 395 "locked": {
414 "lastModified": 1703863825, 396 "lastModified": 1720066371,
415 "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", 397 "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
416 "owner": "nix-community", 398 "owner": "nix-community",
417 "repo": "nix-github-actions", 399 "repo": "nix-github-actions",
418 "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", 400 "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
419 "type": "github" 401 "type": "github"
420 }, 402 },
421 "original": { 403 "original": {
@@ -431,11 +413,11 @@
431 ] 413 ]
432 }, 414 },
433 "locked": { 415 "locked": {
434 "lastModified": 1725765290, 416 "lastModified": 1729394935,
435 "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", 417 "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=",
436 "owner": "Mic92", 418 "owner": "Mic92",
437 "repo": "nix-index-database", 419 "repo": "nix-index-database",
438 "rev": "642275444c5a9defce57219c944b3179bf2adaa9", 420 "rev": "04f8a11f247ba00263b060fbcdc95484fd046104",
439 "type": "github" 421 "type": "github"
440 }, 422 },
441 "original": { 423 "original": {
@@ -467,11 +449,11 @@
467 }, 449 },
468 "nixos-hardware": { 450 "nixos-hardware": {
469 "locked": { 451 "locked": {
470 "lastModified": 1725885300, 452 "lastModified": 1729417461,
471 "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", 453 "narHash": "sha256-p0j/sUs7noqZw0W+SEuZXskzOfgOH7yY80ksIM0fCi4=",
472 "owner": "NixOS", 454 "owner": "NixOS",
473 "repo": "nixos-hardware", 455 "repo": "nixos-hardware",
474 "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", 456 "rev": "8f38d8a4754cf673c2609c4ed399630db87e678b",
475 "type": "github" 457 "type": "github"
476 }, 458 },
477 "original": { 459 "original": {
@@ -527,20 +509,14 @@
527 }, 509 },
528 "nixpkgs-lib_2": { 510 "nixpkgs-lib_2": {
529 "locked": { 511 "locked": {
530 "dir": "lib", 512 "lastModified": 1725233747,
531 "lastModified": 1690881714, 513 "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
532 "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", 514 "type": "tarball",
533 "owner": "NixOS", 515 "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
534 "repo": "nixpkgs",
535 "rev": "9e1960bc196baf6881340d53dccb203a951745a2",
536 "type": "github"
537 }, 516 },
538 "original": { 517 "original": {
539 "dir": "lib", 518 "type": "tarball",
540 "owner": "NixOS", 519 "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
541 "ref": "nixos-unstable",
542 "repo": "nixpkgs",
543 "type": "github"
544 } 520 }
545 }, 521 },
546 "nixpkgs-lib_3": { 522 "nixpkgs-lib_3": {
@@ -643,11 +619,11 @@
643 }, 619 },
644 "nixpkgs_2": { 620 "nixpkgs_2": {
645 "locked": { 621 "locked": {
646 "lastModified": 1725634671, 622 "lastModified": 1729256560,
647 "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", 623 "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
648 "owner": "NixOS", 624 "owner": "NixOS",
649 "repo": "nixpkgs", 625 "repo": "nixpkgs",
650 "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", 626 "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
651 "type": "github" 627 "type": "github"
652 }, 628 },
653 "original": { 629 "original": {
@@ -709,15 +685,15 @@
709 "nixpkgs": [ 685 "nixpkgs": [
710 "nixpkgs" 686 "nixpkgs"
711 ], 687 ],
712 "systems": "systems_3", 688 "systems": "systems_2",
713 "treefmt-nix": "treefmt-nix" 689 "treefmt-nix": "treefmt-nix"
714 }, 690 },
715 "locked": { 691 "locked": {
716 "lastModified": 1725532428, 692 "lastModified": 1729173771,
717 "narHash": "sha256-dCfawQDwpukcwQw++Cn/3LIh/RZMmH+k3fm91Oc5Pf0=", 693 "narHash": "sha256-rT2Vz1kFSj+NKHetVY7PJUACX+qBETdnuPSklzFKCsc=",
718 "owner": "nix-community", 694 "owner": "nix-community",
719 "repo": "poetry2nix", 695 "repo": "poetry2nix",
720 "rev": "a313fd7169ae43ecd1a2ea2f1e4899fe3edba4d2", 696 "rev": "e67cc181b5bdf5aa46f1340fa9acd3910f6fb122",
721 "type": "github" 697 "type": "github"
722 }, 698 },
723 "original": { 699 "original": {
@@ -751,7 +727,6 @@
751 "pre-commit-hooks-nix_2": { 727 "pre-commit-hooks-nix_2": {
752 "inputs": { 728 "inputs": {
753 "flake-compat": "flake-compat_2", 729 "flake-compat": "flake-compat_2",
754 "flake-utils": "flake-utils",
755 "gitignore": "gitignore_2", 730 "gitignore": "gitignore_2",
756 "nixpkgs": [ 731 "nixpkgs": [
757 "ca-util", 732 "ca-util",
@@ -763,11 +738,11 @@
763 ] 738 ]
764 }, 739 },
765 "locked": { 740 "locked": {
766 "lastModified": 1691256628, 741 "lastModified": 1726745158,
767 "narHash": "sha256-M0YXHemR3zbyhM7PvJa5lzGhWVf6kM/fpZ4cWe/VIhI=", 742 "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
768 "owner": "cachix", 743 "owner": "cachix",
769 "repo": "pre-commit-hooks.nix", 744 "repo": "pre-commit-hooks.nix",
770 "rev": "3139c4d1f7732cab89f06492bdd4677b877e3785", 745 "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
771 "type": "github" 746 "type": "github"
772 }, 747 },
773 "original": { 748 "original": {
@@ -779,7 +754,7 @@
779 "pre-commit-hooks-nix_3": { 754 "pre-commit-hooks-nix_3": {
780 "inputs": { 755 "inputs": {
781 "flake-compat": "flake-compat_4", 756 "flake-compat": "flake-compat_4",
782 "flake-utils": "flake-utils_3", 757 "flake-utils": "flake-utils_2",
783 "gitignore": "gitignore_3", 758 "gitignore": "gitignore_3",
784 "nixpkgs": "nixpkgs_3", 759 "nixpkgs": "nixpkgs_3",
785 "nixpkgs-stable": "nixpkgs-stable_3" 760 "nixpkgs-stable": "nixpkgs-stable_3"
@@ -831,7 +806,7 @@
831 "deploy-rs": "deploy-rs", 806 "deploy-rs": "deploy-rs",
832 "flake-compat": "flake-compat_3", 807 "flake-compat": "flake-compat_3",
833 "flake-registry": "flake-registry", 808 "flake-registry": "flake-registry",
834 "flake-utils": "flake-utils_2", 809 "flake-utils": "flake-utils",
835 "home-manager": "home-manager", 810 "home-manager": "home-manager",
836 "home-manager-eostre": "home-manager-eostre", 811 "home-manager-eostre": "home-manager-eostre",
837 "impermanence": "impermanence", 812 "impermanence": "impermanence",
@@ -859,11 +834,11 @@
859 ] 834 ]
860 }, 835 },
861 "locked": { 836 "locked": {
862 "lastModified": 1725922448, 837 "lastModified": 1729394972,
863 "narHash": "sha256-ruvh8tlEflRPifs5tlpa0gkttzq4UtgXkJQS7FusgFE=", 838 "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
864 "owner": "Mic92", 839 "owner": "Mic92",
865 "repo": "sops-nix", 840 "repo": "sops-nix",
866 "rev": "cede1a08039178ac12957733e97ab1006c6b6892", 841 "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
867 "type": "github" 842 "type": "github"
868 }, 843 },
869 "original": { 844 "original": {
@@ -898,21 +873,6 @@
898 "type": "github" 873 "type": "github"
899 }, 874 },
900 "original": { 875 "original": {
901 "owner": "nix-systems",
902 "repo": "default",
903 "type": "github"
904 }
905 },
906 "systems_3": {
907 "locked": {
908 "lastModified": 1681028828,
909 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
910 "owner": "nix-systems",
911 "repo": "default",
912 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
913 "type": "github"
914 },
915 "original": {
916 "id": "systems", 876 "id": "systems",
917 "type": "indirect" 877 "type": "indirect"
918 } 878 }
@@ -925,11 +885,11 @@
925 ] 885 ]
926 }, 886 },
927 "locked": { 887 "locked": {
928 "lastModified": 1719749022, 888 "lastModified": 1727984844,
929 "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", 889 "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
930 "owner": "numtide", 890 "owner": "numtide",
931 "repo": "treefmt-nix", 891 "repo": "treefmt-nix",
932 "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", 892 "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
933 "type": "github" 893 "type": "github"
934 }, 894 },
935 "original": { 895 "original": {
@@ -948,11 +908,11 @@
948 ] 908 ]
949 }, 909 },
950 "locked": { 910 "locked": {
951 "lastModified": 1724184562, 911 "lastModified": 1726229884,
952 "narHash": "sha256-qCfALJV/Q895MsUBdGa1cHUodaUFOzww4jcGiXTuFw4=", 912 "narHash": "sha256-Yaii3DHMwNNfZK+G9BomA8yXPKWFb6jtYcARHg0zkSo=",
953 "owner": "gkleen", 913 "owner": "gkleen",
954 "repo": "Waybar", 914 "repo": "Waybar",
955 "rev": "e883333d19da8f577b0ad37d1c3a28784ff2539f", 915 "rev": "7cedd9cd55e1b14f69e2889ccb66dd87b0ce57d1",
956 "type": "github" 916 "type": "github"
957 }, 917 },
958 "original": { 918 "original": {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index e81205b3..e71ee4ec 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -646,19 +646,6 @@ in {
646 environment.sessionVariables."GTK_USE_PORTAL" = "1"; 646 environment.sessionVariables."GTK_USE_PORTAL" = "1";
647 xdg.portal = { 647 xdg.portal = {
648 enable = true; 648 enable = true;
649 # gtkUsePortal = true;
650 config.preferred.default = "gtk";
651 extraPortals = let
652 gtk-portal = pkgs.xdg-desktop-portal-gtk.overrideAttrs (oldAttrs: {
653 postFixup = ''
654 ${oldAttrs.postFixup or ""}
655
656 ${pkgs.gnused}/bin/sed -ri \
657 's|UseIn=gnome|UseIn=gnome;none+xmonad|' \
658 $out/share/xdg-desktop-portal/portals/gtk.portal
659 '';
660 });
661 in [ gtk-portal ];
662 }; 649 };
663 650
664 environment.persistence."/.bcachefs" = { 651 environment.persistence."/.bcachefs" = {
diff --git a/hosts/surtr/prometheus/default.nix b/hosts/surtr/prometheus/default.nix
index 0f0cf586..5a58aa92 100644
--- a/hosts/surtr/prometheus/default.nix
+++ b/hosts/surtr/prometheus/default.nix
@@ -22,7 +22,7 @@ in {
22 }; 22 };
23 unbound = { 23 unbound = {
24 enable = true; 24 enable = true;
25 controlInterface = "/run/unbound/unbound.ctl"; 25 unbound.host = "unix:///run/unbound/unbound.ctl";
26 group = config.services.unbound.group; 26 group = config.services.unbound.group;
27 }; 27 };
28 wireguard = { 28 wireguard = {
diff --git a/hosts/surtr/vpn/default.nix b/hosts/surtr/vpn/default.nix
index 3f7483bd..1bdcf74e 100644
--- a/hosts/surtr/vpn/default.nix
+++ b/hosts/surtr/vpn/default.nix
@@ -34,7 +34,6 @@ in {
34 }; 34 };
35 35
36 environment = { 36 environment = {
37 noXlibs = true;
38 systemPackages = with pkgs; [ wireguard-tools ]; 37 systemPackages = with pkgs; [ wireguard-tools ];
39 }; 38 };
40 39
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index 78f305f8..42a9e80d 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -136,7 +136,7 @@ with lib;
136 wantedBy = ["basic.target"]; 136 wantedBy = ["basic.target"];
137 serviceConfig = { 137 serviceConfig = {
138 ExecStart = pkgs.writeShellScript "limit-pstate-start" '' 138 ExecStart = pkgs.writeShellScript "limit-pstate-start" ''
139 echo 80 > /sys/devices/system/cpu/intel_pstate/max_perf_pct 139 echo 60 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
140 ''; 140 '';
141 RemainAfterExit = true; 141 RemainAfterExit = true;
142 ExecStop = pkgs.writeShellScript "limit-pstate-stop" '' 142 ExecStop = pkgs.writeShellScript "limit-pstate-stop" ''
diff --git a/hosts/vidhar/prometheus/default.nix b/hosts/vidhar/prometheus/default.nix
index 3e938933..d368ad52 100644
--- a/hosts/vidhar/prometheus/default.nix
+++ b/hosts/vidhar/prometheus/default.nix
@@ -40,7 +40,7 @@ in {
40 }; 40 };
41 unbound = { 41 unbound = {
42 enable = true; 42 enable = true;
43 controlInterface = "/run/unbound/unbound.ctl"; 43 unbound.host = "unix:///run/unbound/unbound.ctl";
44 group = config.services.unbound.group; 44 group = config.services.unbound.group;
45 }; 45 };
46 wireguard = { 46 wireguard = {
diff --git a/hosts/vidhar/samba.nix b/hosts/vidhar/samba.nix
index 89d9f12e..58fd435c 100644
--- a/hosts/vidhar/samba.nix
+++ b/hosts/vidhar/samba.nix
@@ -3,22 +3,22 @@
3 config = { 3 config = {
4 services.samba = { 4 services.samba = {
5 enable = true; 5 enable = true;
6 securityType = "user"; 6 settings = {
7 extraConfig = '' 7 global = {
8 domain master = yes 8 security = "user";
9 workgroup = WORKGROUP 9 "domain master" = true;
10 load printers = no 10 workgroup = "WORKGROUP";
11 printing = bsd 11 "load printers" = false;
12 printcap name = /dev/null 12 printing = "bsd";
13 disable spoolss = yes 13 "printcap name" = "/dev/null";
14 guest account = nobody 14 "disable spoolss" = true;
15 bind interfaces only = yes 15 "guest account" = "nobody";
16 interfaces = lo lan 16 "bind interfaces only" = true;
17 server signing = mandatory 17 interfaces = ["lo" "lan"];
18 server min protocol = SMB3 18 "server signing" = "mandatory";
19 server smb encrypt = required 19 "server min protocol" = "SMB3";
20 ''; 20 "server smb encrypt" = "required";
21 shares = { 21 };
22 homes = { 22 homes = {
23 comment = "Home directory for %S"; 23 comment = "Home directory for %S";
24 path = "/home/%S"; 24 path = "/home/%S";
diff --git a/overlays/waybar.nix b/overlays/waybar.nix
index 20f37255..4a1e89a2 100644
--- a/overlays/waybar.nix
+++ b/overlays/waybar.nix
@@ -1,3 +1,10 @@
1{ final, prev, flakeInputs, ... }: 1{ final, prev, flakeInputs, ... }:
2 2
3flakeInputs.waybar.overlays.default final prev 3(prev.lib.composeExtensions
4 (final: prev: {
5 waybar = prev.waybar.overrideAttrs (oldAttrs: {
6 patches = [];
7 });
8 })
9 flakeInputs.waybar.overlays.default
10) final prev
diff --git a/system-profiles/bcachefs.nix b/system-profiles/bcachefs.nix
index 65de9f7e..f9f048b9 100644
--- a/system-profiles/bcachefs.nix
+++ b/system-profiles/bcachefs.nix
@@ -1,7 +1,6 @@
1{ config, pkgs, ... } : { 1{ pkgs, ... } : {
2 config = { 2 config = {
3 boot.supportedFilesystems = [ "bcachefs" ]; 3 boot.supportedFilesystems.bcachefs = true;
4
5 environment.systemPackages = with pkgs; [ bcachefs-tools ]; 4 environment.systemPackages = with pkgs; [ bcachefs-tools ];
6 }; 5 };
7} 6}
diff --git a/system-profiles/networkmanager.nix b/system-profiles/networkmanager.nix
index bc5fd5ff..335b5653 100644
--- a/system-profiles/networkmanager.nix
+++ b/system-profiles/networkmanager.nix
@@ -10,7 +10,7 @@ with lib;
10 dhcp = "internal"; 10 dhcp = "internal";
11 dns = mkForce "dnsmasq"; 11 dns = mkForce "dnsmasq";
12 logLevel = "INFO"; 12 logLevel = "INFO";
13 settings.connectivity.url = "https://online.yggdrasil.li"; 13 settings.connectivity.url = "https://online.yggdrasil.li";
14 }; 14 };
15 }; 15 };
16 16
@@ -18,7 +18,5 @@ with lib;
18 systemd.services."systemd-networkd-wait-online".enable = mkForce false; 18 systemd.services."systemd-networkd-wait-online".enable = mkForce false;
19 19
20 services.resolved.enable = false; 20 services.resolved.enable = false;
21
22 environment.noXlibs = false;
23 }; 21 };
24} 22}
diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix
index 148cbb7b..49386363 100644
--- a/system-profiles/zfs.nix
+++ b/system-profiles/zfs.nix
@@ -1,9 +1,10 @@
1{ config, pkgs, ... } : { 1{ pkgs, lib, ... } : {
2 config = { 2 config = {
3 boot = { 3 boot = {
4 kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; 4 kernelPackages = pkgs.linuxPackages_6_10;
5 supportedFilesystems = [ "zfs" ]; 5 zfs.package = pkgs.zfs_2_2;
6 zfs.package = pkgs.zfs_unstable; 6
7 supportedFilesystems.zfs = true;
7 }; 8 };
8 9
9 environment.systemPackages = with pkgs; [ httm ]; 10 environment.systemPackages = with pkgs; [ httm ];
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 06:03:14 +0000