Merge remote-tracking branch 'origin/main' into packages

Author: MarcelCoding

.github/workflows/gh-pages.yaml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Make some space
         # TODO: switch back to a release, when https://github.com/wimpysworld/nothing-but-nix/pull/25 is in one
@@ -34,13 +34,8 @@ jobs:
           hatchet-protocol: 'carve'  # keep npx for cloudflare upload
           nix-permission-edict: true  # required for nix-quick-install-action
 
-      - name: Install Nix
-        uses: nixbuild/nix-quick-install-action@v34
-
-      - uses: nix-community/cache-nix-action@v6
-        with:
-          primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
-          restore-prefixes-first-match: nix-${{ runner.os }}-
+      - uses: cachix/install-nix-action@v31
+      - uses: DeterminateSystems/magic-nix-cache-action@v13
 
       - name: Update inputs
         if: github.event_name == 'schedule'
@@ -71,5 +66,5 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5
         if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}

.github/workflows/post-compare-link.yaml

@@ -12,7 +12,7 @@ jobs:
   post-compare-link:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - uses: NuschtOS/flake-lock-compare-action@main

.github/workflows/template-sync.yaml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository != 'NuschtOS/template'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
       - uses: AndreasAugustin/actions-template-sync@v2

flake.nix

@@ -32,6 +32,7 @@
       inputs = {
         flake-compat.follows = "";
         nixpkgs.follows = "nixpkgs";
+        treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
       };
     };
     disko = {