pre-commit: return & run pretty-format-json as I like its sorting

.pre-commit-config.yaml

@@ -49,15 +49,11 @@ repos:
       - id: fix-byte-order-marker
       - id: mixed-line-ending
         args: [--fix=auto]
-        # Remember to check that prettier excludes it, if used!
+      - id: pretty-format-json
-        #- id: pretty-format-json
+        args:
-        # Breaks AdNauseam/uBlock Origin rules as the browser interprets
+          # Remember also: --no-sort-keys
-        # values to be set for empty options.
+          # ASCII excludes the älphäbet amongst others
-        #exclude: ^etc\/firefox\/policies\/policies.json|etc\/opt\/chromium\/policies\/managed\/aminda-extensions.json$
+          [--autofix, --no-ensure-ascii]
-        #args:
-        # Remember also: --no-sort-keys
-        # ASCII excludes the älphäbet amongst others
-        #[--autofix, --no-ensure-ascii]
         #- id: requirements-txt-fixer
 
   # Synchronize dependencies between this file and package managers
@@ -134,8 +130,9 @@ repos:
     rev: "v3.2.5"
     hooks:
       - id: prettier
-        # These are handled by Black below
+        # These are handled by Black below or pretty-format-json above, which
-        exclude_types: [python, pyi, jupyter]
+        # can also sort keys.
+        exclude_types: [python, pyi, jupyter, json]
         additional_dependencies: [
             # https://www.npmjs.com/package/prettier
             "prettier@3.2.5",
@@ -144,7 +141,7 @@ repos:
             # https://www.npmjs.com/package/prettier-plugin-toml
             "prettier-plugin-toml@2.0.1",
             # https://www.npmjs.com/package/prettier-plugin-sort-json
-            "prettier-plugin-sort-json@4.0.0",
+            #"prettier-plugin-sort-json@4.0.0",
           ]
 
   # Black, opinionated Python code formatter

conf/waybar/config.json

@@ -21,7 +21,10 @@
   "memory": {
     "format": "RAM {percentage}%"
   },
