diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 96e274d..7c7b6bf 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,21 +15,6 @@ jobs: with: dprint-version: '0.45.1' # selfup {"extract":"\\d[^']+","replacer":["dprint", "--version"], "nth": 2} - yamlfmt: - timeout-minutes: 15 - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v4 - - name: Install mise - run: | - curl https://mise.jdx.dev/install.sh | sh - echo "$HOME/.local/share/mise/bin" >> $GITHUB_PATH - echo "$HOME/.local/share/mise/shims" >> $GITHUB_PATH - - name: Install yamlfmt - # TODO: Apply selfup after https://github.com/google/yamlfmt/pull/180 - run: mise use -g yamlfmt@0.12.1 - - run: yamlfmt -lint . - typos: timeout-minutes: 15 runs-on: ubuntu-24.04 diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 80e5a79..bcca6d6 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -5,7 +5,6 @@ "editorconfig.editorconfig", "tekumara.typos-vscode", "dprint.dprint", - "kachick.vscode-yamlfmt", "jnoortheen.nix-ide", "task.vscode-task" ] diff --git a/.vscode/settings.json b/.vscode/settings.json index be439db..021f678 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,12 +1,6 @@ { "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" }, diff --git a/Taskfile.yml b/Taskfile.yml index f8ae5f4..2a3a517 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -25,12 +25,10 @@ tasks: fmt: cmds: - dprint fmt - - yamlfmt . - git ls-files '*.nix' | xargs nix fmt lint: cmds: - dprint check - - yamlfmt -lint . - typos . .github .vscode - git ls-files '*.nix' | xargs nixfmt --check snapshot: @@ -43,6 +41,5 @@ tasks: - nil --version - task --version - dprint --version - - yamlfmt -version - typos --version - go version diff --git a/dprint.json b/dprint.json index 24aa07d..ba3d8bd 100644 --- a/dprint.json +++ b/dprint.json @@ -3,6 +3,10 @@ "trailingCommas": "never" }, "markdown": {}, + "yaml": { + "quotes": "preferSingle", + "trimTrailingWhitespaces": false + }, "plugins": [ "https://plugins.dprint.dev/json-0.19.2.wasm", "https://plugins.dprint.dev/markdown-0.16.4.wasm", diff --git a/flake.nix b/flake.nix index 4bd5265..f94547c 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,6 @@ nil nixfmt-rfc-style dprint - yamlfmt typos go-task go_1_22 diff --git a/yamlfmt.yml b/yamlfmt.yml deleted file mode 100644 index 417bd4f..0000000 --- a/yamlfmt.yml +++ /dev/null @@ -1,7 +0,0 @@ -gitignore_excludes: true -line_ending: lf -formatter: - type: basic - retain_line_breaks_single: true - # https://github.com/google/yamlfmt/issues/182 - scan_folded_as_literal: true