bugfix: default configuration is now copied to ~/.config instead of ~/.config/miracle-wm on accident

Author: mattkae

miracle-wm-config/include/miracle/miracle-wm-config.h

@@ -173,6 +173,8 @@ MIRACLE_WM_CONFIG_API ConfigSaveResult save_config(std::string const& path, Conf
 
 MIRACLE_WM_CONFIG_API std::string get_config_path();
 
+MIRACLE_WM_CONFIG_API std::string get_user_config_dir();
+
 MIRACLE_WM_CONFIG_API std::string get_display_config_path();
 
 }

miracle-wm-config/src/miracle-wm-config.cpp

@@ -1225,6 +1225,11 @@ std::string miracle::get_config_path()
     return config_path_stream.str();
 }
 
+std::string miracle::get_user_config_dir()
+{
+    return g_get_user_config_dir();
+}
+
 std::string miracle::get_display_config_path()
 {
     std::stringstream config_path_stream;

src/config.cpp

@@ -147,8 +147,9 @@ void FilesystemConfiguration::_init(
             if (std::filesystem::exists(MIRACLE_DEFAULT_CONFIG_DIR))
             {
                 mir::log_info("Configuration hierarchy being copied from %s", MIRACLE_DEFAULT_CONFIG_DIR);
+                auto const config_dir = get_user_config_dir();
                 const auto fs_copyopts = std::filesystem::copy_options::recursive;
-                std::filesystem::copy(MIRACLE_DEFAULT_CONFIG_DIR, std::filesystem::path(config_path).parent_path(), fs_copyopts);
+                std::filesystem::copy(MIRACLE_DEFAULT_CONFIG_DIR, std::filesystem::path(config_dir), fs_copyopts);
             }
             else
             {