diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000..a890dc4 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,12 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "dependencyDashboard": true, + "enabledManagers": ["regex"], + "extends": [ + "github>kachick/renovate-config-dprint#1.1.0" + ], + "labels": ["dependencies", "renovate"], + "nix": { + "enabled": false + } +} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5a094d6..0c5e987 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,14 +27,3 @@ 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/yamlfmt@v0.12.1 # TODO: Apply selfup after https://github.com/google/yamlfmt/pull/180 - - run: yamlfmt -lint . diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 7bbe6e7..9d359f5 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -32,7 +32,7 @@ archives: checksum: name_template: 'checksums.txt' snapshot: - name_template: "{{ incpatch .Version }}-next" + name_template: '{{ incpatch .Version }}-next' changelog: sort: asc filters: 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 fca8d38..133cd99 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 1ba1370..3f436b0 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -36,7 +36,6 @@ tasks: cmds: - typos . .github .vscode --write-changes - dprint fmt - - yamlfmt . - go fmt ./... - git ls-files '*.nix' | xargs nix fmt lint: @@ -44,7 +43,6 @@ tasks: # 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 @@ -57,6 +55,5 @@ tasks: - task --version - go version - dprint --version - - yamlfmt -version - goreleaser --version - typos --version diff --git a/dprint.json b/dprint.json index 289fe82..e9f6dab 100644 --- a/dprint.json +++ b/dprint.json @@ -1,9 +1,11 @@ { "json": {}, "markdown": {}, + "yaml": { "quotes": "preferSingle" }, "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/markdown-0.16.4.wasm", + "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.2.0.wasm" ] } diff --git a/flake.nix b/flake.nix index 2f87b54..3cf545e 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,6 @@ go_1_22 dprint - yamlfmt goreleaser typos go-task 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