pre-commit: enable pretty-format-json, run it

.editorconfig

@@ -10,7 +10,7 @@ indent_size = tab
 max_line_length = 78
 end_of_line = lf
 
-[*.{cff,yaml,yml}]
+[*.{cff,yaml,yml,json}]
 indent_style = space
 indent_size = 2
 

.pre-commit-config.yaml

@@ -34,7 +34,7 @@ repos:
         args: ["--markdown-linebreak-ext", "md,markdown"]
         exclude_types: [svg, tsv]
       - id: check-docstring-first
-      #- id: check-json
+      - id: check-json
       - id: check-merge-conflict
       #- id: check-toml
       #- id: check-xml
@@ -42,7 +42,8 @@ repos:
       - id: mixed-line-ending
         # .gitattributes is trusted to handle this
         args: [--fix=no]
-        #- id: pretty-format-json
+      - id: pretty-format-json
+        args: [--autofix, --no-ensure-ascii]
         #- id: requirements-txt-fixer
   - repo: https://github.com/pre-commit-ci/pre-commit-ci-config
     rev: v1.6.1
@@ -107,9 +108,6 @@ repos:
         name: prettier
         entry: corepack pnpm exec prettier --cache --ignore-unknown --write
         language: system
-        # Better handled by pretty-format-json from pre-commit-hooks.
-        # Remember to have *.json in .prettierignore!
-        exclude_types: [json]
 
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
     rev: "2.7.3"

.prettierrc

@@ -1,7 +0,0 @@
-{
-	"insertPragma": true,
-	"proseWrap": "always",
-	"singleAttributePerLine": true,
-	"plugins": ["@prettier/plugin-ruby", "prettier-plugin-sh"],
-	"overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }]
-}

.prettierrc.json

@@ -0,0 +1,13 @@
+{
+  "bracketSameLine": true,
+  "endOfLine": "auto",
+  "insertPragma": true,
+  "plugins": [
+    "@prettier/plugin-ruby",
+    "prettier-plugin-sh"
+  ],
+  "proseWrap": "always",
+  "quoteProps": "consistent",
+  "requirePragma": false,
+  "singleAttributePerLine": true
+}

bash/adb-permissions.bash

@@ -26,6 +26,10 @@ adb "$@" shell pm grant jp.co.c_lis.ccl.morelocale android.permission.CHANGE_CON
 # https://github.com/karasevm/PrivateDNSAndroid
 adb "$@" shell pm grant ru.karasevm.privatednstoggle android.permission.WRITE_SECURE_SETTINGS
 
+# https://userbase.kde.org/KDEConnect#Log_Reading
+adb "$@" shell pm grant org.kde.kdeconnect_tp android.permission.READ_LOGS
+adb "$@" shell appops set org.kde.kdeconnect_tp SYSTEM_ALERT_WINDOW allow
+
 # Shizuku
 #(adb shell sh /sdcard/Android/data/moe.shizuku.privileged.api/start.sh &)
 (adb "$@" shell sh /storage/emulated/0/Android/data/moe.shizuku.privileged.api/start.sh &)

package.json

@@ -1,8 +1,9 @@
 {
-	"devDependencies": {
-		"@prettier/plugin-ruby": "4.0.4",
-		"prettier": "3.3.2",
-		"prettier-plugin-sh": "0.14.0"
-	},
-	"packageManager": "pnpm@9.4.0+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a"
+  "devDependencies": {
+    "@prettier/plugin-ruby": "4.0.4",
+    "mvdan-sh": "0.10.1",
+    "prettier": "3.3.2",
+    "prettier-plugin-sh": "0.14.0"
+  },
+  "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
 }

pnpm-lock.yaml

@@ -12,6 +12,9 @@ importers:
       "@prettier/plugin-ruby":
         specifier: 4.0.4
         version: 4.0.4(prettier@3.3.2)
+      mvdan-sh:
+        specifier: 0.10.1
+        version: 0.10.1
       prettier:
         specifier: 3.3.2
         version: 3.3.2

submodules/gist

@@ -1 +1 @@
-Subproject commit 115380571d44fd8a645db5d31a43de1c15e54a6f
+Subproject commit 4803ccd92f54be121c7a1ca617d2bfe45aaca0ec

submodules/shell-things

@@ -1 +1 @@
-Subproject commit 4fc9eb628148d44d9e74f16d75a3408fadb13b46
+Subproject commit 074a2a87fb14702ed42615b1246011295ab3b53b