sort json keys

.editorconfig

@@ -91,6 +91,6 @@ end_of_line = crlf
 
 # YAML requires spaces. The GitHub citation files look YAML to me.
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-citation-files
-[*.{cff,yaml,yml}]
+[*.{cff,yaml,yml,json}]
 indent_style = space
 indent_size = 2

.pre-commit-config.yaml

@@ -41,7 +41,7 @@ repos:
       - id: detect-private-key
       - id: fix-byte-order-marker
       #- id: check-docstring-first
-      #- id: check-json
+      - id: check-json
       - id: check-merge-conflict
       - id: check-toml
       - id: check-xml
@@ -49,9 +49,11 @@ repos:
         #- id: fix-encoding-pragma
         #args: [--remove]
       - id: mixed-line-ending
+        args: [--fix=auto]
+      - id: pretty-format-json
         args:
-          [--fix=auto]
+          # --no-sort-keys
-          #- id: pretty-format-json
+          [--autofix, --no-ensure-ascii]
           #- id: requirements-txt-fixer
 
   # Checks the ci: section on top of the file
@@ -120,8 +122,8 @@ repos:
     rev: "v3.0.3"
     hooks:
       - id: prettier
-        # These are handled by Black below
+        # These are handled by Black below or pretty-format-json above
-        exclude_types: [python, pyi, jupyter]
+        exclude_types: [python, pyi, jupyter, json]
         additional_dependencies: [
             # https://www.npmjs.com/package/prettier
             "prettier@3.0.3",

conf/waybar/config.json

@@ -1,62 +1,67 @@
 {
-	"layer": "top",
+  "battery": {
-	"position": "left",
+    "format": "BAT {capacity}%",
-	"modules-left": ["sway/workspaces", "sway/mode"],
+    "states": {
-	"modules-right": [
+      "critical": 20,
-		"gamemode",
+      "warning": 45
-		"cpu",
+    }
-		"memory",
+  },
-		"battery",
+  "bluetooth": {
-		"pulseaudio",
+    "format": "BT {status}",
-		"sway/language",
+    "format-connected": "BT {device_alias}",
-		"network",
+    "format-connected-battery": "BT {device_alias} {device_battery_percentage}%"
-		"bluetooth",
+  },
-		"tray",
+  "clock": {
-		"clock"
+    "format": "{:%a. %d.\n%b.\n%Y-%j\n%G-W%V-%u\n%F\n%H.%M.%S}"
-	],
+  },
-	"sway/window": {
+  "cpu": {
-		"max-length": 50
+    "format": "CPU {usage}%"
-	},
+  },
-	"cpu": {
+  "layer": "top",
-		"format": "CPU {usage}%"
+  "memory": {
-	},
+    "format": "RAM {percentage}%"
-	"memory": {
+  },
-		"format": "RAM {percentage}%"
+  "modules-left": [
-	},
+    "sway/workspaces",
-	"bluetooth": {
+    "sway/mode"
-		"format": "BT {status}",
+  ],
-		"format-connected": "BT {device_alias}",
+  "modules-right": [
-		"format-connected-battery": "BT {device_alias} {device_battery_percentage}%"
+    "gamemode",
-	},
+    "cpu",
-	"pulseaudio": {
+    "memory",
-		"format": "VOL {volume}%",
+    "battery",
-		"format-bluetooth": "BT VOL {volume}%",
+    "pulseaudio",
-		"ignored-sinks": ["Easy Effects Sink", "Easy Effects Source"]
+    "sway/language",
-	},
+    "network",
-	"battery": {
+    "bluetooth",
-		"states": {
+    "tray",
-			"warning": 45,
+    "clock"
-			"critical": 20
+  ],
-		},
+  "network": {
-		"format": "BAT {capacity}%"
+    "format": "{ifname}",
-	},
+    "format-disconnected": "",
-	"sway/language": {
+    "format-ethernet": "{ifname} up",
-		"format": "KBD {short} {variant}",
+    "format-wifi": "{frequency}G {signalStrength}% {essid}",
-		"on-click": "swaymsg input type:keyboard xkb_switch_layout next"
+    "max-length": 50,
-	},
+    "tooltip-format": "{ifname}",
-	"network": {
+    "tooltip-format-disconnected": "Disconnected",
-		//"interface": "wlan0",
+    "tooltip-format-ethernet": "{ifname} up",
-		"format": "{ifname}",
+    "tooltip-format-wifi": "{frequency}G {signalStrength}% {essid}"
-		"format-wifi": "{frequency}G {signalStrength}% {essid}",
+  },
-		"format-ethernet": "{ifname} up",
+  "position": "left",
-		"format-disconnected": "",
+  "pulseaudio": {
-		"tooltip-format": "{ifname}",
+    "format": "VOL {volume}%",
-		"tooltip-format-wifi": "{frequency}G {signalStrength}% {essid}",
+    "format-bluetooth": "BT VOL {volume}%",
-		"tooltip-format-ethernet": "{ifname} up",
+    "ignored-sinks": [
-		"tooltip-format-disconnected": "Disconnected",
+      "Easy Effects Sink",
-		"max-length": 50
+      "Easy Effects Source"
-	},
+    ]
-	"clock": {
+  },
-		"format": "{:%a. %d.\n%b.\n%Y-%j\n%G-W%V-%u\n%F\n%H.%M.%S}"
+  "sway/language": {
-	}
+    "format": "KBD {short} {variant}",
+    "on-click": "swaymsg input type:keyboard xkb_switch_layout next"
+  },
+  "sway/window": {
+    "max-length": 50
+  }
 }