From c65ec9e14fa3509c2da67551e14add961f9850ce Mon Sep 17 00:00:00 2001 From: Yonatan Avhar Date: Fri, 21 May 2021 15:54:48 +0300 Subject: [PATCH 1/2] Add options to use a .json extension for the config filename --- src/client.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client.cpp b/src/client.cpp index 1c48c813..f6330c32 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -207,9 +207,13 @@ std::tuple waybar::Client::getConfigs( const std::string &config, const std::string &style) const { auto config_file = config.empty() ? getValidPath({ "$XDG_CONFIG_HOME/waybar/config", + "$XDG_CONFIG_HOME/waybar/config.json", "$HOME/.config/waybar/config", + "$HOME/.config/waybar/config.json", "$HOME/waybar/config", + "$HOME/waybar/config.json", "/etc/xdg/waybar/config", + "/etc/xdg/waybar/config.json", SYSCONFDIR "/xdg/waybar/config", "./resources/config", }) From 99918205ede41e80fc5e55e0b2582ae3fc613e21 Mon Sep 17 00:00:00 2001 From: Yonatan Avhar Date: Fri, 21 May 2021 17:53:43 +0300 Subject: [PATCH 2/2] Correct .json to .jsonc --- src/client.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index f6330c32..ced9e492 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -207,13 +207,13 @@ std::tuple waybar::Client::getConfigs( const std::string &config, const std::string &style) const { auto config_file = config.empty() ? getValidPath({ "$XDG_CONFIG_HOME/waybar/config", - "$XDG_CONFIG_HOME/waybar/config.json", + "$XDG_CONFIG_HOME/waybar/config.jsonc", "$HOME/.config/waybar/config", - "$HOME/.config/waybar/config.json", + "$HOME/.config/waybar/config.jsonc", "$HOME/waybar/config", - "$HOME/waybar/config.json", + "$HOME/waybar/config.jsonc", "/etc/xdg/waybar/config", - "/etc/xdg/waybar/config.json", + "/etc/xdg/waybar/config.jsonc", SYSCONFDIR "/xdg/waybar/config", "./resources/config", })