From 6bf5c23028be79a59b24d2ae242692bd746533be Mon Sep 17 00:00:00 2001 From: Ashelyn Rose Date: Wed, 19 Jul 2023 16:07:44 -0600 Subject: [PATCH] Update tempest --- flake.lock | 169 ++++++++++++++++++++++++++++++++++++++++------------- flake.nix | 7 ++- 2 files changed, 133 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index a0adcfb..a6686dc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,11 +1,31 @@ { "nodes": { - "gotosocial": { + "ashen-earth": { "inputs": { "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", "utils": "utils" }, + "locked": { + "lastModified": 1688459062, + "narHash": "sha256-KEG2hGZPn6ulMTVv7Q+QoxtLotd/bJnAmqzZkfJ9i+w=", + "ref": "refs/heads/main", + "rev": "18819be419babef8d6e609216f17f407693b6b65", + "revCount": 7, + "type": "git", + "url": "ssh://git@git.tempest.dev/ashe/ashen-earth" + }, + "original": { + "type": "git", + "url": "ssh://git@git.tempest.dev/ashe/ashen-earth" + } + }, + "gotosocial": { + "inputs": { + "nix-filter": "nix-filter_2", + "nixpkgs": "nixpkgs_2", + "utils": "utils_2" + }, "locked": { "lastModified": 1686992620, "narHash": "sha256-G+xjg/MOnQHiWuV4fZ9Dy3itk5x9qZ740k26areeokY=", @@ -25,7 +45,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils_3" }, "locked": { "lastModified": 1685325875, @@ -44,7 +64,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1679567394, @@ -62,11 +82,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1681154353, - "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", + "lastModified": 1687178632, + "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", "owner": "numtide", "repo": "nix-filter", - "rev": "f529f42792ade8e32c4be274af6b6d60857fbee7", + "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", "type": "github" }, "original": { @@ -120,7 +140,38 @@ "type": "github" } }, + "nix-filter_5": { + "locked": { + "lastModified": 1681154353, + "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f529f42792ade8e32c4be274af6b6d60857fbee7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1688457572, + "narHash": "sha256-eKy3ChXQc4DWD4xYwRNTFhU4fdWTHqEnis0FM3TsOQU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fa4ca0210075b0c7301f25c225361cee113aa792", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1686433093, "narHash": "sha256-mgsBp6ldpjYzw69fTDsGjbkRkDw+KEab8lYijNb/x5M=", @@ -136,7 +187,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1686929285, "narHash": "sha256-WGtVzn+vGMPTXDO0DMNKVFtf+zUSqeW+KKk4Y/Ae99I=", @@ -152,7 +203,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1685394864, "narHash": "sha256-kkWyAz7pFXn5g28vUjBTFOZafT0oCLr5s5Z/B13aPEI=", @@ -168,7 +219,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1687026603, "narHash": "sha256-4uVirBZbSgpVtkoRXD4IxTe9UXRcIKhxT4CUK+3Bby8=", @@ -184,7 +235,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1686979235, "narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=", @@ -200,7 +251,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1685005470, "narHash": "sha256-Nw+4uivzCwyZcEB71YH58zYk4N5UgcNeqb+D52bjlhI=", @@ -216,7 +267,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1684759798, "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=", @@ -230,7 +281,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1684759798, "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=", @@ -248,8 +299,8 @@ }, "private": { "inputs": { - "nixpkgs": "nixpkgs_3", - "utils": "utils_3" + "nixpkgs": "nixpkgs_4", + "utils": "utils_4" }, "locked": { "lastModified": 1687029136, @@ -267,9 +318,10 @@ }, "root": { "inputs": { + "ashen-earth": "ashen-earth", "gotosocial": "gotosocial", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "private": "private", "tempest-contact": "tempest-contact", "tempest-secret": "tempest-secret", @@ -382,11 +434,26 @@ "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" + } + }, "tempest-contact": { "inputs": { - "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_4", - "utils": "utils_4" + "nix-filter": "nix-filter_3", + "nixpkgs": "nixpkgs_5", + "utils": "utils_5" }, "locked": { "lastModified": 1687029231, @@ -404,9 +471,9 @@ }, "tempest-secret": { "inputs": { - "nix-filter": "nix-filter_3", - "nixpkgs": "nixpkgs_5", - "utils": "utils_5" + "nix-filter": "nix-filter_4", + "nixpkgs": "nixpkgs_6", + "utils": "utils_6" }, "locked": { "lastModified": 1685398072, @@ -424,16 +491,16 @@ }, "tempestdev": { "inputs": { - "nix-filter": "nix-filter_4", - "nixpkgs": "nixpkgs_6", - "utils": "utils_6" + "nix-filter": "nix-filter_5", + "nixpkgs": "nixpkgs_7", + "utils": "utils_7" }, "locked": { - "lastModified": 1687029739, - "narHash": "sha256-Gu8MrRkHhaIZsoqt04d39zo91oEG83myyU1fWIsT6b8=", + "lastModified": 1689804261, + "narHash": "sha256-J92su1OjbgfJEDhB7Rc8c4Zu+oI4Xfmojp6pgfjsTMk=", "ref": "refs/heads/main", - "rev": "ad08de6e941cfbae56b4d72d8f9e3b73b2eeb943", - "revCount": 57, + "rev": "8730783c1cc16d26b952c254b6a90769b8bcc158", + "revCount": 59, "type": "git", "url": "http://git.tempest.dev/ashe/tempest.dev" }, @@ -445,8 +512,8 @@ "tmpfiles": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_8", - "utils": "utils_7" + "nixpkgs": "nixpkgs_9", + "utils": "utils_8" }, "locked": { "lastModified": 1684903753, @@ -467,11 +534,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -503,11 +570,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -521,11 +588,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -556,6 +623,24 @@ "inputs": { "systems": "systems_6" }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_7": { + "inputs": { + "systems": "systems_7" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -570,9 +655,9 @@ "type": "github" } }, - "utils_7": { + "utils_8": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, diff --git a/flake.nix b/flake.nix index c908b18..10de810 100644 --- a/flake.nix +++ b/flake.nix @@ -9,9 +9,10 @@ tempest-secret.url = "git+ssh://git@git.tempest.dev/ashe/tempest-skycord-secret"; tempest-contact.url = "git+http://git.tempest.dev/ashe/contact-api"; gotosocial.url = "git+http://git.tempest.dev/ashe/nixos-wrapper-gotosocial"; + ashen-earth.url = "git+ssh://git@git.tempest.dev/ashe/ashen-earth"; }; - outputs = { self, nixpkgs, home-manager, private, tmpfiles, tempestdev, tempest-secret, tempest-contact, gotosocial }: { + outputs = { self, nixpkgs, home-manager, private, tmpfiles, tempestdev, tempest-secret, tempest-contact, gotosocial, ashen-earth }: { nixosConfigurations = { nyx = nixpkgs.lib.nixosSystem { @@ -21,6 +22,7 @@ home-manager.nixosModules.home-manager private.nixosModules.nyx + ashen-earth.nixosModule tmpfiles.nixosModule tempestdev.nixosModule tempest-secret.nixosModule @@ -38,6 +40,9 @@ security.acme.acceptTerms = true; security.acme.defaults.email = "acme@tempest.dev"; + ashe.services."ashen.earth".enable = true; + ashe.services."ashen.earth".domain = "ashen.earth"; + ashe.services.tmpfiles.enable = true; ashe.services.tmpfiles.domain = "files.tempest.dev"; ashe.services.tmpfiles.port = 4441;