5.0 merge

.github/workflows/update-flake-lock.yml

@@ -8,6 +8,9 @@ on:
 permissions:
   contents: write
   pull-requests: write
+  # Required for `create-pull-request` to create a PR directly against the base branch
+  # if an existing PR for the branch already exists.
+  # Also required for auto-merging.
 
 jobs:
   lockfile:
@@ -18,49 +21,102 @@ jobs:
       - uses: cachix/install-nix-action@v24
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      
+
       - name: Update nixpkgs input to unstable
         run: |
-          sed -i 's|hydenix-nixpkgs.url = "github:nixos/nixpkgs/.*"|hydenix-nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"|' flake.nix
+          sed -i 's|nixpkgs.url = "github:nixos/nixpkgs/.*"|nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"|' flake.nix
       - name: Update flake.lock
         run: nix flake update
       - name: Update flake.nix with new rev
         run: |
-          NEW_REV=$(jq -r '.nodes."hydenix-nixpkgs".locked.rev' flake.lock)
+          NEW_REV=$(jq -r '.nodes."nixpkgs".locked.rev' flake.lock)
           if [ -n "$NEW_REV" ] && [ "$NEW_REV" != "null" ]; then
-            sed -i 's|hydenix-nixpkgs.url = "github:nixos/nixpkgs/[^"]*"|hydenix-nixpkgs.url = "github:nixos/nixpkgs/'$NEW_REV'"|' flake.nix
+            sed -i 's|nixpkgs.url = "github:nixos/nixpkgs/[^"]*"|nixpkgs.url = "github:nixos/nixpkgs/'$NEW_REV'"|' flake.nix
           else
             echo "Failed to extract revision from flake.lock"
             exit 1
           fi
       - name: Verify flake.nix
         run: |
-          grep -q "hydenix-nixpkgs.url" flake.nix || (echo "Failed to update flake.nix" && exit 1)
-      
+          grep -q "nixpkgs.url" flake.nix || (echo "Failed to update flake.nix" && exit 1)
+
       - name: Check Root Flake
         id: check_root
-        continue-on-error: true
-        run: nix flake check
+        continue-on-error: true # Temporarily set to true to capture output even on failure
+        run: |
+          ROOT_CHECK_RESULT=$(nix flake check 2>&1 || true) # Capture output, and continue on error
+          echo "root_check_output<<EOF" >> $GITHUB_OUTPUT
+          echo "$ROOT_CHECK_RESULT" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+          if echo "$ROOT_CHECK_RESULT" | grep -q 'error'; then
+            echo "ROOT_CHECK_SUCCESS=false" >> $GITHUB_OUTPUT
+          else
+            echo "ROOT_CHECK_SUCCESS=true" >> $GITHUB_OUTPUT
+          fi
 
       - name: Check Template Flake
         id: check_template
-        continue-on-error: true
+        continue-on-error: true # Temporarily set to true to capture output even on failure
         run: |
           cd template
           sed -i 's|url = "github:richen604/hydenix"|url = "path:../"|' flake.nix
-          nix flake check
+          TEMPLATE_CHECK_RESULT=$(nix flake check 2>&1 || true) # Capture output, and continue on error
+          echo "template_check_output<<EOF" >> $GITHUB_OUTPUT
+          echo "$TEMPLATE_CHECK_RESULT" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+          if echo "$TEMPLATE_CHECK_RESULT" | grep -q 'error'; then
+            echo "TEMPLATE_CHECK_SUCCESS=false" >> $GITHUB_OUTPUT
+          else
+            echo "TEMPLATE_CHECK_SUCCESS=true" >> $GITHUB_OUTPUT
+          fi
           git checkout flake.nix
           rm -f flake.lock
-      
+
       - name: Create Pull Request
+        id: create_pr
         uses: peter-evans/create-pull-request@v5
         with:
           commit-message: "chore(deps): update flake.lock"
           title: "chore(deps): update flake.lock"
-          branch: update-flake-lock-${{ github.run_id }}
-          delete-branch: true
+          branch: update-flake-lock
+          token: ${{ secrets.GITHUB_TOKEN }}
           body: |
             Updated flake.lock file.
 
