Skip to content

Commit

Permalink
Use tabs for json, rm .json, fix prettier ruby, adjust pre-commit-config
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikaela committed Aug 4, 2024
1 parent d8cb354 commit 2e2e9f0
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 21 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ charset = utf-8
indent_style = space
# https://github.com/Mikaela/mikaela.github.io/issues/324
#indent_size = 2

[*.json]
indent_style = tab
7 changes: 0 additions & 7 deletions .json

This file was deleted.

5 changes: 4 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ci:
# Consistency with other tools
default_language_version:
node: "lts"
# Remember .python-version !
python: "3.12"
ruby: ".ruby-version"

Expand All @@ -33,14 +34,16 @@ repos:
- id: check-json
- id: check-merge-conflict
- id: check-shebang-scripts-are-executable
- id: check-toml
#- id: check-xml
- id: destroyed-symlinks
- id: detect-private-key
- id: fix-byte-order-marker
- id: check-merge-conflict
- id: mixed-line-ending
args: [--fix=auto]
- id: pretty-format-json
args: [--autofix, --no-ensure-ascii]
args: [--autofix, --indent, "\t", --no-ensure-ascii]

- repo: https://github.com/pre-commit/sync-pre-commit-deps
rev: v0.0.1
Expand Down
16 changes: 8 additions & 8 deletions .well-known/nostr.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"names": {
"_": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"aminda": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"delta": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"me": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"mikaela": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"suomalainen": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560"
}
"names": {
"_": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"aminda": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"delta": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"me": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"mikaela": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560",
"suomalainen": "5f0a1b9389ca7ec3c18f9958822ce823a25c1fe513ae7413635ea1fea55a0560"
}
}
6 changes: 6 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ gem "jekyll-sitemap"
gem "jekyll-seo-tag"
# Required for `bundle exec jekyll serve`
gem "webrick"

# Required for https://www.npmjs.com/package/@prettier/plugin-ruby
gem "prettier_print"
gem "syntax_tree"
gem "syntax_tree-haml"
gem "syntax_tree-rbs"
25 changes: 25 additions & 0 deletions Gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"devDependencies": {
"@aminda/global-prettier-config": "2024.28.4"
},
"packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e",
"prettier": "@aminda/global-prettier-config"
"devDependencies": {
"@aminda/global-prettier-config": "2024.28.4"
},
"packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e",
"prettier": "@aminda/global-prettier-config"
}

0 comments on commit 2e2e9f0

Please sign in to comment.