From 0ab083a4f602239679f633b3830d6e0b6bb246b4 Mon Sep 17 00:00:00 2001 From: dusk Date: Tue, 4 Feb 2025 20:37:21 +0900 Subject: [PATCH] feat: pds --- flake.lock | 975 +++--------------- flake.nix | 10 +- hosts/wolumonde/modules/atproto.nix | 37 +- ...uadrupled.nix => musikquadrupled.disabled} | 0 .../{musikspider.nix => musikspider.disabled} | 0 hosts/wolumonde/modules/nginx.nix | 7 +- hosts/wolumonde/modules/pds.nix | 73 ++ hosts/wolumonde/modules/secrets.nix | 1 + secrets/dawn.did | 26 + secrets/pdsConfig.age | Bin 0 -> 1271 bytes secrets/secrets.nix | 1 + 11 files changed, 304 insertions(+), 826 deletions(-) rename hosts/wolumonde/modules/{musikquadrupled.nix => musikquadrupled.disabled} (100%) rename hosts/wolumonde/modules/{musikspider.nix => musikspider.disabled} (100%) create mode 100644 hosts/wolumonde/modules/pds.nix create mode 100644 secrets/dawn.did create mode 100644 secrets/pdsConfig.age diff --git a/flake.lock b/flake.lock index f5193ff..159e8af 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -23,29 +23,6 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1707922053, - "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "main", - "repo": "attic", - "type": "github" - } - }, "base16": { "inputs": { "nixpkgs": [ @@ -110,33 +87,6 @@ "url": "https://git.gaze.systems/gazesys/website/releases/download/latest/source.tgz" } }, - "conduit": { - "inputs": { - "attic": "attic", - "crane": "crane_3", - "fenix": "fenix", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724351785, - "narHash": "sha256-LyW+qD+k32iTzv9rqauasykzzSwNs8ryHzE2ISV7Bwc=", - "owner": "famedly", - "repo": "conduit", - "rev": "a9c386728767ac9295ba6c362a68364f0a322fbd", - "type": "gitlab" - }, - "original": { - "owner": "famedly", - "ref": "next", - "repo": "conduit", - "type": "gitlab" - } - }, "crane": { "flake": false, "locked": { @@ -155,19 +105,12 @@ } }, "crane_2": { - "inputs": { - "nixpkgs": [ - "conduit", - "attic", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "lastModified": 1737563566, + "narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=", "owner": "ipetkov", "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "rev": "849376434956794ebc7a6b487d31aace395392ba", "type": "github" }, "original": { @@ -177,49 +120,6 @@ } }, "crane_3": { - "inputs": { - "nixpkgs": [ - "conduit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713721181, - "narHash": "sha256-Vz1KRVTzU3ClBfyhOj8gOehZk21q58T1YsXC30V23PU=", - "owner": "ipetkov", - "repo": "crane", - "rev": "55f4939ac59ff8f89c6a4029730a2d49ea09105f", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "master", - "repo": "crane", - "type": "github" - } - }, - "crane_4": { - "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_5": { "inputs": { "nixpkgs": [ "limbusart", @@ -240,23 +140,6 @@ "type": "github" } }, - "crane_6": { - "flake": false, - "locked": { - "lastModified": 1699217310, - "narHash": "sha256-xpW3VFUG7yE6UE6Wl0dhqencuENSkV7qpnpe9I8VbPw=", - "owner": "ipetkov", - "repo": "crane", - "rev": "d535642bbe6f377077f7c23f0febb78b1463f449", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "v0.15.0", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -281,18 +164,17 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_8", "nixpkgs": [ "nixtopo", "nixpkgs" ] }, "locked": { - "lastModified": 1713532798, - "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -373,19 +255,18 @@ "dream2nix_3": { "inputs": { "nixpkgs": [ - "musikquad", - "nci", + "s3s", "nixpkgs" ], "purescript-overlay": "purescript-overlay_3", "pyproject-nix": "pyproject-nix_3" }, "locked": { - "lastModified": 1716748361, - "narHash": "sha256-piN/a/Ge4Z10DXigw18g+trfUfkutZNyVMdm03+svnQ=", + "lastModified": 1735160684, + "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=", "owner": "nix-community", "repo": "dream2nix", - "rev": "e59d83c35ecfdf3104d4b283fa80a7b3e308138f", + "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4", "type": "github" }, "original": { @@ -394,59 +275,14 @@ "type": "github" } }, - "dream2nix_4": { - "inputs": { - "nixpkgs": [ - "s3s", - "nixpkgs" - ], - "purescript-overlay": "purescript-overlay_4", - "pyproject-nix": "pyproject-nix_4" - }, - "locked": { - "lastModified": 1722526955, - "narHash": "sha256-fFS8aDnfK9Qfm2FLnQ8pqWk8FzvFEv5LvTuZTZLREnc=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "3fd4c14d3683baac8d1f94286ae14fe160888b51", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "conduit", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1709619709, - "narHash": "sha256-l6EPVJfwfelWST7qWQeP6t/TDK3HHv5uUB1b2vw4mOQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "c8943ea9e98d41325ff57d4ec14736d330b321b2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -488,22 +324,6 @@ } }, "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { "flake": false, "locked": { "lastModified": 1673956053, @@ -519,7 +339,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -537,14 +357,35 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1714606777, - "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -555,11 +396,11 @@ }, "flake-root": { "locked": { - "lastModified": 1713493429, - "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "lastModified": 1723604017, + "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", "owner": "srid", "repo": "flake-root", - "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", "type": "github" }, "original": { @@ -583,31 +424,16 @@ "type": "github" } }, - "flake-utils_10": { - "inputs": { - "systems": "systems_11" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -617,45 +443,9 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": "systems_4" }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -670,9 +460,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1705309234, @@ -688,16 +478,16 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_6" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -706,27 +496,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_6": { "inputs": { - "systems": "systems_9" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_9": { - "inputs": { - "systems": "systems_10" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -766,17 +538,17 @@ }, "helix": { "inputs": { - "crane": "crane_4", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_2", + "crane": "crane_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1724401716, - "narHash": "sha256-LXTYUVhv6Kz9Iy9DxXSI0J+2/hunUj2fj0Kvw2eDarQ=", + "lastModified": 1738547365, + "narHash": "sha256-4GrVwyIZKx14eVG8TZMKmgyw8v3TuETPrLvYkFNqlyc=", "owner": "helix-editor", "repo": "helix", - "rev": "620dfceb849d6b68d41d4f7678bb4675009fef4d", + "rev": "066e938ba083c0259ff411b681eca7bad30980df", "type": "github" }, "original": { @@ -792,11 +564,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1738610386, + "narHash": "sha256-yb6a5efA1e8xze1vcdN2HBxqYr340EsxFMrDUHL3WZM=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe", "type": "github" }, "original": { @@ -829,17 +601,17 @@ }, "limbusart": { "inputs": { - "crane": "crane_5", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3", + "crane": "crane_3", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1730541623, - "narHash": "sha256-/R+fLHxZHn3eTlpWObgHw/yrj+Ap7gb+HZtAwn6DnNE=", + "lastModified": 1730724204, + "narHash": "sha256-5JFyxJ3ZD1pNd/23h1/qoq2FzIvm6LjLK2Cb6u0JvoM=", "ref": "refs/heads/master", - "rev": "a32954e841bf66819b5e584831417451f342b819", - "revCount": 40, + "rev": "a0ac4e867111f3bc8cf05d0229ebfce974b3b11f", + "revCount": 43, "type": "git", "url": "https://git.gaze.systems/dusk/limbusart.git" }, @@ -864,65 +636,6 @@ "type": "github" } }, - "mk-naked-shell_2": { - "flake": false, - "locked": { - "lastModified": 1681286841, - "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", - "owner": "yusdacra", - "repo": "mk-naked-shell", - "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "mk-naked-shell", - "type": "github" - } - }, - "musikquad": { - "inputs": { - "nci": "nci_2", - "nixpkgs": [ - "nixpkgs" - ], - "parts": "parts_5" - }, - "locked": { - "lastModified": 1716865264, - "narHash": "sha256-BuyW302Mp10GW3p8gJ+4rLbMhh512AbXfe+Ob0Qmq2w=", - "ref": "refs/heads/master", - "rev": "012976467e3efd9c1aeb4c064100c5203eb6a791", - "revCount": 41, - "type": "git", - "url": "https://git.gaze.systems/dusk/musikquadrupled.git" - }, - "original": { - "type": "git", - "url": "https://git.gaze.systems/dusk/musikquadrupled.git" - } - }, - "musikspider": { - "inputs": { - "naked-shell": "naked-shell_2", - "nixpkgs": "nixpkgs_4", - "parts": "parts_6", - "systems": "systems_7" - }, - "locked": { - "lastModified": 1727794399, - "narHash": "sha256-doNFB1C7K0z36StYlR/zIpRIfMtT5aj15IRfZ6MGvCo=", - "ref": "refs/heads/master", - "rev": "73598860aad3179c986a0d0d6270bdc2603f04b9", - "revCount": 44, - "type": "git", - "url": "https://git.gaze.systems/dusk/musikspider.git" - }, - "original": { - "type": "git", - "url": "https://git.gaze.systems/dusk/musikspider.git" - } - }, "naked-shell": { "locked": { "lastModified": 1681286841, @@ -939,21 +652,6 @@ } }, "naked-shell_2": { - "locked": { - "lastModified": 1681286841, - "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", - "owner": "yusdacra", - "repo": "mk-naked-shell", - "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "mk-naked-shell", - "type": "github" - } - }, - "naked-shell_3": { "flake": false, "locked": { "lastModified": 1681286841, @@ -996,33 +694,6 @@ "type": "github" } }, - "nci_2": { - "inputs": { - "crane": "crane_6", - "dream2nix": "dream2nix_3", - "mk-naked-shell": "mk-naked-shell_2", - "nixpkgs": [ - "musikquad", - "nixpkgs" - ], - "parts": "parts_4", - "rust-overlay": "rust-overlay_4", - "treefmt": "treefmt_2" - }, - "locked": { - "lastModified": 1716860539, - "narHash": "sha256-zgecgkzLlKzbVcI7/ZxsPfWonkx/ZsVmUBRw3VaU+Zc=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "aa0e6844f88a63cc199686bbf27b0df111272ed1", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, "nh": { "inputs": { "nixpkgs": [ @@ -1030,11 +701,11 @@ ] }, "locked": { - "lastModified": 1724141100, - "narHash": "sha256-SDj8ZMeDZtVBu8EZV/Ul2Im77kyWJRQ2KJX0Sd7Cu1M=", + "lastModified": 1738579718, + "narHash": "sha256-HcNEFumdZ4Y59CBB1h1IzOyPxwn0u/Wson6hhzItXCA=", "owner": "viperML", "repo": "nh", - "rev": "3dc7cdc5d17cccf2e81540e320f4faa95020767b", + "rev": "8ef70b642b8351c010a48f43dda6a1ebf038f5d9", "type": "github" }, "original": { @@ -1043,21 +714,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixd": { "inputs": { "flake-parts": "flake-parts", @@ -1068,11 +724,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724296831, - "narHash": "sha256-+X9cc5fNEUtp6e+EZ2d9tjfPiXVcqkddEz1T/C9H5sc=", + "lastModified": 1738432935, + "narHash": "sha256-D/r2NaMrO3jeYeTGg6v7fjWyPJ8omLcphCZ5WiM7xPc=", "owner": "nix-community", "repo": "nixd", - "rev": "f6ca74330b49c45f50cead6d0ac0469f8f830f88", + "rev": "06d1c850614d0ea60b4f7e3fd89cca0628c21feb", "type": "github" }, "original": { @@ -1103,11 +759,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724067415, - "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", + "lastModified": 1738471961, + "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", + "rev": "537286c3c59b40311e5418a180b38034661d2536", "type": "github" }, "original": { @@ -1118,11 +774,11 @@ }, "nixos-persistence": { "locked": { - "lastModified": 1724146542, - "narHash": "sha256-MLxtqDtu+y/4UDhXX5pFypX9/qbH54TDP6Z90oFzd/A=", + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "owner": "nix-community", "repo": "impermanence", - "rev": "03fe473c731cda2900bae9894b8dfc68e3492db5", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "type": "github" }, "original": { @@ -1133,18 +789,17 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_7", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1724065442, - "narHash": "sha256-8ZUoyeO7Q70bLuijVYvToBSkApw9kfc5hMykTGxB64I=", + "lastModified": 1736095716, + "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "0bec2bfb8a2d4dd16e5b012982ca95e57d50e6a2", + "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", "type": "github" }, "original": { @@ -1155,16 +810,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", - "owner": "NixOS", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1183,41 +838,23 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" - } - }, - "nixpkgs-lib_3": { - "locked": { - "dir": "lib", - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-master": { "locked": { - "lastModified": 1724458654, - "narHash": "sha256-3xLUbzQrr1x1SsH2neYOYdry3uN/mZVEVaCKfR1ehIs=", + "lastModified": 1738623125, + "narHash": "sha256-gzNHiPZ9J+ktsMhLo8K4rE27R0kvk3iQ6/2557RgOWs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a2f47ce51ce3b17fcdcb5e5142c8e82069814978", + "rev": "7b529a29bb7775d6a76830b2b4f5bcc740b83b74", "type": "github" }, "original": { @@ -1227,46 +864,14 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1702780907, - "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1723573444, - "narHash": "sha256-5R7cF01OqkULUZ/qpAjgs712UGM+N0xFqOk/eYd3V+4=", + "lastModified": 1738519412, + "narHash": "sha256-BpNjF2/seQSoN+B4hxoVrzUNVh/hN9LssLI6eVtpOOo=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "d281d56bda9456bb8c0a22a608575926fb9a656d", + "rev": "8be0c76038b1f76914c600f48ee012fb40714f18", "type": "github" }, "original": { @@ -1276,22 +881,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1716715802, "narHash": "sha256-usk0vE7VlxPX8jOavrtpOqphdfqEQpf9lgedlY/r66c=", @@ -1307,13 +896,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { @@ -1323,13 +912,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -1342,18 +931,18 @@ "nixtopo": { "inputs": { "devshell": "devshell", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1724368485, - "narHash": "sha256-/MzkcvJN8zN+y5vevpT6OQJXTb+sSpxQA0iywn9CD+A=", + "lastModified": 1738246091, + "narHash": "sha256-2+KkZsRO+XlOFbXbRgMZbRtlqn5MBNYj4HNmZ/2Tojg=", "owner": "oddlama", "repo": "nix-topology", - "rev": "1826fe50f19dd076f13ede0254e170247e0afb06", + "rev": "5526269fa3eedf4f4bc00c0bf7a03db31d24b029", "type": "github" }, "original": { @@ -1363,12 +952,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_4", + "treefmt-nix": "treefmt-nix_2" + }, "locked": { - "lastModified": 1724445072, - "narHash": "sha256-TgsUi8yQMbCwPgnkCwtp6Zz9m1uUcjnGVFH5MxPo99Q=", + "lastModified": 1738362438, + "narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=", "owner": "nix-community", "repo": "NUR", - "rev": "32938b2196ffbd94c848d0ebab5a027829c3080e", + "rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2", "type": "github" }, "original": { @@ -1438,87 +1032,25 @@ "type": "github" } }, - "parts_4": { - "inputs": { - "nixpkgs-lib": [ - "musikquad", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_5": { - "inputs": { - "nixpkgs-lib": [ - "musikquad", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_6": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": [ - "nixtopo", - "flake-utils" - ], + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "nixtopo", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": [ + "nixtopo", + "nixpkgs" + ] }, "locked": { - "lastModified": 1714478972, - "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", + "lastModified": 1730797577, + "narHash": "sha256-SrID5yVpyUfknUTGWgYkTyvdr9J1LxUym4om3SVGPkg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", + "rev": "1864030ed24a2b8b4e4d386a5eeaf0c5369e50a9", "type": "github" }, "original": { @@ -1576,43 +1108,20 @@ }, "purescript-overlay_3": { "inputs": { + "flake-compat": "flake-compat_3", "nixpkgs": [ - "musikquad", - "nci", + "s3s", "dream2nix", "nixpkgs" ], "slimlock": "slimlock_3" }, "locked": { - "lastModified": 1696022621, - "narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=", + "lastModified": 1728546539, + "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", "owner": "thomashoneyman", "repo": "purescript-overlay", - "rev": "047c7933abd6da8aa239904422e22d190ce55ead", - "type": "github" - }, - "original": { - "owner": "thomashoneyman", - "repo": "purescript-overlay", - "type": "github" - } - }, - "purescript-overlay_4": { - "inputs": { - "nixpkgs": [ - "s3s", - "dream2nix", - "nixpkgs" - ], - "slimlock": "slimlock_4" - }, - "locked": { - "lastModified": 1696022621, - "narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=", - "owner": "thomashoneyman", - "repo": "purescript-overlay", - "rev": "047c7933abd6da8aa239904422e22d190ce55ead", + "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", "type": "github" }, "original": { @@ -1671,43 +1180,23 @@ "type": "github" } }, - "pyproject-nix_4": { - "flake": false, - "locked": { - "lastModified": 1702448246, - "narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=", - "owner": "davhau", - "repo": "pyproject.nix", - "rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb", - "type": "github" - }, - "original": { - "owner": "davhau", - "ref": "dream2nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", "bernbot": "bernbot", "blog": "blog", - "conduit": "conduit", "discordrp-mpris": "discordrp-mpris", "helix": "helix", "home": "home", "limbusart": "limbusart", - "musikquad": "musikquad", - "musikspider": "musikspider", - "naked-shell": "naked-shell_3", + "naked-shell": "naked-shell_2", "nh": "nh", "nixd": "nixd", "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixos-persistence": "nixos-persistence", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "nixpkgs-master": "nixpkgs-master", "nixpkgs-wayland": "nixpkgs-wayland", "nixtopo": "nixtopo", @@ -1717,23 +1206,6 @@ "vscode-extensions": "vscode-extensions" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1709571018, - "narHash": "sha256-ISFrxHxE0J5g7lDAscbK88hwaT5uewvWoma9TlFmRzM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "9f14343f9ee24f53f17492c5f9b653427e2ad15e", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "flake": false, "locked": { @@ -1752,21 +1224,17 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": [ - "helix", - "flake-utils" - ], "nixpkgs": [ "helix", "nixpkgs" ] }, "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "lastModified": 1737599167, + "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "rev": "38374302ae9edf819eac666d1f276d62c712dd06", "type": "github" }, "original": { @@ -1777,7 +1245,7 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_4", "nixpkgs": [ "limbusart", "nixpkgs" @@ -1797,36 +1265,20 @@ "type": "github" } }, - "rust-overlay_4": { - "flake": false, - "locked": { - "lastModified": 1716776264, - "narHash": "sha256-fYzMk5o//g5Wt1g0FyOC8/XVllbGdVdzdylXxcanakU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8ef3f6a8f5af867ab5f75fc86fbd934a6351820b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "s3s": { "inputs": { - "dream2nix": "dream2nix_4", + "dream2nix": "dream2nix_3", "nixpkgs": [ "nixpkgs" ], "src": "src_2" }, "locked": { - "lastModified": 1724394407, - "narHash": "sha256-1Tui9GpnOA/W/OpZYP9hYHoerM5obs9hbZ9luCIRSfw=", + "lastModified": 1738477607, + "narHash": "sha256-VtUF7iRNKWg04ZY+j0LjTUBTXYLx3WRFZ5xkeV7vZwY=", "owner": "yusdacra", "repo": "s3s-flake", - "rev": "bd5d67e891477f8bd367c75956ed5be7b437b298", + "rev": "d64c461d7105c04d393ea2c3c8c6f10147fe66a7", "type": "github" }, "original": { @@ -1905,30 +1357,6 @@ } }, "slimlock_3": { - "inputs": { - "nixpkgs": [ - "musikquad", - "nci", - "dream2nix", - "purescript-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688610262, - "narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=", - "owner": "thomashoneyman", - "repo": "slimlock", - "rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6", - "type": "github" - }, - "original": { - "owner": "thomashoneyman", - "repo": "slimlock", - "type": "github" - } - }, - "slimlock_4": { "inputs": { "nixpkgs": [ "s3s", @@ -1938,11 +1366,11 @@ ] }, "locked": { - "lastModified": 1688610262, - "narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=", + "lastModified": 1688756706, + "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=", "owner": "thomashoneyman", "repo": "slimlock", - "rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6", + "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c", "type": "github" }, "original": { @@ -1970,11 +1398,11 @@ "src_2": { "flake": false, "locked": { - "lastModified": 1720629460, - "narHash": "sha256-KJE/4xeB7h7KoLwYsafNUqediyH7S/boJur/Cca5gfQ=", + "lastModified": 1737616113, + "narHash": "sha256-2j34WOSRJJrhJKjjuqAZh3ywP7AgrQGBfvEEfzZrnUY=", "owner": "frozenpandaman", "repo": "s3s", - "rev": "8ce795d4bdb5a5182ada8984a5c115fb26e378ec", + "rev": "e629366e51235998cbd0b3a1b314a5b5a4529a32", "type": "github" }, "original": { @@ -1986,7 +1414,7 @@ "stylix": { "inputs": { "base16": "base16", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "home-manager": [ "home" ], @@ -2024,36 +1452,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1680978846, @@ -2130,36 +1528,6 @@ } }, "systems_7": { - "locked": { - "lastModified": 1680978846, - "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", - "owner": "nix-systems", - "repo": "x86_64-linux", - "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "x86_64-linux", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2204,11 +1572,11 @@ ] }, "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { @@ -2217,20 +1585,19 @@ "type": "github" } }, - "treefmt_2": { + "treefmt-nix_2": { "inputs": { "nixpkgs": [ - "musikquad", - "nci", + "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { @@ -2241,18 +1608,18 @@ }, "vscode-extensions": { "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_10", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1724432994, - "narHash": "sha256-mGzDkfXE6cVrHcQsYOA+16FXfwkef6f5Gjh0YVLCHoY=", + "lastModified": 1738547248, + "narHash": "sha256-ALPkA9L4G0j7piorEyeQ7zf6fW4vii4ULxRZBXmeKYM=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2c15c14f9d4485b18d7cec54081bdfd76335cfc8", + "rev": "bfacd5e2786caf61da0ad956728559dd6c1e8037", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d03bbae..195ba56 100644 --- a/flake.nix +++ b/flake.nix @@ -29,8 +29,8 @@ bernbot.url = "github:yusdacra/bernbot"; bernbot.inputs.nixpkgs.follows = "nixpkgs"; - conduit.url = "gitlab:famedly/conduit/next"; - conduit.inputs.nixpkgs.follows = "nixpkgs"; + # conduit.url = "gitlab:famedly/conduit/next"; + # conduit.inputs.nixpkgs.follows = "nixpkgs"; # nil.url = "github:oxalica/nil"; # nil.inputs.nixpkgs.follows = "nixpkgs"; @@ -47,10 +47,10 @@ agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; - musikquad.url = "git+https://git.gaze.systems/dusk/musikquadrupled.git"; - musikquad.inputs.nixpkgs.follows = "nixpkgs"; + # musikquad.url = "git+https://git.gaze.systems/dusk/musikquadrupled.git"; + # musikquad.inputs.nixpkgs.follows = "nixpkgs"; - musikspider.url = "git+https://git.gaze.systems/dusk/musikspider.git"; + # musikspider.url = "git+https://git.gaze.systems/dusk/musikspider.git"; # musikspider.inputs.nixpkgs.follows = "nixpkgs"; limbusart.url = "git+https://git.gaze.systems/dusk/limbusart.git"; diff --git a/hosts/wolumonde/modules/atproto.nix b/hosts/wolumonde/modules/atproto.nix index 135f772..73533a2 100644 --- a/hosts/wolumonde/modules/atproto.nix +++ b/hosts/wolumonde/modules/atproto.nix @@ -1,26 +1,35 @@ {pkgs, ...}: let - _wellKnownFile = - pkgs.writeText "server" "did:plc:dfl62fgb7wtjj3fcbb72naae"; - wellKnownFile = pkgs.runCommand "well-known" {} '' - mkdir -p $out - cp ${_wellKnownFile} $out/atproto-did - ''; in { - services.nginx.virtualHosts."gaze.systems" = { + services.nginx.virtualHosts."gaze.systems" = let + _wellKnownFile = + pkgs.writeText "server" "did:plc:dfl62fgb7wtjj3fcbb72naae"; + wellKnownDir = pkgs.runCommand "well-known" {} '' + mkdir -p $out + cp ${_wellKnownFile} $out/atproto-did + ''; + in { locations."/.well-known/".extraConfig = '' add_header content-type text/plain; add_header access-control-allow-origin *; - alias ${wellKnownFile}/; + alias ${wellKnownDir}/; ''; }; - # redirect any requests to my profile - services.nginx.virtualHosts."bsky.gaze.systems" = { + services.nginx.virtualHosts."dawn.gaze.systems" = let + _atprotoDidFile = + pkgs.writeText "server" "did:web:dawn.gaze.systems"; + _didFile = ../../../secrets/dawn.did; + wellKnownDir = pkgs.runCommand "well-known" {} '' + mkdir -p $out + cp ${_didFile} $out/did.json + cp ${_atprotoDidFile} $out/atproto-did + ''; + in { useACMEHost = "gaze.systems"; forceSSL = true; - extraConfig = '' - location / { - return 301 https://bsky.app/profile/gaze.systems$request_uri; - } + locations."/.well-known/".extraConfig = '' + add_header content-type text/plain; + add_header access-control-allow-origin *; + alias ${wellKnownDir}/; ''; }; } diff --git a/hosts/wolumonde/modules/musikquadrupled.nix b/hosts/wolumonde/modules/musikquadrupled.disabled similarity index 100% rename from hosts/wolumonde/modules/musikquadrupled.nix rename to hosts/wolumonde/modules/musikquadrupled.disabled diff --git a/hosts/wolumonde/modules/musikspider.nix b/hosts/wolumonde/modules/musikspider.disabled similarity index 100% rename from hosts/wolumonde/modules/musikspider.nix rename to hosts/wolumonde/modules/musikspider.disabled diff --git a/hosts/wolumonde/modules/nginx.nix b/hosts/wolumonde/modules/nginx.nix index 6527570..eaf6867 100644 --- a/hosts/wolumonde/modules/nginx.nix +++ b/hosts/wolumonde/modules/nginx.nix @@ -16,13 +16,14 @@ webroot = "/var/lib/acme/acme-challenge"; extraDomainNames = [ "git.gaze.systems" - "ms.gaze.systems" - "mq.gaze.systems" + # "ms.gaze.systems" + # "mq.gaze.systems" "couchdb.gaze.systems" "doc.gaze.systems" "pmart.gaze.systems" "limbus.gaze.systems" - "bsky.gaze.systems" + # "bsky.gaze.systems" + "dawn.gaze.systems" ]; }; }; diff --git a/hosts/wolumonde/modules/pds.nix b/hosts/wolumonde/modules/pds.nix new file mode 100644 index 0000000..3103d53 --- /dev/null +++ b/hosts/wolumonde/modules/pds.nix @@ -0,0 +1,73 @@ +{ config, ... }: { + services.nginx.virtualHosts.${config.services.pds.settings.PDS_HOSTNAME} = { + useACMEHost = "gaze.systems"; + forceSSL = true; + # we only need to proxy /xrpc for pds to work + # silly but i want root domain >:3 + locations."/xrpc" = { + proxyPass = "http://localhost:${toString config.services.pds.settings.PDS_PORT}"; + # pass ws headers so we can actually proxy the ws + extraConfig = '' + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + ''; + # higher prio just to make sure + priority = 100; + }; + }; + # setup pds stuff + services.pds = { + enable = true; + settings = { + PDS_HOSTNAME = "gaze.systems"; + PDS_PORT = 1334; + + PDS_SERVICE_NAME = ''"gazing at the sky"''; + PDS_LOGO_URL = "https://gaze.systems/icons/gaze.png"; + + PDS_RATE_LIMITS_ENABLED = "true"; + PDS_INVITE_REQUIRED = "true"; + + PDS_DID_PLC_URL="https://plc.directory"; + PDS_BSKY_APP_VIEW_URL="https://api.bsky.app"; + PDS_BSKY_APP_VIEW_DID="did:web:api.bsky.app"; + PDS_REPORT_SERVICE_URL="https://mod.bsky.app"; + PDS_REPORT_SERVICE_DID="did:plc:ar7c4by46qjdydhdevvrndac"; + PDS_CRAWLERS="https://bsky.network"; + }; + environmentFiles = [config.age.secrets.pdsConfig.path]; + }; + + # virtualisation = { + # podman = { + # enable = true; + # dockerCompat = true; + # defaultNetwork.settings.dns_enabled = true; + # }; + # oci-containers.containers = { + # pds = { + # image = "ghcr.io/bluesky-social/pds:0.4"; + # autoStart = true; + # environmentFiles = [ ./pds.env config.age.secrets.pdsConfig.path ]; + # ports = [ "1334:1334" ]; + # volumes = [ + # "/var/lib/pds:/pds" + # ]; + # extraOptions = [ + # #"--network=host" + # "--label=io.containers.autoupdate=registry" + # ]; + # }; + # }; + # }; + # # This is the podman auto-update systemd timer. + # # If I start to rely on podman auto-update more, I should move this out of the PDS definition. + # systemd.timers."podman-auto-update" = { + # enable = true; + # timerConfig = { + # OnCalendar = "*-*-* 4:00:00"; + # Persistent = true; + # }; + # wantedBy = [ "timers.target" ]; + # }; +} diff --git a/hosts/wolumonde/modules/secrets.nix b/hosts/wolumonde/modules/secrets.nix index 08b0c69..9eaaa39 100644 --- a/hosts/wolumonde/modules/secrets.nix +++ b/hosts/wolumonde/modules/secrets.nix @@ -17,4 +17,5 @@ # owner = "xray"; # group = "xray"; }; + age.secrets.pdsConfig.file = ../../../secrets/pdsConfig.age; } diff --git a/secrets/dawn.did b/secrets/dawn.did new file mode 100644 index 0000000..dcdda2a --- /dev/null +++ b/secrets/dawn.did @@ -0,0 +1,26 @@ +{ + "@context": [ + "https://www.w3.org/ns/did/v1", + "https://w3id.org/security/multikey/v1", + "https://w3id.org/security/suites/secp256k1-2019/v1" + ], + "id": "did:web:dawn.gaze.systems", + "alsoKnownAs": [ + "at://dawn.gaze.systems" + ], + "verificationMethod": [ + { + "id": "did:web:dawn.gaze.systems#atproto", + "type": "Multikey", + "controller": "did:web:dawn.gaze.systems", + "publicKeyMultibase": "zQ3shgM1xUBo5aLVavTm5v5id9isstiiSvxYnsoetTNbwz5fZ" + } + ], + "service": [ + { + "id": "#atproto_pds", + "type": "AtprotoPersonalDataServer", + "serviceEndpoint": "https://gaze.systems" + } + ] +} diff --git a/secrets/pdsConfig.age b/secrets/pdsConfig.age new file mode 100644 index 0000000000000000000000000000000000000000..a65237a14358e04ba4d0f7aee6c1b89777cf1012 GIT binary patch literal 1271 zcmXxi`;XHE0Kjo$kdvMmK~XT8J25ffvg_7%TT1}l+O6xlw(B0Zb)wjHUDxN{?baYZ zFd;$?NjM@ogm@@1f+iXs67WGVD#uAQB)};bBpO678hIHo5~9EOCwxEoii+%&Eveb7 zx7C_8RBI}r?FYOo2V1SGx7iX0!zI%e6`)kKd0)5$vxQu?E7bXvoi_t1wAUyl0uYo$ zJIzQ@@PK4ojhBkeqybWmSX&4u3s49qVwwR|4U^?VG9g8}dK$Gsx#4feQW_RZSLm|b zu@q0BqGeEr%IO@H;kcOWXFNg_A^e>#lZ7-OY?m>Z?ihJaFl84UCP=eG*LlCFbu3u5 zXtHf3vu;75B+9`se-$j5hKi@~CW#`ceAx$pbSMxG(M(<=sjgDasEpyplw>g&6VvUU z$l}y+M&)fs)HyrD){#bs(wL$fK?RS35k42-ifm2e!d8YqigKyu+Yo2r0BI#@~7@hGpt4Xhggd`OQn+sQ&b6bw;PjJ2b=qE^?CmV!$( zTQTB!qMD+4me*o6wC4I6q-`3hWRlH00g~vLKqt~69Sfx~F57`XiNIBnvZ9_6i{|4} z1J9rm&oX)-Z{v2rsmo=k-TtqO(6Yq}FLpT{a11Ie%V{hgbo2;V&WSx3u6q1(5jG(= zs3zsTqu==!8g)U?ZZJtvqdP>)xWL^$uLCECiXf}qd{AE>55JOKrm zY`BFZ$pnN|WCx@E|M)+MK){a;(i)WvDT4(ehlGk+S$BCjA52%tNVZe$#cPFOILEk< z6LMU;=VbY!f&gk$DF^Y6Vt1VmUXj~Tnt>72Q;q6`Nwjn&Oi2;~n=PfA1H4}EU_PM~ z>&2j`H7q6DwQx7l3#&bxvjWW&?;4e0hAcUlj>#|z+yJIBH~S8s9gJKZ*fZGwg?Znc z528~)lZ_4D^U7#@Wa{L~{b%I0-`{@W_}9-(-~4iH-I9Y7cRgO8at^(9YWgUwjP=bgl4aqnXW5yyv}3ZH3w&n7Iu68cpKk%bkC>y(xLm){qwfv zE{~2(?)BVithJ6zmbZ#C*TxqmOL}z4*j)7d8@^wg(aTSmpIn!A^gYzKI<@JSW!q2g z+=Acu{pBa$Uy5A3{M$1pK1v*0@zRz35A3_Jl@bQ7em-+xL-+RbEk97pwVwa)uQrdZ z{BfEI9m7v-fZiN^_T1|ak1zXYRr0Fpj8WFY)9dfmFD@{Y72x>Bd#>0YJ{a2N9l$r< zIg|cwc5-rYdG9tMVO$z{Z#_S~R^6lvZyLK;Hc