-            Root Flake check: ${{ steps.check_root.outcome == 'success' && '✅ Passed' || '❌ Failed' }}
-            Template Flake check: ${{ steps.check_template.outcome == 'success' && '✅ Passed' || '❌ Failed' }}
+            ---
+
+            ### Root Flake Check: ${{ steps.check_root.outputs.ROOT_CHECK_SUCCESS == 'true' && '✅ Passed' || '❌ Failed' }}
+            <details>
+            <summary>View output</summary>
+
+            ```
+            ${{ steps.check_root.outputs.root_check_output }}
+            ```
+
+            </details>
+
+            ### Template Flake Check: ${{ steps.check_template.outputs.TEMPLATE_CHECK_SUCCESS == 'true' && '✅ Passed' || '❌ Failed' }}
+            <details>
+            <summary>View output</summary>
+
+            ```
+            ${{ steps.check_template.outputs.template_check_output }}
+            ```
+
+            </details>
+
+            ---
+        if: always()
+
+      - name: Enable auto-merge on PR
+        if: ${{ steps.check_root.outputs.ROOT_CHECK_SUCCESS == 'true' && steps.check_template.outputs.TEMPLATE_CHECK_SUCCESS == 'true' && steps.create_pr.outputs.pull-request-number }}
+        run: |
+          gh pr merge ${{ steps.create_pr.outputs.pull-request-number }} --auto --squash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check overall status and fail if necessary
+        if: ${{ steps.check_root.outputs.ROOT_CHECK_SUCCESS == 'false' || steps.check_template.outputs.TEMPLATE_CHECK_SUCCESS == 'false' }}
+        run: |
+          echo "One or more flake checks failed. Failing workflow as requested."
+          exit 1

.github/workflows/update-themes.yml

@@ -8,6 +8,9 @@ on:
 jobs:
   update-themes:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -31,8 +34,8 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "feat(themes): automated theme updates"
-          title: "feat(themes): Automated HyDE Theme Updates"
+          commit-message: "chore(themes): automated theme updates"
+          title: "chore(themes): Automated HyDE Theme Updates"
           body: |
             This PR updates the `sha256` for HyDE themes based on their specified `rev`.
             Automated by GitHub Actions.
@@ -45,10 +48,19 @@ jobs:
           reviewers: ${{ github.actor }}
           add-paths: "hydenix/sources/themes/*.nix"
 
-    # - name: Enable Auto-merge
-    #   if: steps.create_pr.outputs.pull-request-number
-    #   run: |
-    #     gh pr merge --auto --rebase "$PR_URL"
-    #   env:
-    #     PR_URL: ${{ steps.create_pr.outputs.pull-request-url }}
-    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install GitHub CLI
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gh
+
+      - name: Enable Auto-merge
+        if: steps.create_pr.outputs.pull-request-number
+        run: |
+          PR_NUMBER="${{ steps.create_pr.outputs.pull-request-number }}"
+          if [ -n "$PR_NUMBER" ]; then
+            gh pr merge --auto --rebase "$PR_NUMBER"
+          else
+            echo "::warning:: No pull request was created. Auto-merge skipped."
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -11,7 +11,7 @@
 ### Bug Fixes
 
 * **editor:** set default applications and add common code mimetypes ([92c05fc](https://github.com/richen604/hydenix/commit/92c05fc3431362a6aee3d9173905fa5341aed2fd))
-* hydenix-nixpkgs as main version for inputs ([9038178](https://github.com/richen604/hydenix/commit/9038178d9f34dbbaec0306e86369ee22b2910a6e))
+* nixpkgs as main version for inputs ([9038178](https://github.com/richen604/hydenix/commit/9038178d9f34dbbaec0306e86369ee22b2910a6e))
 * removed unnecessary with lib ([7e1d51f](https://github.com/richen604/hydenix/commit/7e1d51ff611e9473df63bf4eef886ca598751057))
 * revert hyprland pkgs, bumped theme. fixes [#143](https://github.com/richen604/hydenix/issues/143) ([bc56c39](https://github.com/richen604/hydenix/commit/bc56c39a77d267712bee0429e269c4c19c91a578))
 * sddm pkg ([71a6a49](https://github.com/richen604/hydenix/commit/71a6a49d2b79913643991b035d419ab6efe1b69a))