From 2e2e9f042ec92d4da87305391762b25fbb9f7c9d Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Sun, 4 Aug 2024 08:37:54 +0300 Subject: [PATCH] Use tabs for json, rm .json, fix prettier ruby, adjust pre-commit-config --- .editorconfig | 3 +++ .json | 7 ------- .pre-commit-config.yaml | 5 ++++- .well-known/nostr.json | 16 ++++++++-------- Gemfile | 6 ++++++ Gemfile.lock | 25 +++++++++++++++++++++++++ package.json | 10 +++++----- 7 files changed, 51 insertions(+), 21 deletions(-) delete mode 100644 .json diff --git a/.editorconfig b/.editorconfig index d09c78a1..af991b51 100644 --- a/.editorconfig +++ b/.editorconfig @@ -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 diff --git a/.json b/.json deleted file mode 100644 index 26bdc174..00000000 --- a/.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "why": "because it occurred to me and I can?", - "matrix": { - "MSC1769": "https://github.com/matrix-org/matrix-spec-proposals/pull/1769", - "MSC3189": "https://github.com/matrix-org/matrix-spec-proposals/pull/3189" - } -} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4cba276f..3e141a0a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,6 +15,7 @@ ci: # Consistency with other tools default_language_version: node: "lts" + # Remember .python-version ! python: "3.12" ruby: ".ruby-version" @@ -33,6 +34,8 @@ 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 @@ -40,7 +43,7 @@ repos: - 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 diff --git a/.well-known/nostr.json b/.well-known/nostr.json index a5f6035a..4ce1df59 100644 --- a/.well-known/nostr.json +++ b/.well-known/nostr.json @@ -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" + } } diff --git a/Gemfile b/Gemfile index 3831978f..2eeba24a 100644 --- a/Gemfile +++ b/Gemfile @@ -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" diff --git a/Gemfile.lock b/Gemfile.lock index fb4d4e39..486ba15d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -53,6 +53,10 @@ GEM google-protobuf (4.27.3-x86_64-linux) bigdecimal rake (>= 13) + haml (6.3.0) + temple (>= 0.8.2) + thor + tilt html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) @@ -98,6 +102,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) mercenary (0.4.0) mini_portile2 (2.8.7) minima (2.5.1) @@ -123,12 +128,15 @@ GEM racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) + prettier_print (1.2.1) public_suffix (6.0.1) racc (1.8.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) + rbs (3.5.2) + logger rexml (3.3.4) strscan rouge (4.3.0) @@ -179,8 +187,21 @@ GEM sass-embedded (1.77.8-x86_64-linux-musl) google-protobuf (~> 4.26) strscan (3.1.0) + syntax_tree (6.2.0) + prettier_print (>= 1.2.0) + syntax_tree-haml (4.0.3) + haml (>= 5.2) + prettier_print (>= 1.2.1) + syntax_tree (>= 6.0.0) + syntax_tree-rbs (1.0.0) + prettier_print + rbs + syntax_tree (>= 2.0.1) + temple (0.10.3) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) + thor (1.3.1) + tilt (2.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -220,6 +241,10 @@ DEPENDENCIES jekyll-seo-tag jekyll-sitemap minima + prettier_print + syntax_tree + syntax_tree-haml + syntax_tree-rbs webrick RUBY VERSION diff --git a/package.json b/package.json index 0cfb7ed2..fd6e7629 100644 --- a/package.json +++ b/package.json @@ -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" }