From 2600f53bdd436b3598e2e4e951f57f22827b07fd Mon Sep 17 00:00:00 2001 From: Ryan Delaney Date: Wed, 13 Dec 2023 10:39:59 -0500 Subject: [PATCH 1/3] Clarify that the configuration file is JSON*C* JSON is JSONC --- man/waybar.5.scd.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in index e85033d4..26b9ecfc 100644 --- a/man/waybar.5.scd.in +++ b/man/waybar.5.scd.in @@ -6,7 +6,7 @@ waybar - configuration file # DESCRIPTION -The configuration uses the JSON file format and is named *config*. +The configuration uses the JSONC file format and is named *config*. Valid locations for this file are: From 2cd67fdd0a599be6fff813257e3ac460feb814f3 Mon Sep 17 00:00:00 2001 From: Ryan Delaney Date: Wed, 13 Dec 2023 10:40:13 -0500 Subject: [PATCH 2/3] The file can also be named config.jsonc --- man/waybar.5.scd.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in index 26b9ecfc..e20eff4c 100644 --- a/man/waybar.5.scd.in +++ b/man/waybar.5.scd.in @@ -6,7 +6,7 @@ waybar - configuration file # DESCRIPTION -The configuration uses the JSONC file format and is named *config*. +The configuration uses the JSONC file format and is named *config* or *config.jsonc*. Valid locations for this file are: From 68e525df588beb686e44d26271d0addc699afb44 Mon Sep 17 00:00:00 2001 From: Ryan Delaney Date: Wed, 13 Dec 2023 11:22:57 -0500 Subject: [PATCH 3/3] Remove 'config' from list of valid locations Since the file can also be named config.jsonc, that will remove ambiguity --- man/waybar.5.scd.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/man/waybar.5.scd.in b/man/waybar.5.scd.in index e20eff4c..e076b000 100644 --- a/man/waybar.5.scd.in +++ b/man/waybar.5.scd.in @@ -10,11 +10,11 @@ The configuration uses the JSONC file format and is named *config* or *config.js Valid locations for this file are: -- *$XDG_CONFIG_HOME/waybar/config* -- *~/.config/waybar/config* -- *~/waybar/config* -- */etc/xdg/waybar/config* -- *@sysconfdir@/xdg/waybar/config* +- *$XDG_CONFIG_HOME/waybar/* +- *~/.config/waybar/* +- *~/waybar/* +- */etc/xdg/waybar/* +- *@sysconfdir@/xdg/waybar/* A good starting point is the default configuration found at https://github.com/Alexays/Waybar/blob/master/resources/config Also, a minimal example configuration can be found at the bottom of this man page.