Skip to content

Commit

Permalink
Merge pull request #176 from kachick/integrate-typos
Browse files Browse the repository at this point in the history
Integrate typos
  • Loading branch information
kachick authored Jul 13, 2023
2 parents 01fed04 + 00634e0 commit 8145605
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 14 deletions.
1 change: 1 addition & 0 deletions .config/home-manager/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
pkgs.zellij
pkgs.nixpkgs-fmt
pkgs.nil
pkgs.typos
pkgs.cargo-make
pkgs.hyperfine
pkgs.zoxide
Expand Down
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ updates:
interval: 'daily'
time: '08:00'
timezone: 'Asia/Tokyo'
ignore:
- dependency-name: 'crate-ci/typos'
9 changes: 9 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
- uses: dprint/[email protected]
with:
dprint-version: '0.36.1'

shellscript:
runs-on: ubuntu-latest
timeout-minutes: 5
Expand All @@ -37,3 +38,11 @@ jobs:
shopt -s globstar
shellcheck ./**/*.bash
shfmt --diff ./**/*.bash
typos:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
# Keep same version as *.nix
- uses: crate-ci/[email protected]
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"recommendations": [
"editorconfig.editorconfig",
"dprint.dprint",
"streetsidesoftware.code-spell-checker",
"tekumara.typos-vscode",
"github.vscode-github-actions",
"timonwong.shellcheck",
"foxundermoon.shell-format",
Expand Down
11 changes: 0 additions & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
{
"editor.defaultFormatter": "dprint.dprint",
"editor.formatOnSave": true,
"cSpell.words": [
"deno",
"dprint",
"Eugeny",
"gnachman",
"mvdan",
"shfmt",
"shopt",
"sorin-ionescu",
"nixpkgs"
],
"[shellscript]": {
"editor.defaultFormatter": "foxundermoon.shell-format"
},
Expand Down
12 changes: 10 additions & 2 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ script = [
"dprint fmt",
]

[tasks.typos-check]
category = "Tools"
description = "Run formatters without changes"
script = [
"typos",
]

[tasks.prevent-secret]
category = "Tools"
script = [
Expand All @@ -37,7 +44,7 @@ script = [
[tasks.check]
category = "Tools"
description = 'Parallel runner for all tests and linters'
run_task = { name = ["format-check", "prevent-secret"] }
run_task = { name = ["typos-check", "format-check", "prevent-secret"] }

[tasks.versions]
category = "Tools"
Expand All @@ -47,10 +54,11 @@ script = [
"dprint --version",
"shellcheck --version",
"shfmt --version",
# Returnes NON 0, why...? :<
# Returns NON 0, why...? :<
# "nixpkgs-fmt --version",
"gitleaks version",
"fd --version",
"typos --version",
]

[tasks.help]
Expand Down
1 change: 1 addition & 0 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ pkgs.mkShell {
pkgs.cargo-make
pkgs.coreutils
pkgs.fd
pkgs.typos
];
}

0 comments on commit 8145605

Please sign in to comment.