Merge pull request #200 from kachick/drop-dprint-process-plugins

Replace dprint prettier plugin with yamlfmt

.github/workflows/lint.yml

@@ -27,3 +27,14 @@ jobs:
             .
             .github
             .vscode
+
+  yamlfmt:
+    timeout-minutes: 15
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+      - name: Install yamlfmt
+        run: go install github.com/google/yamlfmt/cmd/[email protected] # TODO: Apply selfup after https://github.com/google/yamlfmt/pull/180
+      - run: yamlfmt -lint .

.github/workflows/merge-bot-pr.yml

@@ -21,8 +21,7 @@ jobs:
       - name: Judge
         id: conclusion
         if: >-
-          steps.dependabot.outputs.update-type != 'version-update:semver-major' ||
-          contains(steps.dependabot.outputs.dependency-names, 'DeterminateSystems')
+          steps.dependabot.outputs.update-type != 'version-update:semver-major' || contains(steps.dependabot.outputs.dependency-names, 'DeterminateSystems')
         run: echo -n 'merge=true' | tee -a "$GITHUB_OUTPUT"
   dependabot:
     needs: [judge-dependabot]

.vscode/extensions.json

@@ -5,6 +5,7 @@
     "editorconfig.editorconfig",
     "tekumara.typos-vscode",
     "dprint.dprint",
+    "kachick.vscode-yamlfmt",
     "jnoortheen.nix-ide",
     "task.vscode-task"
   ]

.vscode/settings.json

@@ -1,6 +1,12 @@
 {
   "editor.defaultFormatter": "dprint.dprint",
   "editor.formatOnSave": true,
+  "[yaml]": {
+    "editor.defaultFormatter": "kachick.vscode-yamlfmt"
+  },
+  "[github-actions-workflow]": {
+    "editor.defaultFormatter": "kachick.vscode-yamlfmt"
+  },
   "[nix]": {
     "editor.defaultFormatter": "jnoortheen.nix-ide"
   },

Taskfile.yml

@@ -36,22 +36,27 @@ tasks:
     cmds:
       - typos . .github .vscode --write-changes
       - dprint fmt
+      - yamlfmt .
       - go fmt ./...
-      - nix fmt ./**/*.nix
+      - git ls-files '*.nix' | xargs nix fmt
   lint:
     # go fmt does not have option for no effect - https://github.com/golang/go/issues/41189
     # nix fmt does not have option for no effect - https://github.com/NixOS/nix/issues/6918
     cmds:
       - dprint check
+      - yamlfmt -lint .
       - go vet ./...
       - goreleaser check
       - typos . .github .vscode
+      # nix fmt doesn't have check: https://github.com/NixOS/nix/issues/6918
+      - git ls-files '*.nix' | xargs nixfmt --check
   deps:
     cmds:
       - nix --version
       - nixfmt --version
       - task --version
       - go version
       - dprint --version
+      - yamlfmt -version
       - goreleaser --version
       - typos --version

dprint.json

@@ -1,14 +1,9 @@
 {
   "json": {},
   "markdown": {},
-  "prettier": {
-    "printWidth": 120,
-    "singleQuote": true
-  },
-  "excludes": ["dist", ".goreleaser.yaml"],
+  "excludes": ["dist"],
   "plugins": [
     "https://plugins.dprint.dev/json-0.19.2.wasm",
-    "https://plugins.dprint.dev/markdown-0.16.4.wasm",
-    "https://plugins.dprint.dev/prettier-0.40.0.json@68c668863ec834d4be0f6f5ccaab415df75336a992aceb7eeeb14fdf096a9e9c"
+    "https://plugins.dprint.dev/markdown-0.16.4.wasm"
   ]
 }

flake.nix

@@ -45,6 +45,7 @@
 
                 edge-pkgs.go_1_22
                 edge-pkgs.dprint
+                edge-pkgs.yamlfmt
                 edge-pkgs.goreleaser
                 edge-pkgs.typos
                 go-task

yamlfmt.yml

@@ -0,0 +1,7 @@
+gitignore_excludes: true
+exclude:
+  - '.goreleaser.yaml'
+line_ending: lf
+formatter:
+  type: basic
+  retain_line_breaks_single: true