diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml index b8a1d2e..908806f 100644 --- a/.github/workflows/build-machines-and-homes.yml +++ b/.github/workflows/build-machines-and-homes.yml @@ -41,6 +41,12 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' useDaemon: false installCommand: nix profile install nixpkgs#cachix + - name: Setup Attic cache + uses: ryanccn/attic-action@v0 + with: + endpoint: ${{ vars.ATTIC_ENDPOINT }} + cache: ${{ vars.ATTIC_CACHE }} + token: ${{ secrets.ATTIC_TOKEN }} - name: Restore and cache Nix store uses: nix-community/cache-nix-action@v5.1.0 with: @@ -93,6 +99,12 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' useDaemon: false installCommand: nix profile install nixpkgs#cachix + - name: Setup Attic cache + uses: ryanccn/attic-action@v0 + with: + endpoint: ${{ vars.ATTIC_ENDPOINT }} + cache: ${{ vars.ATTIC_CACHE }} + token: ${{ secrets.ATTIC_TOKEN }} - name: Restore and cache Nix store uses: nix-community/cache-nix-action@v5.1.0 with: diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 1fb55fd..4408d30 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -33,6 +33,12 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' useDaemon: false installCommand: nix profile install nixpkgs#cachix + - name: Setup Attic cache + uses: ryanccn/attic-action@v0 + with: + endpoint: ${{ vars.ATTIC_ENDPOINT }} + cache: ${{ vars.ATTIC_CACHE }} + token: ${{ secrets.ATTIC_TOKEN }} - name: Restore and cache Nix store uses: nix-community/cache-nix-action@v5.1.0 with: diff --git a/flake.lock b/flake.lock index 6aefae5..e4d276f 100644 --- a/flake.lock +++ b/flake.lock @@ -493,11 +493,11 @@ ] }, "locked": { - "lastModified": 1740624780, - "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=", + "lastModified": 1740606115, + "narHash": "sha256-GKe3vrIWcei4gSTckEzHr5Zf/g9NSofmsAnbkNYU+lM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6", + "rev": "6be185eb76295e7562f5bf2da42afe374b8beb15", "type": "github" }, "original": { @@ -614,11 +614,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1740647693, - "narHash": "sha256-pYxhtDAOmlbP4XqgjIvbpi7CFtX8USH6DlRybS2Jxu4=", + "lastModified": 1740601249, + "narHash": "sha256-ruwhgVCS3c2kWhNVlgfNX/y4zAtonPqfUMJvC6Ha254=", "ref": "refs/heads/main", - "rev": "03ade5e6d75cb7705900cf696505b836fc831be0", - "revCount": 17515, + "rev": "5d055896bccdad6ebb135ebf7cb80eafb217ad67", + "revCount": 17508, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -694,11 +694,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740655457, - "narHash": "sha256-brpdF7wEdGDZWuV8T5axwzHr5gnGfB7Dua2QVAjSSL4=", + "lastModified": 1740592142, + "narHash": "sha256-v+Qg8V0UHkXCDSgqKowqMyJR2LGKIJGA0HbwCRgZN/0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2a098dfa179b6d89c962908df0e4840308db04df", + "rev": "259a8cc3e351d0a34063ae857d3c730b1ae4ad56", "type": "github" }, "original": { @@ -727,11 +727,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1740641916, - "narHash": "sha256-aYAYvdKnmmlkN7t4VbPfPbAtWHHADKHL8bPlNYZ2bZY=", + "lastModified": 1740587638, + "narHash": "sha256-/BQ67VCF0ZpqCvxmVR18HdnqFy81ABWaKjz1FFwL65g=", "owner": "YaLTeR", "repo": "niri", - "rev": "70dcd229cfaa54946163ccf0a1ea0ce595a35cc4", + "rev": "693d9355386c6217bb9cca5cb30c2b4248f19d8c", "type": "github" }, "original": { @@ -1001,11 +1001,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740642522, - "narHash": "sha256-t6VfQs+u3CiVASTVkjQhBh5u8NcEo/VDWEYagCIwVCk=", + "lastModified": 1740557110, + "narHash": "sha256-D2waFyJkaepTchTrGVAIfCd/YP+37bgXWg9cXwuxuT0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6fde23c7a50cf47485e28fa0c51b8ed4cfdf1d7", + "rev": "b89a821293c3872992137114d0db9a791243a41b", "type": "github" }, "original": { @@ -1211,11 +1211,11 @@ ] }, "locked": { - "lastModified": 1740623427, - "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=", + "lastModified": 1740536993, + "narHash": "sha256-3YI+1ONZ28chM19Hep9Z+TSyiybYf/1VC/gwImVZKUw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab", + "rev": "9f05c0655de9dc2c7b60b689447c48abb9190bf8", "type": "github" }, "original": { @@ -1307,11 +1307,11 @@ ] }, "locked": { - "lastModified": 1740655383, - "narHash": "sha256-HHb6wtlHWy/CW3oCtOyOQrNnzgtsvwvwM6wAlDvfTec=", + "lastModified": 1740534654, + "narHash": "sha256-NYHxfMVMy1ehRTlkinUdAG+iw7mWyWNcSRcRpCgTDVk=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "bcf7577daac02aa1a7dfaddc79324b7c6ca4af81", + "rev": "4283e3e25d5c82e96fe3b575175b33abe66c5031", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 710d889..85063f3 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,9 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; + inputs.flake-compat.follows = "flake-compat"; + inputs.home-manager.follows = "home-manager"; + inputs.treefmt-nix.follows = "treefmt"; }; flake-parts = { url = "github:hercules-ci/flake-parts"; @@ -101,12 +104,15 @@ nixConfig = { extra-substituters = [ + "https://cache.cy7.sh/central" "https://niri.cachix.org" "https://nix-community.cachix.org" "https://cache.garnix.io" "https://cything.cachix.org" + "https://aseipp-nix-cache.global.ssl.fastly.net" ]; extra-trusted-public-keys = [ + "central:KNxL0JFzHDGosui8ASem9n/tDmEAYLL9dtVMJ6TWsyg=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index d16cd5f..ddb2212 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -147,13 +147,13 @@ RUSTC_WRAPPER = "${lib.getExe pkgs.sccache}"; SCCACHE_BUCKET = "sccache"; SCCACHE_REGION = "us-east-1"; - SCCACHE_ENDPOINT = "https://e3e97aac307d106a7becea43cef8fcbd.r2.cloudflarestorage.com"; + SCCACHE_ENDPOINT = "https://sccache.s3.cy7.sh"; SCCACHE_ALLOW_CORE_DUMPS = "true"; SCCACHE_S3_USE_SSL = "true"; SCCACHE_CACHE_MULTIARCH = "true"; SCCACHE_LOG = "warn"; AWS_DEFAULT_REGION = "us-east-1"; - AWS_ENDPOINT_URL = "https://e3e97aac307d106a7becea43cef8fcbd.r2.cloudflarestorage.com"; + AWS_ENDPOINT_URL = "https://s3.cy7.sh"; AWS_ACCESS_KEY_ID = "$(cat /run/secrets/aws/key_id)"; AWS_SECRET_ACCESS_KEY = "$(cat /run/secrets/aws/key_secret)"; }; diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index ec85850..e565100 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -19,6 +19,7 @@ ./conduwuit.nix ./immich.nix ./element.nix + ./attic.nix ./forgejo.nix ./garage.nix ./tailscale.nix diff --git a/hosts/common.nix b/hosts/common.nix index e59c314..f2fb963 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -10,12 +10,15 @@ "@wheel" ]; trusted-public-keys = [ + "central:KNxL0JFzHDGosui8ASem9n/tDmEAYLL9dtVMJ6TWsyg=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "cything.cachix.org-1:xqW1W5NNL+wrM9wfSELb0MLj/harD2ZyB4HbdaMyvPI=" ]; substituters = [ + "https://aseipp-nix-cache.global.ssl.fastly.net" + "https://cache.cy7.sh/central" "https://niri.cachix.org" "https://nix-community.cachix.org" "https://cache.garnix.io" diff --git a/secrets/yt/aws.yaml b/secrets/yt/aws.yaml index 40f828a..95bdf7a 100644 --- a/secrets/yt/aws.yaml +++ b/secrets/yt/aws.yaml @@ -1,8 +1,6 @@ aws: - key_id: ENC[AES256_GCM,data:9tWAMzUv4f6Ea27XsmYhO11NroYnLmED/FVrCCGO0Vc=,iv:YP1xRjVd1M1MB7IKVAw0Sdx0E4AokBrsaAcDLvTLHD4=,tag:SEmEr3NoZvch9LeaJHbCww==,type:str] - key_secret: ENC[AES256_GCM,data:AK+vER4T1p0AknKzsxZQJ0JTpfIstnnTWSAZ26zJSCwJYgRYwj8RF98CS7HM+KWvz5VNGENxhVdUnjlGkrTB4w==,iv:3o79gwp5b4KGsixW02qFWYFvpagY/hykbYJ/WNz6PB8=,tag:GW2T8ggKYHa1CQ6DRomJDQ==,type:str] - _garage_key_id: ENC[AES256_GCM,data:2lLS1nBhrwBkJh/ei7FwBoR6jOI6KCJkvOs=,iv:jwB7ZEaKOPIwghcGRs3qaICypoHgSxkFBOyB6e5hpYI=,tag:Iqwv3j1R1uLLUDKLhN1Atg==,type:str] - _garage_key_secret: ENC[AES256_GCM,data:5iwwMfojHrR79cOIY+9O2oVY8v1cbPcECMSOMhWuGAdc2lfCogKBwLM4TFwBH9X1Vx56QvUoxCQ2uSyfOMLR7A==,iv:Q523ttz6ijmv8/JlVZuldFR4IabEKiVN4sGmJ9xDJU0=,tag:ZZ4LRG4DXOC7LY8hEjXYHQ==,type:str] + key_id: ENC[AES256_GCM,data:vxa8IS5zVOStsQaQNoPy36MeCw2KD2Th5tg=,iv:TrPukr/bpkGysf1YigBlXwaCu0H1FM6ivCVQEgnst6A=,tag:yrlcsDkLkH7U2i3JgjDaBA==,type:str] + key_secret: ENC[AES256_GCM,data:R9hFgtylEW1RphrP7/9Hi7HIb7gcQX1WDEVfnUTTzh+/0LM2Rb9CdkaleO8wNlcyYVE/jUKtqdqqrospAJ7+Zw==,iv:3+yCVqH441+oXFLI5usaQdhnE3GFhbJjMsYeRvk8xEw=,tag:STxA32cSdwPBikXyVEP5+Q==,type:str] sops: kms: [] gcp_kms: [] @@ -27,8 +25,8 @@ sops: UlYrTExEUVc0dURLR1czN3BnYzZ2VGMKCbAgM50jvs9VciA1Pb/VY+2I4x62LBGe j7eHkfTFc8Gnk/rZA9/ZJDLFr/FUPMQWK/NVoz6oLjO6oVFXqN6OqA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-02-27T02:50:27Z" - mac: ENC[AES256_GCM,data:FjlbCqqYHPn/FDPUR1flWgg6wwHhLJx1uKOedwkvsTxuPhlVJHghTHWYetdmplOQyEpOEbyv+iqKTGDYHzDdgU2jIZ0TKM66iHq+1yft4TatBu75/0N3I+SfZv97vKNehxN/zvIY3FQF4O8qVy9c1dZRmr7q27Wq2pdHSOe4Myg=,iv:YkUXcOwb6UZr0vXazbLrVeGTvBTtnwuEIY3O+GSrnNk=,tag:kQBh7urSnHoiV18TIGlPEg==,type:str] + lastmodified: "2025-01-30T17:45:09Z" + mac: ENC[AES256_GCM,data:uXnJ8DCs1ZZ72PFAmSQpqvVH2UYvRX8AeUC00A6WsgNL9sz6H0b7PwXBn4SucHACwLwilMVKYpFGE1pPMsIgpHxU5coNhvTfth/ChY1KS73LAwrJUAyUoFI3mumPkklj7b/u1CbBfhuhA2QoZVl+d9BGQn5CQu3+BySUmcT+P9k=,iv:H/hUTBDNcsGBP5TA/7U1QMZogZvuoPuEAg/tBCpbf9w=,tag:W7rH84Na/tHPuJlA9tRXEQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.4