From 22a8427db4a1031dd85ec09838dd84af7fff5d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Pla=C3=A7ais?= Date: Thu, 9 Aug 2018 17:02:30 +0200 Subject: [PATCH] Add system-wide config and style files --- meson.build | 6 ++++++ src/client.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/meson.build b/meson.build index 17dbf7fa..bb529dc1 100644 --- a/meson.build +++ b/meson.build @@ -47,3 +47,9 @@ executable( include_directories: [include_directories('include')], install: true, ) + +install_data( + './resources/config', + './resources/style.css', + install_dir: '/etc/xdg/waybar', +) diff --git a/src/client.cpp b/src/client.cpp index 6fb779c8..37bc5c69 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -58,11 +58,13 @@ waybar::Client::Client(int argc, char* argv[]) configFile = getFirstValidPath({ "$XDG_CONFIG_HOME/waybar/config", "$HOME/waybar/config", + "/etc/xdg/waybar/config", "./resources/config", }); cssFile = getFirstValidPath({ "$XDG_CONFIG_HOME/waybar/style.css", "$HOME/waybar/style.css", + "/etc/xdg/waybar/style.css", "./resources/style.css", });