From fa24334fcacfa0f9f4b6c4a8184ec542d1ad09de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Jan 2026 02:02:03 +0000 Subject: [PATCH 1/2] Lock file maintenance --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 4f60be8..1c548f3 100644 --- a/flake.lock +++ b/flake.lock @@ -87,11 +87,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1768773679, - "narHash": "sha256-T7tY7Lgh01Ul4T1SjipaQjOK/HwLmt76Dlkob5QVSHs=", + "lastModified": 1769115329, + "narHash": "sha256-hiZ/WjE1eqMH0wZEa/82WqQeUqxdbCvJ22VEX0NQdxc=", "owner": "sellout", "repo": "flaky", - "rev": "85eff28dc5db99b887ff17c411d2f5afa19d054d", + "rev": "738ee361b03ea92c15275e9a41d11f643f2544b1", "type": "github" }, "original": { @@ -123,11 +123,11 @@ ] }, "locked": { - "lastModified": 1768603898, - "narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=", + "lastModified": 1768949235, + "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c", + "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", "type": "github" }, "original": { @@ -139,11 +139,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768763596, - "narHash": "sha256-pqK6fHT6NBnqaQNLQjE9wS0eBuOXbYSwFcawE3VwIjM=", + "lastModified": 1769106830, + "narHash": "sha256-HVJVO05728kb22HSccQ+UQrbnfKN6RVeA3qdUYZeHQ4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26e52f454951516a573eb7f8406fa11936a2832c", + "rev": "d110e40c9dbe539750677c348df68145f70dc6d1", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", + "lastModified": 1768649915, + "narHash": "sha256-jc21hKogFnxU7KXSVTRmxC7u5D4RHwm9BAvDf5/Z1Uo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "rev": "3e3f3c7f9977dc123c23ee21e8085ed63daf8c37", "type": "github" }, "original": { @@ -251,11 +251,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1768302833, - "narHash": "sha256-h5bRFy9bco+8QcK7rGoOiqMxMbmn21moTACofNLRMP4=", + "lastModified": 1768661221, + "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61db79b0c6b838d9894923920b612048e1201926", + "rev": "3327b113f2ef698d380df83fbccefad7e83d7769", "type": "github" }, "original": { @@ -299,11 +299,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1768382540, - "narHash": "sha256-stBdP10BegKK7oKpBJ29sIjsX7KjBDQewO+93Nfdu7o=", + "lastModified": 1769032235, + "narHash": "sha256-ajEd5wQpuPEUjjD+dyEXyTbQnqIxBue6Y/7OarchZ2Y=", "owner": "sellout", "repo": "project-manager", - "rev": "051b1e02058945a01f942261d0239dcdaf697037", + "rev": "124e6324756f4b8ee4155a92edb4b03700db74aa", "type": "github" }, "original": { From a0bb32d67989a12bc36ad81509a62090b09bed7c Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Jan 2026 02:03:18 +0000 Subject: [PATCH 2/2] Switch Project Manager generation --- .editorconfig | 1 + .gitattributes | 1 + .github/renovate.json | 2 +- .github/settings.yml | 2 +- .github/workflows/flakestry-publish.yml | 22 ++++++++++++++++++++++ .github/workflows/switch-pm-generation.yml | 2 +- 6 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/flakestry-publish.yml diff --git a/.editorconfig b/.editorconfig index 495a00c..ed2c75d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,6 +8,7 @@ end_of_line=lf indent_size=2 indent_style=space insert_final_newline=true +simplify=true space_redirects=true switch_case_indent=true trim_trailing_whitespace=true diff --git a/.gitattributes b/.gitattributes index f09fff9..5f453a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,7 @@ /.github/renovate.json linguist-generated /.github/settings.yml linguist-generated /.github/workflows/flakehub-publish.yml linguist-generated +/.github/workflows/flakestry-publish.yml linguist-generated /.github/workflows/switch-pm-generation.yml linguist-generated /.vale.ini linguist-generated /garnix.yaml linguist-generated diff --git a/.github/renovate.json b/.github/renovate.json index 374d6f2..cf2f46b 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1 +1 @@ -{"$schema":"https://docs.renovatebot.com/renovate-schema.json","extends":["config:recommended"],"labels":["automated"],"lockFileMaintenance":{"automerge":false,"enabled":true},"nix":{"enabled":true},"packageRules":[]} +{"$schema":"https://docs.renovatebot.com/renovate-schema.json","extends":["config:recommended"],"labels":["automated"],"lockFileMaintenance":{"automerge":false,"enabled":true,"schedule":["* * * * *"]},"nix":{"enabled":true},"packageRules":[],"platformAutomerge":true} diff --git a/.github/settings.yml b/.github/settings.yml index 422cae4..4cb5d32 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,2 +1,2 @@ # This file was generated by Project Manager. -{"branches":[{"name":"main","protection":{"allow_force_pushes":false,"enforce_admins":true,"required_linear_history":false,"required_pull_request_reviews":null,"required_status_checks":{"contexts":["All Garnix checks"],"strict":false},"restrictions":null}}],"labels":[{"color":"#666666","description":"Created automatically by some service or process","name":"automated"},{"color":"#d73a4a","description":"Something isn’t working","name":"bug"},{"color":"#333333","description":"Updates or other changes to dependencies","name":"dependencies"},{"color":"#0075ca","description":"Improvements or additions to documentation","name":"documentation"},{"color":"#a2eeef","description":"New feature or request","name":"enhancement"},{"color":"#7057ff","description":"Good for newcomers","name":"good first issue"},{"color":"#000000","description":"Issues you want contributors to help with.","name":"hacktoberfest"},{"color":"#ff7518","description":"Indicates acceptance for Hacktoberfest criteria, even if not merged yet.","name":"hacktoberfest-accepted"},{"color":"#008672","description":"Extra attention is needed","name":"help wanted"},{"color":"#333333","description":"Unaccepted contributions that haven’t been closed for some reason.","name":"invalid"},{"color":"#d876e3","description":"Further information is requested","name":"question"},{"color":"#ffc0cb","description":"Topic created in bad faith. Services like Hacktoberfest use this to identify bad actors.","name":"spam"},{"color":"#d4af37","description":"Work prioritized by a sponsor","name":"sponsored"}],"repository":{"allow_merge_commit":true,"allow_rebase_merge":false,"allow_squash_merge":false,"default_branch":"main","delete_branch_on_merge":true,"description":"Templates & shells for dev environments","enable_automated_security_fixes":true,"enable_vulnerability_alerts":true,"has_downloads":false,"has_issues":true,"has_projects":true,"has_wiki":true,"merge_commit_message":"PR_BODY","merge_commit_title":"PR_TITLE","name":"flaky-environments","private":false,"topics":"hacktoberfest, development, nix-flakes, nix-templates"}} +{"branches":[{"name":"main","protection":{"allow_force_pushes":false,"enforce_admins":false,"required_linear_history":false,"required_pull_request_reviews":null,"required_status_checks":{"contexts":["All Garnix checks"],"strict":false},"restrictions":null}}],"labels":[{"color":"#666666","description":"Created automatically by some service or process","name":"automated"},{"color":"#d73a4a","description":"Something isn’t working","name":"bug"},{"color":"#333333","description":"Updates or other changes to dependencies","name":"dependencies"},{"color":"#0075ca","description":"Improvements or additions to documentation","name":"documentation"},{"color":"#a2eeef","description":"New feature or request","name":"enhancement"},{"color":"#7057ff","description":"Good for newcomers","name":"good first issue"},{"color":"#000000","description":"Issues you want contributors to help with.","name":"hacktoberfest"},{"color":"#ff7518","description":"Indicates acceptance for Hacktoberfest criteria, even if not merged yet.","name":"hacktoberfest-accepted"},{"color":"#008672","description":"Extra attention is needed","name":"help wanted"},{"color":"#333333","description":"Unaccepted contributions that haven’t been closed for some reason.","name":"invalid"},{"color":"#d876e3","description":"Further information is requested","name":"question"},{"color":"#ffc0cb","description":"Topic created in bad faith. Services like Hacktoberfest use this to identify bad actors.","name":"spam"},{"color":"#d4af37","description":"Work prioritized by a sponsor","name":"sponsored"}],"repository":{"allow_merge_commit":true,"allow_rebase_merge":false,"allow_squash_merge":false,"default_branch":"main","delete_branch_on_merge":true,"description":"Templates & shells for dev environments","enable_automated_security_fixes":true,"enable_vulnerability_alerts":true,"has_downloads":false,"has_issues":true,"has_projects":true,"has_wiki":true,"merge_commit_message":"PR_BODY","merge_commit_title":"PR_TITLE","name":"flaky-environments","private":false,"topics":"hacktoberfest, development, nix-flakes, nix-templates"}} diff --git a/.github/workflows/flakestry-publish.yml b/.github/workflows/flakestry-publish.yml new file mode 100644 index 0000000..889254d --- /dev/null +++ b/.github/workflows/flakestry-publish.yml @@ -0,0 +1,22 @@ +name: "Publish a flake to flakestry" +on: + push: + tags: + - "v?[0-9]+.[0-9]+.[0-9]+" + - "v?[0-9]+.[0-9]+" + workflow_dispatch: + inputs: + tag: + description: "The existing tag to publish" + type: "string" + required: true +jobs: + publish-flake: + runs-on: ubuntu-24.04 + permissions: + id-token: "write" + contents: "read" + steps: + - uses: flakestry/flakestry-publish@main + with: + version: "${{ inputs.tag || github.ref_name }}" diff --git a/.github/workflows/switch-pm-generation.yml b/.github/workflows/switch-pm-generation.yml index e77bf7e..f803daf 100644 --- a/.github/workflows/switch-pm-generation.yml +++ b/.github/workflows/switch-pm-generation.yml @@ -1,2 +1,2 @@ # This file was generated by Project Manager. -{"jobs":{"switch":{"if":"github.head_ref == 'renovate/lock-file-maintenance'","runs-on":"ubuntu-24.04","steps":[{"uses":"actions/checkout@v6","with":{"ref":"${{ github.event.pull_request.head.ref }}","repository":"${{ github.event.pull_request.head.repo.full_name }}","token":"${{ secrets.PROJECT_MANAGER_TOKEN }}"}},{"uses":"cachix/install-nix-action@v31"},{"run":"nix develop .#project-manager --accept-flake-config --command project-manager kitchen-sink"},{"name":"commit changes","uses":"EndBug/add-and-commit@v9","with":{"add":"--all","default_author":"github_actions","message":"Switch Project Manager generation","push":"origin --no-verify --set-upstream"}}]}},"name":"Project Manager","on":{"pull_request":{}}} +{"jobs":{"switch":{"if":"${{ github.event.pull_request.head.repo.full_name == github.repository || github.event.pull_request.maintainer_can_modify }}","runs-on":"ubuntu-24.04","steps":[{"uses":"actions/checkout@v6","with":{"ref":"${{ github.event.pull_request.head.ref }}","repository":"${{ github.event.pull_request.head.repo.full_name }}","token":"${{ secrets.PROJECT_MANAGER_TOKEN }}"}},{"uses":"cachix/install-nix-action@v31"},{"run":"nix develop .#project-manager \\\n --accept-flake-config \\\n --command project-manager kitchen-sink\n"},{"name":"commit changes","uses":"EndBug/add-and-commit@v9","with":{"add":"--all","default_author":"github_actions","message":"Switch Project Manager generation","push":"origin --no-verify --set-upstream"}}]}},"name":"Project Manager","on":{"pull_request_target":{}}}