chore: yamlfmtでyamlファイルをフォーマットする

.github/workflows/ci.yml

@@ -1,8 +1,6 @@
 name: CI
-
 on:
   push:
-
 jobs:
   # treefmt:
   #   name: treefmt
@@ -15,7 +13,6 @@ jobs:
   #        name: sno2wman
   #        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
   #     - run: nix-shell --run "treefmt --fail-on-change"
-
   flake-check:
     name: flake-check
     runs-on: ubuntu-latest
@@ -24,6 +21,6 @@ jobs:
       - uses: cachix/install-nix-action@v17
       - uses: cachix/cachix-action@v10
         with:
-         name: sno2wman
-         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+          name: sno2wman
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
       - run: nix flake check

.github/workflows/gh-pages.yml

@@ -1,11 +1,9 @@
 name: Deploy to GitHub Pages
-
 on:
   push:
     branches:
       - main
   workflow_dispatch:
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -20,7 +18,6 @@ jobs:
       - run: nix build ".#github-page"
       - run: cp -r --dereference --no-preserve=mode,ownership result/ _site/
       - uses: actions/upload-pages-artifact@v1
-
   deploy:
     runs-on: ubuntu-latest
     needs: build

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

@@ -3,7 +3,6 @@ on:
   workflow_dispatch: # allows manual triggering
   schedule:
     - cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
-
 jobs:
   lockfile:
     runs-on: ubuntu-latest

.vscode/settings.json

@@ -13,7 +13,8 @@
         "markdown",
         "nix",
         "satysfi",
-        "toml"
+        "toml",
+        "yaml"
       ]
     }
   ],
@@ -35,6 +36,9 @@
   "[satysfi]": {
     "editor.defaultFormatter": "jkillian.custom-local-formatters"
   },
+  "[yaml]": {
+    "editor.defaultFormatter": "jkillian.custom-local-formatters"
+  },
   "editor.unicodeHighlight.allowedCharacters": {
     "，": true,
     "．": true,

flake.nix

@@ -16,15 +16,15 @@
 
     satysfi-formatter.url = "github:SnO2WMaN/satysfi-formatter/nix-integrate";
     satysfi-language-server.url = "github:SnO2WMaN/satysfi-language-server/nix-integrate";
+
+    yamlfmt.url = "github:SnO2WMaN/yamlfmt/nix-intgl";
   };
 
   outputs = {
     self,
     nixpkgs,
     flake-utils,
     devshell,
-    satysfi-formatter,
-    satysfi-language-server,
     ...
   } @ inputs:
     {
@@ -41,11 +41,13 @@
           overlays = [
             devshell.overlay
             self.overlays.default
-            (final: prev: {
-              satysfi-language-server = satysfi-language-server.packages.${system}.satysfi-language-server;
-              satysfi-formatter = satysfi-formatter.packages.${system}.satysfi-formatter;
-              satysfi-formatter-write-each = satysfi-formatter.packages.${system}.satysfi-formatter-write-each;
-            })
+            (final: prev:
+              with inputs; {
+                satysfi-language-server = satysfi-language-server.packages.${system}.satysfi-language-server;
+                satysfi-formatter = satysfi-formatter.packages.${system}.satysfi-formatter;
+                satysfi-formatter-write-each = satysfi-formatter.packages.${system}.satysfi-formatter-write-each;
+                yamlfmt = yamlfmt.packages.${system}.yamlfmt;
+              })
           ];
         };
       in {
@@ -111,6 +113,7 @@
               satysfi
               satysfi-language-server
               satysfi-formatter-write-each
+              yamlfmt
             ]
           );
         };

treefmt.toml

@@ -7,6 +7,10 @@ command = "dprint"
 options = ["fmt"]
 includes = ["*.json", "*.toml", "*.md"]
 
+[formatter.yamlfmt]
+command = "yamlfmt"
+includes = ["*.yml", "*.yaml"]
+
 [formatter.satysfi-fmt]
 command = "satysfi-fmt-write-each"
 includes = ["*.saty", "*.satyh"]