From e3595c5561e0518318960571521d416dd9d36705 Mon Sep 17 00:00:00 2001 From: BenZuckier Date: Fri, 15 May 2026 16:00:06 -0400 Subject: [PATCH] feat: yaml format --- .github/dependabot.yaml | 1 - .github/workflows/ci.yaml | 5 ----- .github/workflows/git-health.yaml | 6 +----- nix/treefmt.nix | 13 +++++++++---- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 8a340d0..f8be0b2 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -6,7 +6,6 @@ updates: default-days: 10 schedule: interval: "weekly" - - package-ecosystem: "nix" cooldown: default-days: 10 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bb73cf5..c41875e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,19 +1,15 @@ name: CI - on: pull_request: merge_group: - permissions: contents: read - jobs: nocommit: runs-on: ubuntu-latest steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - uses: nobssoftware/nocommit@5c3cf9519fe40b80b0954d254085b67b532a5dc3 - nix-flake-check: strategy: fail-fast: false @@ -31,7 +27,6 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f - run: nix run .#nix-flake-check-changed - nix-flake-health: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/git-health.yaml b/.github/workflows/git-health.yaml index 8dea718..f3fe715 100644 --- a/.github/workflows/git-health.yaml +++ b/.github/workflows/git-health.yaml @@ -1,5 +1,4 @@ name: Git Health - on: pull_request: types: @@ -7,7 +6,6 @@ on: - synchronize - reopened merge_group: - jobs: conventional-commit: name: PR title @@ -19,11 +17,9 @@ jobs: path: "~/.cache/nix" - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f - - run: | - <<<"$TITLE" nix run .#conventional-commit + - run: "<<<\"$TITLE\" nix run .#conventional-commit \n" env: TITLE: "${{ github.event.pull_request.title || github.event.merge_group.head_commit.message }}" - merging-into-master: if: github.event_name == 'pull_request' runs-on: ubuntu-latest diff --git a/nix/treefmt.nix b/nix/treefmt.nix index b216784..8081207 100644 --- a/nix/treefmt.nix +++ b/nix/treefmt.nix @@ -1,9 +1,14 @@ { ... }: { projectRootFile = "flake.nix"; - programs.nixfmt = { - enable = true; - strict = true; + programs = { + # keep-sorted start block=true + keep-sorted.enable = true; + nixfmt = { + enable = true; + strict = true; + }; + yamlfmt.enable = true; + # keep-sorted end }; - programs.keep-sorted.enable = true; }