diff --git a/.github/workflows/weekly-build-cache.yml b/.github/workflows/weekly-build-cache.yml index 45093e0..3f00abc 100644 --- a/.github/workflows/weekly-build-cache.yml +++ b/.github/workflows/weekly-build-cache.yml @@ -39,7 +39,7 @@ jobs: if: steps.check_changes.outputs.changes == 'true' run: | # Configure attic client to use your cache server - attic login jawz-cache https://cache.servidos.lat ${{ secrets.ATTIC_TOKEN }} + attic login servidos https://cache.servidos.lat ${{ secrets.ATTIC_TOKEN }} - name: Build workstation configuration if: steps.check_changes.outputs.changes == 'true' @@ -47,12 +47,6 @@ jobs: echo "Building workstation configuration..." nix build .#nixosConfigurations.workstation.config.system.build.toplevel --print-build-logs - - name: Build miniserver configuration - if: steps.check_changes.outputs.changes == 'true' - run: | - echo "Building miniserver configuration..." - nix build .#nixosConfigurations.miniserver.config.system.build.toplevel --print-build-logs - - name: Build server configuration if: steps.check_changes.outputs.changes == 'true' run: | @@ -65,13 +59,12 @@ jobs: echo "Pushing builds to cache..." # Push all built derivations to cache if ls result* 1> /dev/null 2>&1; then - attic push jawz-cache result* + attic push servidos:nixos result* fi # Push the specific system derivations we just built - nix build .#nixosConfigurations.workstation.config.system.build.toplevel --print-out-paths | attic push jawz-cache --stdin - nix build .#nixosConfigurations.miniserver.config.system.build.toplevel --print-out-paths | attic push jawz-cache --stdin - nix build .#nixosConfigurations.server.config.system.build.toplevel --print-out-paths | attic push jawz-cache --stdin + nix build .#nixosConfigurations.workstation.config.system.build.toplevel --print-out-paths | attic push servidos:nixos --stdin + nix build .#nixosConfigurations.server.config.system.build.toplevel --print-out-paths | attic push servidos:nixos --stdin - name: Commit updated flake.lock if: steps.check_changes.outputs.changes == 'true' @@ -92,7 +85,7 @@ jobs: if [[ "${{ steps.check_changes.outputs.changes }}" == "true" ]]; then echo "✅ Weekly build completed successfully!" echo "- Updated flake.lock" - echo "- Built all NixOS configurations" + echo "- Built workstation and server configurations" echo "- Pushed builds to Atticd cache" echo "- Committed changes and created release tag" else diff --git a/config/base.nix b/config/base.nix index 54c3347..7b1c2f3 100644 --- a/config/base.nix +++ b/config/base.nix @@ -104,8 +104,7 @@ "https://cosmic.cachix.org" ]; trusted-public-keys = [ - # TODO: Replace with actual atticd public key after setup - # "cache.servidos.lat:YOUR_ATTICD_PUBLIC_KEY_HERE" + "nixos:kubuWhYCk9/aZp5GDJFAScYgigM66DszP8i1Pzbq0Fc=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU=" "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="