-  "modules-left": ["sway/workspaces", "sway/mode"],
+  "modules-left": [
+    "sway/workspaces",
+    "sway/mode"
+  ],
   "modules-right": [
     "gamemode",
     "cpu",
@@ -49,7 +52,10 @@
   "pulseaudio": {
     "format": "VOL {volume}%",
     "format-bluetooth": "BT VOL {volume}%",
-    "ignored-sinks": ["Easy Effects Sink", "Easy Effects Source"]
+    "ignored-sinks": [
+      "Easy Effects Sink",
+      "Easy Effects Source"
+    ]
   },
   "sway/language": {
     "format": "KBD {short} {variant}",

etc/firefox/policies/policies.json

@@ -4,7 +4,9 @@
       "Extensions": {
         "adnauseam@rednoise.org": {
           "toAdd": {
-            "trustedSiteDirectives": [""]
+            "trustedSiteDirectives": [
+              ""
+            ]
           },
           "toOverwrite": {
             "filterLists": [
@@ -16,7 +18,11 @@
         },
         "jid1-MnnxcxisBPnSXQ@jetpack": {
           "checkForDNTPolicy": true,
-          "disabledSites": ["cloudflare.com", "ecosia.org", "keyoxide.org"],
+          "disabledSites": [
+            "cloudflare.com",
+            "ecosia.org",
+            "keyoxide.org"
+          ],
           "learnInIncognito": true,
           "learnLocally": true,
           "sendDNTSignal": true,
@@ -101,7 +107,10 @@
     },
     "DNSOverHTTPS": {
       "Enabled": false,
-      "ExcludedDomains": ["http.badssl.com", "norwegianwifi.com"],
+      "ExcludedDomains": [
+        "http.badssl.com",
+        "norwegianwifi.com"
+      ],
       "Fallback": true,
       "Locked": true,
       "ProviderURL": "https://dns0.eu/",
@@ -144,6 +153,10 @@
       "Locked": false
     },
     "ExtensionSettings": {
+      "@contain-facebook": {
+        "install_url": "https://addons.mozilla.org/firefox/downloads/latest/facebook-container/latest.xpi",
+        "installation_mode": "normal_installed"
+      },
       "adnauseam@rednoise.org": {
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/adnauseam/latest.xpi",
         "installation_mode": "blocked"
@@ -185,10 +198,6 @@
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi",
         "installation_mode": "force_installed"
       },
-      "@contain-facebook": {
-        "install_url": "https://addons.mozilla.org/firefox/downloads/latest/facebook-container/latest.xpi",
-        "installation_mode": "normal_installed"
-      },
       "{446900e4-71c2-419f-a6a7-df9c091e268b}": {
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi",
         "installation_mode": "force_installed"
@@ -301,6 +310,69 @@
         "Type": "boolean",
         "Value": false
       },
+      "browser.crashReports.unsubmittedCheck.autoSubmit2": {
+        "Comment": "Automatically sending crash reports, but letting the user say no.",
+        "Status": "default",
+        "Type": "boolean",
+        "Value": true
+      },
+      "browser.discovery.enabled": {
+        "Comment": "This means personalized extension recommendations in extension management.",
+        "Status": "locked",
+        "Type": "boolean",
+        "Value": false
+      },
+      "browser.safebrowsing.blockedURIs.enabled": {
+        "Status": "locked",
+        "Type": "boolean",
+        "Value": true
+      },
+      "browser.safebrowsing.downloads.remote.url": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.malware.enabled": {
+        "Status": "locked",
+        "Type": "boolean",
+        "Value": true
+      },
+      "browser.safebrowsing.phishing.enabled": {
+        "Status": "locked",
+        "Type": "boolean",
+        "Value": true
+      },
+      "browser.safebrowsing.provider.google.gethashURL": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.google.lists": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.google.updateURL": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.google4.dataSharingURL": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.google4.gethashURL": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.google4.updateURL": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.mozilla.gethashURL": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.mozilla.lists": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.mozilla.lists.base": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.mozilla.lists.content": {
+        "Status": "clear"
+      },
+      "browser.safebrowsing.provider.mozilla.updateURL": {
+        "Status": "clear"
+      },
       "browser.translation.neverForLanguages": {
         "Status": "default",
         "Type": "string",
@@ -311,24 +383,6 @@
         "Type": "string",
         "Value": "en, fi"
       },
-      "browser.discovery.enabled": {
-        "Comment": "This means personalized extension recommendations in extension management.",
-        "Status": "locked",
-        "Type": "boolean",
-        "Value": false
-      },
-      "extensions.htmlaboutaddons.recommendations.enabled": {
-        "Comment": "This means the same, but without personalization.",
-        "Status": "locked",
-        "Type": "boolean",
-        "Value": false
-      },
-      "browser.crashReports.unsubmittedCheck.autoSubmit2": {
-        "Comment": "Automatically sending crash reports, but letting the user say no.",
-        "Status": "default",
-        "Type": "boolean",
-        "Value": true
-      },
       "cookiebanners.bannerClicking.enabled": {
         "Comment": "Preference not allowed for stability reasons. :(",
         "Status": "locked",
@@ -352,26 +406,17 @@
         "Type": "boolean",
         "Value": true
       },
-      "browser.safebrowsing.blockedURIs.enabled": {
-        "Status": "locked",
-        "Type": "boolean",
-        "Value": true
-      },
-      "browser.safebrowsing.malware.enabled": {
-        "Status": "locked",
-        "Type": "boolean",
-        "Value": true
-      },
-      "browser.safebrowsing.phishing.enabled": {
-        "Status": "locked",
-        "Type": "boolean",
-        "Value": true
-      },
       "dom.security.https_only_mode": {
         "Status": "locked",
         "Type": "boolean",
         "Value": true
       },
+      "extensions.htmlaboutaddons.recommendations.enabled": {
+        "Comment": "This means the same, but without personalization.",
+        "Status": "locked",
+        "Type": "boolean",
+        "Value": false
+      },
       "extensions.webextensions.restrictedDomains": {
         "Comment": "Don't protect Mozilla domains from privacy extensions.",
         "Status": "locked",
@@ -410,52 +455,6 @@
         "Type": "string",
         "Value": "1.5"
       },
-      "browser.safebrowsing.downloads.remote.url": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.google.gethashURL": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.google.lists": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.google.updateURL": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.google4.dataSharingURL": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.google4.gethashURL": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.google4.updateURL": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.mozilla.gethashURL": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.mozilla.lists": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.mozilla.lists.base": {
-        "Status": "clear"
-      },
-
-      "browser.safebrowsing.provider.mozilla.lists.content": {
-        "Status": "clear"
-      },
-      "browser.safebrowsing.provider.mozilla.updateURL": {
-        "Status": "clear"
-      },
       "layout.css.prefers-color-scheme.content-override": {
         "Comment": "Dark theme by default, disabling allowed",
         "Status": "default",

etc/opt/chromium/policies/managed/aminda-extensions.json

@@ -63,7 +63,9 @@
       },
       "mlojlfildnehdpnlmpkeiiglhhkofhpb": {
         "toAdd": {
-          "trustedSiteDirectives": [""]
+          "trustedSiteDirectives": [
+            ""
+          ]
         },
         "toOverwrite": {
           "filterLists": [
@@ -75,7 +77,11 @@
       },
       "pkehgijcmpdhfbdbbnkijodmdjhbjlgp": {
         "checkForDNTPolicy": true,
-        "disabledSites": ["cloudflare.com", "ecosia.org", "keyoxide.org"],
+        "disabledSites": [
+          "cloudflare.com",
+          "ecosia.org",
+          "keyoxide.org"
+        ],
         "learnInIncognito": true,
         "learnLocally": true,
         "sendDNTSignal": true,

etc/opt/chromium/policies/recommended/restore-on-start.json

@@ -1 +1,3 @@
-{ "RestoreOnStartup": 1 }
+{
+  "RestoreOnStartup": 1
+}