.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,json}]
+[*.{cff,yaml,yml}]
 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,11 +49,9 @@ repos:
         #- id: fix-encoding-pragma
         #args: [--remove]
       - id: mixed-line-ending
-        args: [--fix=auto]
-      - id: pretty-format-json
         args:
-          # --no-sort-keys
+          [--fix=auto]
-          [--autofix, --no-ensure-ascii]
+          #- id: pretty-format-json
           #- id: requirements-txt-fixer
 
   # Checks the ci: section on top of the file
@@ -122,8 +120,8 @@ repos:
     rev: "v3.0.3"
     hooks:
       - id: prettier
-        # These are handled by Black below or pretty-format-json above
+        # These are handled by Black below
-        exclude_types: [python, pyi, jupyter, json]
+        exclude_types: [python, pyi, jupyter]
         additional_dependencies: [
             # https://www.npmjs.com/package/prettier
             "prettier@3.0.3",

conf/waybar/config.json

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