diff options
Diffstat (limited to 'systems')
-rw-r--r-- | systems/dilion/flake.lock | 43 | ||||
-rw-r--r-- | systems/dilion/flake.nix | 2 | ||||
-rw-r--r-- | systems/eldiron/flake.lock | 233 | ||||
-rw-r--r-- | systems/eldiron/flake.nix | 4 | ||||
-rw-r--r-- | systems/eldiron/websites/tools/default.nix | 5 |
5 files changed, 117 insertions, 170 deletions
diff --git a/systems/dilion/flake.lock b/systems/dilion/flake.lock index 7301a99..b6aef70 100644 --- a/systems/dilion/flake.lock +++ b/systems/dilion/flake.lock | |||
@@ -92,18 +92,6 @@ | |||
92 | "type": "path" | 92 | "type": "path" |
93 | } | 93 | } |
94 | }, | 94 | }, |
95 | "environment_4": { | ||
96 | "locked": { | ||
97 | "lastModified": 1, | ||
98 | "narHash": "sha256-iW4Q8C1AR4i+Vm7KSaYUtXwTpVHCK0niGiZWnYboAtY=", | ||
99 | "path": "../environment", | ||
100 | "type": "path" | ||
101 | }, | ||
102 | "original": { | ||
103 | "path": "../environment", | ||
104 | "type": "path" | ||
105 | } | ||
106 | }, | ||
107 | "files-watcher": { | 95 | "files-watcher": { |
108 | "locked": { | 96 | "locked": { |
109 | "lastModified": 1, | 97 | "lastModified": 1, |
@@ -546,7 +534,6 @@ | |||
546 | "myuids": "myuids", | 534 | "myuids": "myuids", |
547 | "nixpkgs": "nixpkgs_5", | 535 | "nixpkgs": "nixpkgs_5", |
548 | "secrets": "secrets_2", | 536 | "secrets": "secrets_2", |
549 | "ssh": "ssh", | ||
550 | "system": "system" | 537 | "system": "system" |
551 | } | 538 | } |
552 | }, | 539 | }, |
@@ -586,34 +573,6 @@ | |||
586 | "type": "path" | 573 | "type": "path" |
587 | } | 574 | } |
588 | }, | 575 | }, |
589 | "secrets_3": { | ||
590 | "locked": { | ||
591 | "lastModified": 1, | ||
592 | "narHash": "sha256-5AakznhrJFmwCD7lr4JEh55MtdAJL6WA/YuBks6ISSE=", | ||
593 | "path": "../../secrets", | ||
594 | "type": "path" | ||
595 | }, | ||
596 | "original": { | ||
597 | "path": "../../secrets", | ||
598 | "type": "path" | ||
599 | } | ||
600 | }, | ||
601 | "ssh": { | ||
602 | "inputs": { | ||
603 | "environment": "environment_3", | ||
604 | "secrets": "secrets_3" | ||
605 | }, | ||
606 | "locked": { | ||
607 | "lastModified": 1, | ||
608 | "narHash": "sha256-NufDaV9j3eKqlJNs09lqytKDTuwjh4Wh78mOEyID05w=", | ||
609 | "path": "../../flakes/private/ssh", | ||
610 | "type": "path" | ||
611 | }, | ||
612 | "original": { | ||
613 | "path": "../../flakes/private/ssh", | ||
614 | "type": "path" | ||
615 | } | ||
616 | }, | ||
617 | "stable": { | 576 | "stable": { |
618 | "locked": { | 577 | "locked": { |
619 | "lastModified": 1669735802, | 578 | "lastModified": 1669735802, |
@@ -633,7 +592,7 @@ | |||
633 | "system": { | 592 | "system": { |
634 | "inputs": { | 593 | "inputs": { |
635 | "backports": "backports", | 594 | "backports": "backports", |
636 | "environment": "environment_4", | 595 | "environment": "environment_3", |
637 | "mypackages": "mypackages", | 596 | "mypackages": "mypackages", |
638 | "myuids": "myuids_2", | 597 | "myuids": "myuids_2", |
639 | "secrets-public": "secrets-public" | 598 | "secrets-public": "secrets-public" |
diff --git a/systems/dilion/flake.nix b/systems/dilion/flake.nix index 9747086..e4fc53f 100644 --- a/systems/dilion/flake.nix +++ b/systems/dilion/flake.nix | |||
@@ -5,7 +5,6 @@ | |||
5 | my-lib.url = "path:../../flakes/lib"; | 5 | my-lib.url = "path:../../flakes/lib"; |
6 | 6 | ||
7 | monitoring.url = "path:../../flakes/private/monitoring"; | 7 | monitoring.url = "path:../../flakes/private/monitoring"; |
8 | ssh.url = "path:../../flakes/private/ssh"; | ||
9 | environment.url = "path:../../flakes/private/environment"; | 8 | environment.url = "path:../../flakes/private/environment"; |
10 | system.url = "path:../../flakes/private/system"; | 9 | system.url = "path:../../flakes/private/system"; |
11 | 10 | ||
@@ -26,7 +25,6 @@ | |||
26 | system = inputs.system.nixosModule; | 25 | system = inputs.system.nixosModule; |
27 | monitoring = inputs.monitoring.nixosModule; | 26 | monitoring = inputs.monitoring.nixosModule; |
28 | environment = inputs.environment.nixosModule; | 27 | environment = inputs.environment.nixosModule; |
29 | ssh = inputs.ssh.nixosModule; | ||
30 | 28 | ||
31 | myuids = inputs.myuids.nixosModule; | 29 | myuids = inputs.myuids.nixosModule; |
32 | secrets = inputs.secrets.nixosModule; | 30 | secrets = inputs.secrets.nixosModule; |
diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock index 0573b0e..c52dd61 100644 --- a/systems/eldiron/flake.lock +++ b/systems/eldiron/flake.lock | |||
@@ -2,8 +2,8 @@ | |||
2 | "nodes": { | 2 | "nodes": { |
3 | "backports": { | 3 | "backports": { |
4 | "inputs": { | 4 | "inputs": { |
5 | "flake-utils": "flake-utils_12", | 5 | "flake-utils": "flake-utils_11", |
6 | "nixpkgs": "nixpkgs_15" | 6 | "nixpkgs": "nixpkgs_14" |
7 | }, | 7 | }, |
8 | "locked": { | 8 | "locked": { |
9 | "lastModified": 1, | 9 | "lastModified": 1, |
@@ -404,11 +404,11 @@ | |||
404 | }, | 404 | }, |
405 | "flake-utils_10": { | 405 | "flake-utils_10": { |
406 | "locked": { | 406 | "locked": { |
407 | "lastModified": 1610051610, | 407 | "lastModified": 1648297722, |
408 | "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", | 408 | "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", |
409 | "owner": "numtide", | 409 | "owner": "numtide", |
410 | "repo": "flake-utils", | 410 | "repo": "flake-utils", |
411 | "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", | 411 | "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", |
412 | "type": "github" | 412 | "type": "github" |
413 | }, | 413 | }, |
414 | "original": { | 414 | "original": { |
@@ -419,11 +419,11 @@ | |||
419 | }, | 419 | }, |
420 | "flake-utils_11": { | 420 | "flake-utils_11": { |
421 | "locked": { | 421 | "locked": { |
422 | "lastModified": 1648297722, | 422 | "lastModified": 1667395993, |
423 | "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", | 423 | "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", |
424 | "owner": "numtide", | 424 | "owner": "numtide", |
425 | "repo": "flake-utils", | 425 | "repo": "flake-utils", |
426 | "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", | 426 | "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", |
427 | "type": "github" | 427 | "type": "github" |
428 | }, | 428 | }, |
429 | "original": { | 429 | "original": { |
@@ -434,11 +434,11 @@ | |||
434 | }, | 434 | }, |
435 | "flake-utils_12": { | 435 | "flake-utils_12": { |
436 | "locked": { | 436 | "locked": { |
437 | "lastModified": 1667395993, | 437 | "lastModified": 1631561581, |
438 | "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", | 438 | "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", |
439 | "owner": "numtide", | 439 | "owner": "numtide", |
440 | "repo": "flake-utils", | 440 | "repo": "flake-utils", |
441 | "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", | 441 | "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", |
442 | "type": "github" | 442 | "type": "github" |
443 | }, | 443 | }, |
444 | "original": { | 444 | "original": { |
@@ -449,11 +449,11 @@ | |||
449 | }, | 449 | }, |
450 | "flake-utils_13": { | 450 | "flake-utils_13": { |
451 | "locked": { | 451 | "locked": { |
452 | "lastModified": 1631561581, | 452 | "lastModified": 1648297722, |
453 | "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", | 453 | "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", |
454 | "owner": "numtide", | 454 | "owner": "numtide", |
455 | "repo": "flake-utils", | 455 | "repo": "flake-utils", |
456 | "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", | 456 | "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", |
457 | "type": "github" | 457 | "type": "github" |
458 | }, | 458 | }, |
459 | "original": { | 459 | "original": { |
@@ -509,11 +509,11 @@ | |||
509 | }, | 509 | }, |
510 | "flake-utils_17": { | 510 | "flake-utils_17": { |
511 | "locked": { | 511 | "locked": { |
512 | "lastModified": 1648297722, | 512 | "lastModified": 1649676176, |
513 | "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", | 513 | "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", |
514 | "owner": "numtide", | 514 | "owner": "numtide", |
515 | "repo": "flake-utils", | 515 | "repo": "flake-utils", |
516 | "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", | 516 | "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", |
517 | "type": "github" | 517 | "type": "github" |
518 | }, | 518 | }, |
519 | "original": { | 519 | "original": { |
@@ -524,11 +524,11 @@ | |||
524 | }, | 524 | }, |
525 | "flake-utils_18": { | 525 | "flake-utils_18": { |
526 | "locked": { | 526 | "locked": { |
527 | "lastModified": 1649676176, | 527 | "lastModified": 1609246779, |
528 | "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", | 528 | "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", |
529 | "owner": "numtide", | 529 | "owner": "numtide", |
530 | "repo": "flake-utils", | 530 | "repo": "flake-utils", |
531 | "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", | 531 | "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", |
532 | "type": "github" | 532 | "type": "github" |
533 | }, | 533 | }, |
534 | "original": { | 534 | "original": { |
@@ -569,11 +569,11 @@ | |||
569 | }, | 569 | }, |
570 | "flake-utils_20": { | 570 | "flake-utils_20": { |
571 | "locked": { | 571 | "locked": { |
572 | "lastModified": 1609246779, | 572 | "lastModified": 1631561581, |
573 | "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", | 573 | "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", |
574 | "owner": "numtide", | 574 | "owner": "numtide", |
575 | "repo": "flake-utils", | 575 | "repo": "flake-utils", |
576 | "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", | 576 | "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", |
577 | "type": "github" | 577 | "type": "github" |
578 | }, | 578 | }, |
579 | "original": { | 579 | "original": { |
@@ -704,11 +704,11 @@ | |||
704 | }, | 704 | }, |
705 | "flake-utils_8": { | 705 | "flake-utils_8": { |
706 | "locked": { | 706 | "locked": { |
707 | "lastModified": 1631561581, | 707 | "lastModified": 1610051610, |
708 | "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", | 708 | "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", |
709 | "owner": "numtide", | 709 | "owner": "numtide", |
710 | "repo": "flake-utils", | 710 | "repo": "flake-utils", |
711 | "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", | 711 | "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", |
712 | "type": "github" | 712 | "type": "github" |
713 | }, | 713 | }, |
714 | "original": { | 714 | "original": { |
@@ -808,7 +808,7 @@ | |||
808 | "mypackages": { | 808 | "mypackages": { |
809 | "inputs": { | 809 | "inputs": { |
810 | "flake-parts": "flake-parts_2", | 810 | "flake-parts": "flake-parts_2", |
811 | "nixpkgs": "nixpkgs_16", | 811 | "nixpkgs": "nixpkgs_15", |
812 | "webapps-ttrss": "webapps-ttrss" | 812 | "webapps-ttrss": "webapps-ttrss" |
813 | }, | 813 | }, |
814 | "locked": { | 814 | "locked": { |
@@ -825,7 +825,7 @@ | |||
825 | "mypackages_2": { | 825 | "mypackages_2": { |
826 | "inputs": { | 826 | "inputs": { |
827 | "flake-parts": "flake-parts_3", | 827 | "flake-parts": "flake-parts_3", |
828 | "nixpkgs": "nixpkgs_19", | 828 | "nixpkgs": "nixpkgs_18", |
829 | "webapps-ttrss": "webapps-ttrss_2" | 829 | "webapps-ttrss": "webapps-ttrss_2" |
830 | }, | 830 | }, |
831 | "locked": { | 831 | "locked": { |
@@ -842,7 +842,7 @@ | |||
842 | "mypackages_3": { | 842 | "mypackages_3": { |
843 | "inputs": { | 843 | "inputs": { |
844 | "flake-parts": "flake-parts_4", | 844 | "flake-parts": "flake-parts_4", |
845 | "nixpkgs": "nixpkgs_21", | 845 | "nixpkgs": "nixpkgs_20", |
846 | "webapps-ttrss": "webapps-ttrss_3" | 846 | "webapps-ttrss": "webapps-ttrss_3" |
847 | }, | 847 | }, |
848 | "locked": { | 848 | "locked": { |
@@ -1300,21 +1300,6 @@ | |||
1300 | }, | 1300 | }, |
1301 | "nixpkgs_11": { | 1301 | "nixpkgs_11": { |
1302 | "locked": { | 1302 | "locked": { |
1303 | "lastModified": 1631570365, | ||
1304 | "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", | ||
1305 | "owner": "NixOS", | ||
1306 | "repo": "nixpkgs", | ||
1307 | "rev": "df7113c0727881519248d4c7d080324e0ee3327b", | ||
1308 | "type": "github" | ||
1309 | }, | ||
1310 | "original": { | ||
1311 | "owner": "NixOS", | ||
1312 | "repo": "nixpkgs", | ||
1313 | "type": "github" | ||
1314 | } | ||
1315 | }, | ||
1316 | "nixpkgs_12": { | ||
1317 | "locked": { | ||
1318 | "lastModified": 1611097871, | 1303 | "lastModified": 1611097871, |
1319 | "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=", | 1304 | "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=", |
1320 | "owner": "NixOS", | 1305 | "owner": "NixOS", |
@@ -1328,7 +1313,7 @@ | |||
1328 | "type": "github" | 1313 | "type": "github" |
1329 | } | 1314 | } |
1330 | }, | 1315 | }, |
1331 | "nixpkgs_13": { | 1316 | "nixpkgs_12": { |
1332 | "locked": { | 1317 | "locked": { |
1333 | "lastModified": 1611097871, | 1318 | "lastModified": 1611097871, |
1334 | "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=", | 1319 | "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=", |
@@ -1343,7 +1328,7 @@ | |||
1343 | "type": "github" | 1328 | "type": "github" |
1344 | } | 1329 | } |
1345 | }, | 1330 | }, |
1346 | "nixpkgs_14": { | 1331 | "nixpkgs_13": { |
1347 | "flake": false, | 1332 | "flake": false, |
1348 | "locked": { | 1333 | "locked": { |
1349 | "lastModified": 1596265691, | 1334 | "lastModified": 1596265691, |
@@ -1360,7 +1345,7 @@ | |||
1360 | "type": "github" | 1345 | "type": "github" |
1361 | } | 1346 | } |
1362 | }, | 1347 | }, |
1363 | "nixpkgs_15": { | 1348 | "nixpkgs_14": { |
1364 | "locked": { | 1349 | "locked": { |
1365 | "lastModified": 1687502512, | 1350 | "lastModified": 1687502512, |
1366 | "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=", | 1351 | "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=", |
@@ -1376,7 +1361,7 @@ | |||
1376 | "type": "github" | 1361 | "type": "github" |
1377 | } | 1362 | } |
1378 | }, | 1363 | }, |
1379 | "nixpkgs_16": { | 1364 | "nixpkgs_15": { |
1380 | "locked": { | 1365 | "locked": { |
1381 | "lastModified": 1646497237, | 1366 | "lastModified": 1646497237, |
1382 | "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", | 1367 | "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", |
@@ -1392,7 +1377,7 @@ | |||
1392 | "type": "github" | 1377 | "type": "github" |
1393 | } | 1378 | } |
1394 | }, | 1379 | }, |
1395 | "nixpkgs_17": { | 1380 | "nixpkgs_16": { |
1396 | "locked": { | 1381 | "locked": { |
1397 | "lastModified": 1633901457, | 1382 | "lastModified": 1633901457, |
1398 | "narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=", | 1383 | "narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=", |
@@ -1407,7 +1392,7 @@ | |||
1407 | "type": "github" | 1392 | "type": "github" |
1408 | } | 1393 | } |
1409 | }, | 1394 | }, |
1410 | "nixpkgs_18": { | 1395 | "nixpkgs_17": { |
1411 | "flake": false, | 1396 | "flake": false, |
1412 | "locked": { | 1397 | "locked": { |
1413 | "lastModified": 1596265691, | 1398 | "lastModified": 1596265691, |
@@ -1424,7 +1409,7 @@ | |||
1424 | "type": "github" | 1409 | "type": "github" |
1425 | } | 1410 | } |
1426 | }, | 1411 | }, |
1427 | "nixpkgs_19": { | 1412 | "nixpkgs_18": { |
1428 | "locked": { | 1413 | "locked": { |
1429 | "lastModified": 1646497237, | 1414 | "lastModified": 1646497237, |
1430 | "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", | 1415 | "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", |
@@ -1440,40 +1425,40 @@ | |||
1440 | "type": "github" | 1425 | "type": "github" |
1441 | } | 1426 | } |
1442 | }, | 1427 | }, |
1443 | "nixpkgs_2": { | 1428 | "nixpkgs_19": { |
1429 | "flake": false, | ||
1444 | "locked": { | 1430 | "locked": { |
1445 | "lastModified": 1687701825, | 1431 | "lastModified": 1596265691, |
1446 | "narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=", | 1432 | "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", |
1447 | "owner": "NixOS", | 1433 | "owner": "NixOS", |
1448 | "repo": "nixpkgs", | 1434 | "repo": "nixpkgs", |
1449 | "rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea", | 1435 | "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", |
1450 | "type": "github" | 1436 | "type": "github" |
1451 | }, | 1437 | }, |
1452 | "original": { | 1438 | "original": { |
1453 | "owner": "NixOS", | 1439 | "owner": "NixOS", |
1454 | "ref": "nixpkgs-unstable", | ||
1455 | "repo": "nixpkgs", | 1440 | "repo": "nixpkgs", |
1441 | "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", | ||
1456 | "type": "github" | 1442 | "type": "github" |
1457 | } | 1443 | } |
1458 | }, | 1444 | }, |
1459 | "nixpkgs_20": { | 1445 | "nixpkgs_2": { |
1460 | "flake": false, | ||
1461 | "locked": { | 1446 | "locked": { |
1462 | "lastModified": 1596265691, | 1447 | "lastModified": 1687701825, |
1463 | "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", | 1448 | "narHash": "sha256-aMC9hqsf+4tJL7aJWSdEUurW2TsjxtDcJBwM9Y4FIYM=", |
1464 | "owner": "NixOS", | 1449 | "owner": "NixOS", |
1465 | "repo": "nixpkgs", | 1450 | "repo": "nixpkgs", |
1466 | "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", | 1451 | "rev": "07059ee2fa34f1598758839b9af87eae7f7ae6ea", |
1467 | "type": "github" | 1452 | "type": "github" |
1468 | }, | 1453 | }, |
1469 | "original": { | 1454 | "original": { |
1470 | "owner": "NixOS", | 1455 | "owner": "NixOS", |
1456 | "ref": "nixpkgs-unstable", | ||
1471 | "repo": "nixpkgs", | 1457 | "repo": "nixpkgs", |
1472 | "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", | ||
1473 | "type": "github" | 1458 | "type": "github" |
1474 | } | 1459 | } |
1475 | }, | 1460 | }, |
1476 | "nixpkgs_21": { | 1461 | "nixpkgs_20": { |
1477 | "locked": { | 1462 | "locked": { |
1478 | "lastModified": 1646497237, | 1463 | "lastModified": 1646497237, |
1479 | "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", | 1464 | "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", |
@@ -1489,7 +1474,7 @@ | |||
1489 | "type": "github" | 1474 | "type": "github" |
1490 | } | 1475 | } |
1491 | }, | 1476 | }, |
1492 | "nixpkgs_22": { | 1477 | "nixpkgs_21": { |
1493 | "flake": false, | 1478 | "flake": false, |
1494 | "locked": { | 1479 | "locked": { |
1495 | "lastModified": 1596265691, | 1480 | "lastModified": 1596265691, |
@@ -1506,7 +1491,7 @@ | |||
1506 | "type": "github" | 1491 | "type": "github" |
1507 | } | 1492 | } |
1508 | }, | 1493 | }, |
1509 | "nixpkgs_23": { | 1494 | "nixpkgs_22": { |
1510 | "flake": false, | 1495 | "flake": false, |
1511 | "locked": { | 1496 | "locked": { |
1512 | "lastModified": 1596265691, | 1497 | "lastModified": 1596265691, |
@@ -1523,7 +1508,7 @@ | |||
1523 | "type": "github" | 1508 | "type": "github" |
1524 | } | 1509 | } |
1525 | }, | 1510 | }, |
1526 | "nixpkgs_24": { | 1511 | "nixpkgs_23": { |
1527 | "flake": false, | 1512 | "flake": false, |
1528 | "locked": { | 1513 | "locked": { |
1529 | "lastModified": 1596265691, | 1514 | "lastModified": 1596265691, |
@@ -1540,7 +1525,7 @@ | |||
1540 | "type": "github" | 1525 | "type": "github" |
1541 | } | 1526 | } |
1542 | }, | 1527 | }, |
1543 | "nixpkgs_25": { | 1528 | "nixpkgs_24": { |
1544 | "locked": { | 1529 | "locked": { |
1545 | "lastModified": 1646497237, | 1530 | "lastModified": 1646497237, |
1546 | "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", | 1531 | "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", |
@@ -1556,7 +1541,7 @@ | |||
1556 | "type": "github" | 1541 | "type": "github" |
1557 | } | 1542 | } |
1558 | }, | 1543 | }, |
1559 | "nixpkgs_26": { | 1544 | "nixpkgs_25": { |
1560 | "locked": { | 1545 | "locked": { |
1561 | "lastModified": 1597943282, | 1546 | "lastModified": 1597943282, |
1562 | "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", | 1547 | "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", |
@@ -1571,7 +1556,7 @@ | |||
1571 | "type": "github" | 1556 | "type": "github" |
1572 | } | 1557 | } |
1573 | }, | 1558 | }, |
1574 | "nixpkgs_27": { | 1559 | "nixpkgs_26": { |
1575 | "locked": { | 1560 | "locked": { |
1576 | "lastModified": 1597943282, | 1561 | "lastModified": 1597943282, |
1577 | "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", | 1562 | "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", |
@@ -1586,6 +1571,21 @@ | |||
1586 | "type": "github" | 1571 | "type": "github" |
1587 | } | 1572 | } |
1588 | }, | 1573 | }, |
1574 | "nixpkgs_27": { | ||
1575 | "locked": { | ||
1576 | "lastModified": 1631570365, | ||
1577 | "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", | ||
1578 | "owner": "NixOS", | ||
1579 | "repo": "nixpkgs", | ||
1580 | "rev": "df7113c0727881519248d4c7d080324e0ee3327b", | ||
1581 | "type": "github" | ||
1582 | }, | ||
1583 | "original": { | ||
1584 | "owner": "NixOS", | ||
1585 | "repo": "nixpkgs", | ||
1586 | "type": "github" | ||
1587 | } | ||
1588 | }, | ||
1589 | "nixpkgs_28": { | 1589 | "nixpkgs_28": { |
1590 | "locked": { | 1590 | "locked": { |
1591 | "lastModified": 1611097871, | 1591 | "lastModified": 1611097871, |
@@ -1878,22 +1878,6 @@ | |||
1878 | "type": "path" | 1878 | "type": "path" |
1879 | } | 1879 | } |
1880 | }, | 1880 | }, |
1881 | "paste": { | ||
1882 | "inputs": { | ||
1883 | "flake-utils": "flake-utils_8", | ||
1884 | "nixpkgs": "nixpkgs_11" | ||
1885 | }, | ||
1886 | "locked": { | ||
1887 | "lastModified": 1, | ||
1888 | "narHash": "sha256-a6rqBy5/ePeKhqag8K7FtOHpYLur3Z6Yzk7uCqH522A=", | ||
1889 | "path": "../../paste", | ||
1890 | "type": "path" | ||
1891 | }, | ||
1892 | "original": { | ||
1893 | "path": "../../paste", | ||
1894 | "type": "path" | ||
1895 | } | ||
1896 | }, | ||
1897 | "peertube": { | 1881 | "peertube": { |
1898 | "flake": false, | 1882 | "flake": false, |
1899 | "locked": { | 1883 | "locked": { |
@@ -1948,9 +1932,9 @@ | |||
1948 | }, | 1932 | }, |
1949 | "peertube_open_instance": { | 1933 | "peertube_open_instance": { |
1950 | "inputs": { | 1934 | "inputs": { |
1951 | "flake-utils": "flake-utils_9", | 1935 | "flake-utils": "flake-utils_8", |
1952 | "myuids": "myuids_5", | 1936 | "myuids": "myuids_5", |
1953 | "nixpkgs": "nixpkgs_12", | 1937 | "nixpkgs": "nixpkgs_11", |
1954 | "peertube": "peertube" | 1938 | "peertube": "peertube" |
1955 | }, | 1939 | }, |
1956 | "locked": { | 1940 | "locked": { |
@@ -1966,9 +1950,9 @@ | |||
1966 | }, | 1950 | }, |
1967 | "peertube_origin": { | 1951 | "peertube_origin": { |
1968 | "inputs": { | 1952 | "inputs": { |
1969 | "flake-utils": "flake-utils_10", | 1953 | "flake-utils": "flake-utils_9", |
1970 | "myuids": "myuids_6", | 1954 | "myuids": "myuids_6", |
1971 | "nixpkgs": "nixpkgs_13", | 1955 | "nixpkgs": "nixpkgs_12", |
1972 | "peertube": "peertube_2" | 1956 | "peertube": "peertube_2" |
1973 | }, | 1957 | }, |
1974 | "locked": { | 1958 | "locked": { |
@@ -2110,21 +2094,6 @@ | |||
2110 | "type": "path" | 2094 | "type": "path" |
2111 | } | 2095 | } |
2112 | }, | 2096 | }, |
2113 | "private-paste": { | ||
2114 | "inputs": { | ||
2115 | "paste": "paste" | ||
2116 | }, | ||
2117 | "locked": { | ||
2118 | "lastModified": 1, | ||
2119 | "narHash": "sha256-w8WnrSJj05Y8hJsJfY46sI6PUSg2xo5h9t0zWP4woog=", | ||
2120 | "path": "../../flakes/private/paste", | ||
2121 | "type": "path" | ||
2122 | }, | ||
2123 | "original": { | ||
2124 | "path": "../../flakes/private/paste", | ||
2125 | "type": "path" | ||
2126 | } | ||
2127 | }, | ||
2128 | "private-peertube": { | 2097 | "private-peertube": { |
2129 | "inputs": { | 2098 | "inputs": { |
2130 | "peertube_open_instance": "peertube_open_instance", | 2099 | "peertube_open_instance": "peertube_open_instance", |
@@ -2143,8 +2112,8 @@ | |||
2143 | }, | 2112 | }, |
2144 | "private-ports": { | 2113 | "private-ports": { |
2145 | "inputs": { | 2114 | "inputs": { |
2146 | "flake-utils": "flake-utils_11", | 2115 | "flake-utils": "flake-utils_10", |
2147 | "nixpkgs": "nixpkgs_14", | 2116 | "nixpkgs": "nixpkgs_13", |
2148 | "nixpkgs-4": "nixpkgs-4" | 2117 | "nixpkgs-4": "nixpkgs-4" |
2149 | }, | 2118 | }, |
2150 | "locked": { | 2119 | "locked": { |
@@ -2196,8 +2165,8 @@ | |||
2196 | "public-copanier": { | 2165 | "public-copanier": { |
2197 | "inputs": { | 2166 | "inputs": { |
2198 | "copanier": "copanier", | 2167 | "copanier": "copanier", |
2199 | "flake-utils": "flake-utils_13", | 2168 | "flake-utils": "flake-utils_12", |
2200 | "nixpkgs": "nixpkgs_17" | 2169 | "nixpkgs": "nixpkgs_16" |
2201 | }, | 2170 | }, |
2202 | "locked": { | 2171 | "locked": { |
2203 | "lastModified": 1, | 2172 | "lastModified": 1, |
@@ -2213,9 +2182,9 @@ | |||
2213 | "public-diaspora": { | 2182 | "public-diaspora": { |
2214 | "inputs": { | 2183 | "inputs": { |
2215 | "diaspora": "diaspora", | 2184 | "diaspora": "diaspora", |
2216 | "flake-utils": "flake-utils_14", | 2185 | "flake-utils": "flake-utils_13", |
2217 | "myuids": "myuids_8", | 2186 | "myuids": "myuids_8", |
2218 | "nixpkgs": "nixpkgs_18" | 2187 | "nixpkgs": "nixpkgs_17" |
2219 | }, | 2188 | }, |
2220 | "locked": { | 2189 | "locked": { |
2221 | "lastModified": 1, | 2190 | "lastModified": 1, |
@@ -2231,9 +2200,9 @@ | |||
2231 | "public-etherpad-lite": { | 2200 | "public-etherpad-lite": { |
2232 | "inputs": { | 2201 | "inputs": { |
2233 | "etherpad-lite": "etherpad-lite", | 2202 | "etherpad-lite": "etherpad-lite", |
2234 | "flake-utils": "flake-utils_15", | 2203 | "flake-utils": "flake-utils_14", |
2235 | "mypackages": "mypackages_2", | 2204 | "mypackages": "mypackages_2", |
2236 | "nixpkgs": "nixpkgs_20" | 2205 | "nixpkgs": "nixpkgs_19" |
2237 | }, | 2206 | }, |
2238 | "locked": { | 2207 | "locked": { |
2239 | "lastModified": 1, | 2208 | "lastModified": 1, |
@@ -2272,10 +2241,10 @@ | |||
2272 | }, | 2241 | }, |
2273 | "public-grocy": { | 2242 | "public-grocy": { |
2274 | "inputs": { | 2243 | "inputs": { |
2275 | "flake-utils": "flake-utils_16", | 2244 | "flake-utils": "flake-utils_15", |
2276 | "grocy": "grocy", | 2245 | "grocy": "grocy", |
2277 | "mypackages": "mypackages_3", | 2246 | "mypackages": "mypackages_3", |
2278 | "nixpkgs": "nixpkgs_22" | 2247 | "nixpkgs": "nixpkgs_21" |
2279 | }, | 2248 | }, |
2280 | "locked": { | 2249 | "locked": { |
2281 | "lastModified": 1, | 2250 | "lastModified": 1, |
@@ -2302,10 +2271,10 @@ | |||
2302 | }, | 2271 | }, |
2303 | "public-mastodon": { | 2272 | "public-mastodon": { |
2304 | "inputs": { | 2273 | "inputs": { |
2305 | "flake-utils": "flake-utils_17", | 2274 | "flake-utils": "flake-utils_16", |
2306 | "mastodon": "mastodon", | 2275 | "mastodon": "mastodon", |
2307 | "myuids": "myuids_9", | 2276 | "myuids": "myuids_9", |
2308 | "nixpkgs": "nixpkgs_23" | 2277 | "nixpkgs": "nixpkgs_22" |
2309 | }, | 2278 | }, |
2310 | "locked": { | 2279 | "locked": { |
2311 | "lastModified": 1, | 2280 | "lastModified": 1, |
@@ -2320,10 +2289,10 @@ | |||
2320 | }, | 2289 | }, |
2321 | "public-mediagoblin": { | 2290 | "public-mediagoblin": { |
2322 | "inputs": { | 2291 | "inputs": { |
2323 | "flake-utils": "flake-utils_18", | 2292 | "flake-utils": "flake-utils_17", |
2324 | "mediagoblin": "mediagoblin", | 2293 | "mediagoblin": "mediagoblin", |
2325 | "myuids": "myuids_10", | 2294 | "myuids": "myuids_10", |
2326 | "nixpkgs": "nixpkgs_24" | 2295 | "nixpkgs": "nixpkgs_23" |
2327 | }, | 2296 | }, |
2328 | "locked": { | 2297 | "locked": { |
2329 | "lastModified": 1, | 2298 | "lastModified": 1, |
@@ -2355,7 +2324,7 @@ | |||
2355 | "public-mypackages": { | 2324 | "public-mypackages": { |
2356 | "inputs": { | 2325 | "inputs": { |
2357 | "flake-parts": "flake-parts_5", | 2326 | "flake-parts": "flake-parts_5", |
2358 | "nixpkgs": "nixpkgs_25", | 2327 | "nixpkgs": "nixpkgs_24", |
2359 | "webapps-ttrss": "webapps-ttrss_4" | 2328 | "webapps-ttrss": "webapps-ttrss_4" |
2360 | }, | 2329 | }, |
2361 | "locked": { | 2330 | "locked": { |
@@ -2383,9 +2352,9 @@ | |||
2383 | }, | 2352 | }, |
2384 | "public-openarc": { | 2353 | "public-openarc": { |
2385 | "inputs": { | 2354 | "inputs": { |
2386 | "flake-utils": "flake-utils_19", | 2355 | "flake-utils": "flake-utils_18", |
2387 | "myuids": "myuids_12", | 2356 | "myuids": "myuids_12", |
2388 | "nixpkgs": "nixpkgs_26", | 2357 | "nixpkgs": "nixpkgs_25", |
2389 | "openarc": "openarc_5" | 2358 | "openarc": "openarc_5" |
2390 | }, | 2359 | }, |
2391 | "locked": { | 2360 | "locked": { |
@@ -2401,9 +2370,9 @@ | |||
2401 | }, | 2370 | }, |
2402 | "public-opendmarc": { | 2371 | "public-opendmarc": { |
2403 | "inputs": { | 2372 | "inputs": { |
2404 | "flake-utils": "flake-utils_20", | 2373 | "flake-utils": "flake-utils_19", |
2405 | "myuids": "myuids_13", | 2374 | "myuids": "myuids_13", |
2406 | "nixpkgs": "nixpkgs_27" | 2375 | "nixpkgs": "nixpkgs_26" |
2407 | }, | 2376 | }, |
2408 | "locked": { | 2377 | "locked": { |
2409 | "lastModified": 1, | 2378 | "lastModified": 1, |
@@ -2416,6 +2385,22 @@ | |||
2416 | "type": "path" | 2385 | "type": "path" |
2417 | } | 2386 | } |
2418 | }, | 2387 | }, |
2388 | "public-paste": { | ||
2389 | "inputs": { | ||
2390 | "flake-utils": "flake-utils_20", | ||
2391 | "nixpkgs": "nixpkgs_27" | ||
2392 | }, | ||
2393 | "locked": { | ||
2394 | "lastModified": 1, | ||
2395 | "narHash": "sha256-a6rqBy5/ePeKhqag8K7FtOHpYLur3Z6Yzk7uCqH522A=", | ||
2396 | "path": "../../flakes/paste", | ||
2397 | "type": "path" | ||
2398 | }, | ||
2399 | "original": { | ||
2400 | "path": "../../flakes/paste", | ||
2401 | "type": "path" | ||
2402 | } | ||
2403 | }, | ||
2419 | "public-peertube": { | 2404 | "public-peertube": { |
2420 | "inputs": { | 2405 | "inputs": { |
2421 | "flake-utils": "flake-utils_21", | 2406 | "flake-utils": "flake-utils_21", |
@@ -2494,7 +2479,6 @@ | |||
2494 | "private-openarc": "private-openarc", | 2479 | "private-openarc": "private-openarc", |
2495 | "private-opendmarc": "private-opendmarc", | 2480 | "private-opendmarc": "private-opendmarc", |
2496 | "private-openldap": "private-openldap", | 2481 | "private-openldap": "private-openldap", |
2497 | "private-paste": "private-paste", | ||
2498 | "private-peertube": "private-peertube", | 2482 | "private-peertube": "private-peertube", |
2499 | "private-ports": "private-ports", | 2483 | "private-ports": "private-ports", |
2500 | "private-ssh": "private-ssh", | 2484 | "private-ssh": "private-ssh", |
@@ -2513,6 +2497,7 @@ | |||
2513 | "public-myuids": "public-myuids", | 2497 | "public-myuids": "public-myuids", |
2514 | "public-openarc": "public-openarc", | 2498 | "public-openarc": "public-openarc", |
2515 | "public-opendmarc": "public-opendmarc", | 2499 | "public-opendmarc": "public-opendmarc", |
2500 | "public-paste": "public-paste", | ||
2516 | "public-peertube": "public-peertube", | 2501 | "public-peertube": "public-peertube", |
2517 | "public-secrets": "public-secrets", | 2502 | "public-secrets": "public-secrets", |
2518 | "public-surfer": "public-surfer", | 2503 | "public-surfer": "public-surfer", |
diff --git a/systems/eldiron/flake.nix b/systems/eldiron/flake.nix index c126d0b..205571f 100644 --- a/systems/eldiron/flake.nix +++ b/systems/eldiron/flake.nix | |||
@@ -23,6 +23,7 @@ | |||
23 | public-mypackages.url = "path:../../flakes/mypackages"; | 23 | public-mypackages.url = "path:../../flakes/mypackages"; |
24 | public-loginctl-linger.url = "path:../../flakes/loginctl-linger"; | 24 | public-loginctl-linger.url = "path:../../flakes/loginctl-linger"; |
25 | public-multi-apache-container.url = "path:../../flakes/multi-apache-container"; | 25 | public-multi-apache-container.url = "path:../../flakes/multi-apache-container"; |
26 | public-paste.url = "path:../../flakes/paste"; | ||
26 | public-taskwarrior-web.url = "path:../../flakes/taskwarrior-web"; | 27 | public-taskwarrior-web.url = "path:../../flakes/taskwarrior-web"; |
27 | 28 | ||
28 | private-peertube.url = "path:../../flakes/private/peertube"; | 29 | private-peertube.url = "path:../../flakes/private/peertube"; |
@@ -34,7 +35,6 @@ | |||
34 | private-opendmarc.url = "path:../../flakes/private/opendmarc"; | 35 | private-opendmarc.url = "path:../../flakes/private/opendmarc"; |
35 | private-milters.url = "path:../../flakes/private/milters"; | 36 | private-milters.url = "path:../../flakes/private/milters"; |
36 | private-monitoring.url = "path:../../flakes/private/monitoring"; | 37 | private-monitoring.url = "path:../../flakes/private/monitoring"; |
37 | private-paste.url = "path:../../flakes/private/paste"; | ||
38 | private-ssh.url = "path:../../flakes/private/ssh"; | 38 | private-ssh.url = "path:../../flakes/private/ssh"; |
39 | private-chatons.url = "path:../../flakes/private/chatons"; | 39 | private-chatons.url = "path:../../flakes/private/chatons"; |
40 | private-system.url = "path:../../flakes/private/system"; | 40 | private-system.url = "path:../../flakes/private/system"; |
@@ -59,6 +59,7 @@ | |||
59 | peertube = public-peertube.nixosModule; | 59 | peertube = public-peertube.nixosModule; |
60 | diaspora = public-diaspora.nixosModule; | 60 | diaspora = public-diaspora.nixosModule; |
61 | fiche = public-fiche.nixosModule; | 61 | fiche = public-fiche.nixosModule; |
62 | paste = public-paste.nixosModule; | ||
62 | 63 | ||
63 | environment = private-environment.nixosModule; | 64 | environment = private-environment.nixosModule; |
64 | openarc = private-openarc.nixosModule; | 65 | openarc = private-openarc.nixosModule; |
@@ -67,7 +68,6 @@ | |||
67 | chatons = private-chatons.nixosModule; | 68 | chatons = private-chatons.nixosModule; |
68 | system = private-system.nixosModule; | 69 | system = private-system.nixosModule; |
69 | monitoring = private-monitoring.nixosModule; | 70 | monitoring = private-monitoring.nixosModule; |
70 | paste = private-paste.nixosModule; | ||
71 | milters = private-milters.nixosModule; | 71 | milters = private-milters.nixosModule; |
72 | }; | 72 | }; |
73 | moduleArgs = with inputs; { | 73 | moduleArgs = with inputs; { |
diff --git a/systems/eldiron/websites/tools/default.nix b/systems/eldiron/websites/tools/default.nix index 4d9e3c1..397b644 100644 --- a/systems/eldiron/websites/tools/default.nix +++ b/systems/eldiron/websites/tools/default.nix | |||
@@ -383,6 +383,11 @@ in { | |||
383 | paths = [ config.secrets.fullPaths."mpd" ]; | 383 | paths = [ config.secrets.fullPaths."mpd" ]; |
384 | }; | 384 | }; |
385 | 385 | ||
386 | services.paste = { | ||
387 | enable = true; | ||
388 | webDirectory = "/paste"; | ||
389 | }; | ||
390 | |||
386 | services.phpfpm.pools = { | 391 | services.phpfpm.pools = { |
387 | tools = { | 392 | tools = { |
388 | user = "wwwrun"; | 393 | user = "wwwrun"; |