blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1112 from yonatan8070/master 

Add options to use a .json extension for the config filename
This commit is contained in:
Alex 2021-05-21 17:00:02 +02:00 committed by GitHub
parent cf3d6545c3 99918205ed
commit 826a549d1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.cpp
View File

@ -207,9 +207,13 @@ std::tuple<const std::string, const std::string> waybar::Client::getConfigs(
const std::string &config, const std::string &style) const { const std::string &config, const std::string &style) const {
auto config_file = config.empty() ? getValidPath({ auto config_file = config.empty() ? getValidPath({
"$XDG_CONFIG_HOME/waybar/config", "$XDG_CONFIG_HOME/waybar/config",
"$XDG_CONFIG_HOME/waybar/config.jsonc",
"$HOME/.config/waybar/config", "$HOME/.config/waybar/config",
"$HOME/.config/waybar/config.jsonc",
"$HOME/waybar/config", "$HOME/waybar/config",
"$HOME/waybar/config.jsonc",
"/etc/xdg/waybar/config", "/etc/xdg/waybar/config",
"/etc/xdg/waybar/config.jsonc",
SYSCONFDIR "/xdg/waybar/config", SYSCONFDIR "/xdg/waybar/config",
"./resources/config", "./resources/config",
}) })