diff --git a/deploy/shell.sh b/deploy/shell.sh index 66002db..440faba 100755 --- a/deploy/shell.sh +++ b/deploy/shell.sh @@ -5,7 +5,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) cd $SCRIPT_DIR/.. echo "Building Nix environment in docker" -IMAGE=$(docker build . -q -f ./deploy/Dockerfile --platform linux/amd64) +IMAGE=$(docker build . -q -f ./deploy/Dockerfile) echo "Starting interactive shell" docker run \ @@ -14,7 +14,6 @@ docker run \ --mount type=bind,src=$(pwd)/,dst=/deploy/ \ --mount type=bind,src=$(pwd)/deploy/.ssh/,dst=/root/.ssh/,readonly=true \ --mount type=volume,src=nixCache,dst=/nix/ \ - --platform linux/arm64 \ -it $IMAGE \ bash diff --git a/flake.lock b/flake.lock index e1ce6ae..b2e5bc6 100644 --- a/flake.lock +++ b/flake.lock @@ -35,12 +35,32 @@ "url": "ssh://git@git.tempest.dev/cinder/seance-config" } }, - "deploy-rs": { + "daemon": { "inputs": { - "flake-compat": "flake-compat", + "nix-filter": "nix-filter_2", "nixpkgs": "nixpkgs_2", "utils": "utils_2" }, + "locked": { + "lastModified": 1705225104, + "narHash": "sha256-4zMDHyBzC1MCO5rcljsEq4wuwOdFhv1f2WdKZeTOmg0=", + "ref": "refs/heads/main", + "rev": "396456d85de49775c7e29740287a85f433f02496", + "revCount": 3, + "type": "git", + "url": "ssh://git@git.tempest.dev/ashe/daemon.press" + }, + "original": { + "type": "git", + "url": "ssh://git@git.tempest.dev/ashe/daemon.press" + } + }, + "deploy-rs": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_3", + "utils": "utils_3" + }, "locked": { "lastModified": 1694513707, "narHash": "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc=", @@ -57,9 +77,9 @@ }, "drowning": { "inputs": { - "nix-filter": "nix-filter_2", - "nixpkgs": "nixpkgs_3", - "utils": "utils_3" + "nix-filter": "nix-filter_3", + "nixpkgs": "nixpkgs_4", + "utils": "utils_4" }, "locked": { "lastModified": 1692988995, @@ -93,9 +113,9 @@ }, "gotosocial": { "inputs": { - "nix-filter": "nix-filter_3", - "nixpkgs": "nixpkgs_4", - "utils": "utils_4" + "nix-filter": "nix-filter_4", + "nixpkgs": "nixpkgs_5", + "utils": "utils_5" }, "locked": { "lastModified": 1703193680, @@ -134,7 +154,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1679567394, @@ -166,6 +186,21 @@ } }, "nix-filter_2": { + "locked": { + "lastModified": 1701697642, + "narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "c843418ecfd0344ecb85844b082ff5675e02c443", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-filter_3": { "locked": { "lastModified": 1681154353, "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", @@ -180,7 +215,7 @@ "type": "github" } }, - "nix-filter_3": { + "nix-filter_4": { "locked": { "lastModified": 1681154353, "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", @@ -195,7 +230,7 @@ "type": "github" } }, - "nix-filter_4": { + "nix-filter_5": { "locked": { "lastModified": 1694857738, "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", @@ -210,7 +245,7 @@ "type": "github" } }, - "nix-filter_5": { + "nix-filter_6": { "locked": { "lastModified": 1681154353, "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", @@ -225,7 +260,7 @@ "type": "github" } }, - "nix-filter_6": { + "nix-filter_7": { "locked": { "lastModified": 1681154353, "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", @@ -240,7 +275,7 @@ "type": "github" } }, - "nix-filter_7": { + "nix-filter_8": { "locked": { "lastModified": 1681154353, "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", @@ -272,6 +307,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1687026603, + "narHash": "sha256-4uVirBZbSgpVtkoRXD4IxTe9UXRcIKhxT4CUK+3Bby8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bbce166d72307eda55c9a62b9d70e1f42d887ec8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1686979235, "narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=", @@ -287,7 +338,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1685005470, "narHash": "sha256-Nw+4uivzCwyZcEB71YH58zYk4N5UgcNeqb+D52bjlhI=", @@ -303,7 +354,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1684759798, "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=", @@ -317,7 +368,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1684759798, "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=", @@ -334,6 +385,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1705223492, + "narHash": "sha256-gCNJG61Jx0KXJYefCGAl/pGyMyimk3ZflA2dNWedYo8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f75c71636305e517058de35c7f2ede6813e52eb9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1671417167, "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", @@ -349,7 +416,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1686547151, "narHash": "sha256-lnu+ziAXNa3iiPtFVg9Ex7ZUcsYCb7zZVpv9OiB1iac=", @@ -365,7 +432,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1686433093, "narHash": "sha256-mgsBp6ldpjYzw69fTDsGjbkRkDw+KEab8lYijNb/x5M=", @@ -381,7 +448,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1700787330, "narHash": "sha256-4VIBCyfqnEsdVP/SgKZ3rudwzxGdEqpKfgoWETs/I6k=", @@ -397,7 +464,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1701034145, "narHash": "sha256-ZwNrKJvEJg7UOKAl+oPIAsbA/yFVuCkhwziFAEQ1tB0=", @@ -413,7 +480,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1685394864, "narHash": "sha256-kkWyAz7pFXn5g28vUjBTFOZafT0oCLr5s5Z/B13aPEI=", @@ -429,7 +496,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1694928810, "narHash": "sha256-M/3+pRQmM+FeBeSKRp0b01pncbNiiC2ggJE4Wpi7c1Q=", @@ -445,26 +512,10 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1687026603, - "narHash": "sha256-4uVirBZbSgpVtkoRXD4IxTe9UXRcIKhxT4CUK+3Bby8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bbce166d72307eda55c9a62b9d70e1f42d887ec8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "pounce": { "inputs": { - "nixpkgs": "nixpkgs_6", - "utils": "utils_5" + "nixpkgs": "nixpkgs_7", + "utils": "utils_6" }, "locked": { "lastModified": 1701043062, @@ -482,8 +533,8 @@ }, "private": { "inputs": { - "nixpkgs": "nixpkgs_7", - "utils": "utils_6" + "nixpkgs": "nixpkgs_8", + "utils": "utils_7" }, "locked": { "lastModified": 1704816317, @@ -503,11 +554,12 @@ "inputs": { "ashen-earth": "ashen-earth", "cinder": "cinder", + "daemon": "daemon", "deploy-rs": "deploy-rs", "drowning": "drowning", "gotosocial": "gotosocial", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "pounce": "pounce", "private": "private", "seance": "seance", @@ -519,9 +571,9 @@ }, "seance": { "inputs": { - "nix-filter": "nix-filter_4", - "nixpkgs": "nixpkgs_8", - "utils": "utils_7" + "nix-filter": "nix-filter_5", + "nixpkgs": "nixpkgs_9", + "utils": "utils_8" }, "locked": { "lastModified": 1704080891, @@ -567,6 +619,21 @@ "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": 1681028828, @@ -689,9 +756,9 @@ }, "tempest-contact": { "inputs": { - "nix-filter": "nix-filter_5", - "nixpkgs": "nixpkgs_9", - "utils": "utils_8" + "nix-filter": "nix-filter_6", + "nixpkgs": "nixpkgs_10", + "utils": "utils_9" }, "locked": { "lastModified": 1687029231, @@ -709,9 +776,9 @@ }, "tempest-secret": { "inputs": { - "nix-filter": "nix-filter_6", - "nixpkgs": "nixpkgs_10", - "utils": "utils_9" + "nix-filter": "nix-filter_7", + "nixpkgs": "nixpkgs_11", + "utils": "utils_10" }, "locked": { "lastModified": 1685398072, @@ -729,9 +796,9 @@ }, "tempestdev": { "inputs": { - "nix-filter": "nix-filter_7", - "nixpkgs": "nixpkgs_11", - "utils": "utils_10" + "nix-filter": "nix-filter_8", + "nixpkgs": "nixpkgs_12", + "utils": "utils_11" }, "locked": { "lastModified": 1701935901, @@ -750,8 +817,8 @@ "tmpfiles": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_13", - "utils": "utils_11" + "nixpkgs": "nixpkgs_14", + "utils": "utils_12" }, "locked": { "lastModified": 1684903753, @@ -790,11 +857,11 @@ "systems": "systems_9" }, "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": { @@ -821,13 +888,16 @@ "type": "github" } }, - "utils_2": { + "utils_12": { + "inputs": { + "systems": "systems_11" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -836,16 +906,31 @@ "type": "github" } }, - "utils_3": { + "utils_2": { "inputs": { "systems": "systems_2" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -877,11 +962,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -895,11 +980,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -913,11 +998,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -931,11 +1016,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fff0c8b..cf269af 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ seance.url = "git+ssh://git@git.tempest.dev/ashe/seance"; pounce.url = "git+http://git.tempest.dev/ashe/nixos-wrapper-pounce"; cinder.url = "git+ssh://git@git.tempest.dev/cinder/seance-config"; + daemon.url = "git+ssh://git@git.tempest.dev/ashe/daemon.press"; }; outputs = { @@ -33,6 +34,7 @@ seance, pounce, cinder, + daemon, }: { nixosConfigurations = { nyx = nixpkgs.lib.nixosSystem { @@ -52,6 +54,7 @@ seance.nixosModule pounce.nixosModule cinder.nixosModule + daemon.nixosModule ./hosts/nyx/include/acme.nix ./hosts/nyx/include/nginx.nix diff --git a/hosts/nyx/include/services.nix b/hosts/nyx/include/services.nix index 208334f..bc13b9c 100644 --- a/hosts/nyx/include/services.nix +++ b/hosts/nyx/include/services.nix @@ -26,4 +26,7 @@ ashe.services.drowning.enable = true; ashe.services.drowning.domain = "drowning.ashen.earth"; + + ashe.services."daemon.press".enable = true; + ashe.services."daemon.press".domain = "xn--dmon-voa.press"; }