From a51bd670d6eeebdf27973053603863a94957bc7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 15 Jul 2024 10:54:23 +0200
Subject: [PATCH] update treefmt configuration

---
 .github/workflows/test.yml              | 19 +++++++++----------
 .github/workflows/update-flake-lock.yml |  2 +-
 templates/flake/.envrc                  |  2 +-
 treefmt.nix                             | 13 +++++--------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 10791b8..b2c9def 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,17 +10,16 @@ jobs:
   tests:
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
+        os: [ubuntu-latest]
         # FIXME macos garbage currently collect also nix-shell that runs the test
         #os: [ ubuntu-latest, macos-latest ]
-        variants: [ stable, latest, bash4 ]
+        variants: [stable, latest, bash4]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@V27
-      with:
-        nix_path: nixpkgs=channel:nixpkgs-unstable
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-    - run:
-        "nix run --accept-flake-config .#test-runner-${{ matrix.variants }}"
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@V27
+        with:
+          nix_path: nixpkgs=channel:nixpkgs-unstable
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+      - run: "nix run --accept-flake-config .#test-runner-${{ matrix.variants }}"
diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
index f26f25f..29b4088 100644
--- a/.github/workflows/update-flake-lock.yml
+++ b/.github/workflows/update-flake-lock.yml
@@ -24,5 +24,5 @@ jobs:
             ```
             {{ env.GIT_COMMIT_MESSAGE }}
             ```
-          pr-labels: |                  # Labels to be set on the PR
+          pr-labels: | # Labels to be set on the PR
             merge-queue
diff --git a/templates/flake/.envrc b/templates/flake/.envrc
index c9fb52a..1faf1bb 100644
--- a/templates/flake/.envrc
+++ b/templates/flake/.envrc
@@ -1,5 +1,5 @@
 # shellcheck shell=bash
 if ! has nix_direnv_version || ! nix_direnv_version 3.0.5; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.5/direnvrc" "sha256-RuwIS+QKFj/T9M2TFXScjBsLR6V3A17YVoEW/Q6AZ1w="
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.5/direnvrc" "sha256-RuwIS+QKFj/T9M2TFXScjBsLR6V3A17YVoEW/Q6AZ1w="
 fi
 use flake
diff --git a/treefmt.nix b/treefmt.nix
index 66167a0..22eebba 100644
--- a/treefmt.nix
+++ b/treefmt.nix
@@ -18,16 +18,13 @@
         shellcheck.enable = true;
         shfmt.enable = true;
         statix.enable = true;
+        yamlfmt.enable = true;
       };
 
-      settings.formatter =
-        let
-          shellIncludes = [ "*.sh" "direnvrc" ];
-        in
-        {
-          shellcheck.includes = shellIncludes;
-          shfmt.includes = shellIncludes;
-        };
+      settings.formatter = {
+        shellcheck.includes = [ "direnvrc" ];
+        shfmt.includes = [ "direnvrc" ];
+      };
     };
   };
 }