Allow Vendored Configuration File

README.md

@@ -173,7 +173,7 @@ xbps-install -S wayfire
 
 ## Configuration
 
-Copy [`wayfire.ini`] to `~/.config/wayfire.ini`.
+Copy [`wayfire.ini`] to `~/.config/wayfire.ini` or `~/.config/wayfire/wayfire.ini`.
 Before running Wayfire, you may want to change the command to start a terminal.
 See the [Configuration] document for information on the options.
 

man/wayfire.1.in

@@ -32,6 +32,8 @@ with an alternative configuration file.
 The default configuration file is searched first in the
 .Ev ${WAYFIRE_CONFIG_FILE}
 environment variable, or paths
+.Pa ${XDG_CONFIG_HOME}/wayfire/wayfire.ini ,
+.Pa ${HOME}/.config/wayfire/wayfire.ini ,
 .Pa ${XDG_CONFIG_HOME}/wayfire.ini ,
 .Pa ${HOME}/.config/wayfire.ini .
 .Pp

src/default-config-backend.cpp

@@ -141,9 +141,16 @@ class dynamic_ini_config_t : public wf::config_backend_t
             return env_cfg_file;
         }
 
-        return (getenv("XDG_CONFIG_HOME") ?:
-            (std::string(nonull(getenv("HOME"))) + "/.config")) +
-               "/wayfire.ini";
+        std::string env_cfg_home = getenv("XDG_CONFIG_HOME") ?:
+            (std::string(nonull(getenv("HOME"))) + "/.config");
+
+        std::string vendored_cfg_file = env_cfg_home + "/wayfire/wayfire.ini";
+        if (std::filesystem::exists(vendored_cfg_file))
+        {
+            return vendored_cfg_file;
+        }
+
+        return env_cfg_home + "/wayfire.ini";
     }
 };
 }