chore: configure yamlfmt

terlar · Sep 30, 2024 · f70d9f4 · f70d9f4
1 parent 2fa0058
commit f70d9f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,14 +1,11 @@
----
 name: CI
-
 on:
   push:
     branches:
       - main
   pull_request:
     branches:
       - main
-
 jobs:
   changes:
     runs-on: ubuntu-latest
@@ -39,7 +36,6 @@ jobs:
               - 'configurations/nixos/installer-yubikey/**'
               - 'packages/drduh-gpg-conf/**'
               - 'packages/drduh-yubikey-guide/**'
-
   check:
     runs-on: ubuntu-latest
     steps:
@@ -51,17 +47,14 @@ jobs:
             http-connections = 50
             max-jobs = auto
           diagnostic-endpoint: ''
-
       - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
         with:
           useDaemon: true
           name: terlar
           extraPullNames: cuda-maintainers
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-
       - name: Check
         run: nix flake check
-
   build-home-configuration:
     needs: changes
     if: ${{ needs.changes.outputs.home-configuration == 'true' }}
@@ -80,18 +73,15 @@ jobs:
             http-connections = 50
             max-jobs = auto
           diagnostic-endpoint: ''
-
       - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
         with:
           useDaemon: true
           name: terlar
           extraPullNames: cuda-maintainers
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-
       - name: Build activation package
         run: |
           nix build --print-build-logs .#homeConfigurations.${{ matrix.username }}.activationPackage
-
   build-nixos-configuration:
     needs: changes
     if: ${{ needs.changes.outputs.nixos-configuration == 'true' }}
@@ -110,18 +100,15 @@ jobs:
             http-connections = 50
             max-jobs = auto
           diagnostic-endpoint: ''
-
       - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
         with:
           useDaemon: true
           name: terlar
           extraPullNames: cuda-maintainers
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-
       - name: Build system
         run: |
           nix build --print-build-logs .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel
-
   build-iso:
     needs: changes
     if: ${{ needs.changes.outputs.installer-yubikey == 'true' }}
@@ -139,15 +126,13 @@ jobs:
             http-connections = 50
             max-jobs = auto
           diagnostic-endpoint: ''
-
       - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
         with:
           useDaemon: true
           name: terlar
           extraPullNames: cuda-maintainers
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
           skipPush: true
-
       - name: Build ISO
         run: |
           GC_DONT_GC=1 nix build --print-build-logs .#nixosConfigurations.${{ matrix.name }}.config.system.build.isoImage
diff --git a/dev/flake-module.nix b/dev/flake-module.nix
@@ -8,12 +8,14 @@
   perSystem =
     { pkgs, ... }:
     {
-      treefmt = {
-        programs.nixfmt = {
+      treefmt.programs = {
+        nixfmt = {
           enable = true;
           package = pkgs.nixfmt-rfc-style;
         };
-        programs.fish_indent.enable = true;
+
+        fish_indent.enable = true;
+        yamlfmt.enable = true;
       };
 
       devshells.default = {