diff --git a/.github/actions/build-package/action.yml b/.github/actions/build-package/action.yml index 4318fa3b..e5ae1985 100644 --- a/.github/actions/build-package/action.yml +++ b/.github/actions/build-package/action.yml @@ -12,7 +12,7 @@ runs: - uses: DeterminateSystems/nix-installer-action@v16 with: determinate: true - - uses: DeterminateSystems/magic-nix-cache-action@v8 + - uses: DeterminateSystems/flakehub-cache-action@v1 - name: Building 👷 ${{ inputs.package }} 📦 shell: bash run: | @@ -25,7 +25,3 @@ runs: echo "✅ License found, building normally" nix build .#${{ inputs.package }} -L fi - - uses: "DeterminateSystems/flakehub-push@v5" - with: - include-output-paths: true - visibility: "public" diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index f8d5c9e8..13ebe2db 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -19,7 +19,6 @@ jobs: - defold - heynote - hyprpicker - - ollama - open-webui - station - gotosocial diff --git a/.github/workflows/build-servers.yml b/.github/workflows/build-servers.yml index c4a0f209..6d32f63e 100644 --- a/.github/workflows/build-servers.yml +++ b/.github/workflows/build-servers.yml @@ -35,10 +35,6 @@ jobs: fi done nix build .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel -L - - uses: "DeterminateSystems/flakehub-push@v5" - with: - include-output-paths: true - visibility: "public" build-home: runs-on: ubuntu-22.04 @@ -55,7 +51,7 @@ jobs: - uses: DeterminateSystems/nix-installer-action@v16 with: determinate: true - - uses: DeterminateSystems/magic-nix-cache-action@v8 + - uses: DeterminateSystems/flakehub-cache-action@v1 - name: Building 👷 ${{ matrix.home }} 🏠 run: | # Disable non-redist packages @@ -66,7 +62,3 @@ jobs: fi done nix run nixpkgs#home-manager -- build --flake .#${{ matrix.home }} -L - - uses: "DeterminateSystems/flakehub-push@v5" - with: - include-output-paths: true - visibility: "public" diff --git a/.github/workflows/build-vms.yml b/.github/workflows/build-vms.yml index f980dc95..bedf8623 100644 --- a/.github/workflows/build-vms.yml +++ b/.github/workflows/build-vms.yml @@ -50,7 +50,3 @@ jobs: - name: Building 👷 ${{ matrix.home }} 🏚️ run: | nix run nixpkgs#home-manager -- build --flake .#${{ matrix.home }} -L - - uses: "DeterminateSystems/flakehub-push@v5" - with: - include-output-paths: true - visibility: "public" diff --git a/.github/workflows/build-workstations.yml b/.github/workflows/build-workstations.yml index 5bae94ae..10748c06 100644 --- a/.github/workflows/build-workstations.yml +++ b/.github/workflows/build-workstations.yml @@ -35,10 +35,6 @@ jobs: fi done nix build .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel -L - - uses: "DeterminateSystems/flakehub-push@v5" - with: - include-output-paths: true - visibility: "public" build-home: runs-on: ubuntu-22.04 @@ -66,7 +62,3 @@ jobs: fi done nix run nixpkgs#home-manager -- build --flake .#${{ matrix.home }} -L - - uses: "DeterminateSystems/flakehub-push@v5" - with: - include-output-paths: true - visibility: "public" diff --git a/.github/workflows/flake-checker.yml b/.github/workflows/flake-checker.yml index bacaca48..cf060f89 100644 --- a/.github/workflows/flake-checker.yml +++ b/.github/workflows/flake-checker.yml @@ -20,5 +20,5 @@ jobs: - uses: DeterminateSystems/nix-installer-action@v16 with: determinate: true - - uses: DeterminateSystems/magic-nix-cache-action@v8 + - uses: DeterminateSystems/flakehub-cache-action@v1 - uses: DeterminateSystems/flake-checker-action@v9 diff --git a/.github/workflows/lock-updater.yml b/.github/workflows/lock-updater.yml index 74984c93..c6642242 100644 --- a/.github/workflows/lock-updater.yml +++ b/.github/workflows/lock-updater.yml @@ -19,7 +19,7 @@ jobs: - uses: DeterminateSystems/nix-installer-action@v16 with: determinate: true - - uses: DeterminateSystems/magic-nix-cache-action@v8 + - uses: DeterminateSystems/flakehub-cache-action@v1 - uses: DeterminateSystems/update-flake-lock@v24 with: pr-title: "chore: update flake.lock" diff --git a/README.md b/README.md index 39650d40..0c8a5b05 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Dual boot systems have the NixOS install named a Sith Lord and the *"other"* OS - [.github]: GitHub CI/CD workflows Nix ❄️ supercharged ⚡️ by [**Determinate Systems**](https://determinate.systems) - [Nix Installer Action](https://github.com/marketplace/actions/the-determinate-nix-installer) - - [Magic Nix Cache Action](https://github.com/marketplace/actions/magic-nix-cache) + - [FlakeHub Cache Action](https://github.com/marketplace/actions/flakehub-cache) - [Flake Checker Action](https://github.com/marketplace/actions/nix-flake-checker) - [Update Flake Lock Action](https://github.com/marketplace/actions/update-flake-lock) - [darwin]: macOS configurations diff --git a/flake.lock b/flake.lock index 5e712b8a..aff502be 100644 --- a/flake.lock +++ b/flake.lock @@ -127,7 +127,7 @@ }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/nix-community/disko/1.10.0.tar.gz" + "url": "https://flakehub.com/f/nix-community/disko/1.11.0.tar.gz" } }, "fenix": { diff --git a/flake.nix b/flake.nix index 5c5136cd..5ad40ef2 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ catppuccin.url = "https://flakehub.com/f/catppuccin/nix/*"; catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*"; catppuccin-vsc.inputs.nixpkgs.follows = "nixpkgs"; - disko.url = "https://flakehub.com/f/nix-community/disko/1.10.0.tar.gz"; + disko.url = "https://flakehub.com/f/nix-community/disko/1.11.0.tar.gz"; disko.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "https://flakehub.com/f/NixOS/nixos-hardware/*"; nixos-needsreboot.url = "https://codeberg.org/Mynacol/nixos-needsreboot/archive/0.2.2.tar.gz";