hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2024-11-16 23:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

config: use hyprutils helper

Browse source
This commit is contained in:
Mihai Fufezan 2024-07-16 22:30:19 +03:00
parent d91713c1a8
commit bcfb13c26b
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/config/ConfigManager.cpp
View file

@ -1,6 +1,7 @@
#include "ConfigManager.hpp" #include "ConfigManager.hpp"
#include "../helpers/MiscFunctions.hpp" #include "../helpers/MiscFunctions.hpp"
#include "src/helpers/Log.hpp" #include "src/helpers/Log.hpp"
#include <hyprutils/path/Path.hpp>
#include <filesystem> #include <filesystem>
#include <glob.h> #include <glob.h>
#include <cstring> #include <cstring>
@ -18,22 +19,12 @@ static Hyprlang::CParseResult handleSource(const char* c, const char* v) {
return result; return result;
} }
static std::string getConfigDir() {
static const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
if (xdgConfigHome && std::filesystem::path(xdgConfigHome).is_absolute())
return xdgConfigHome;
static const char* home = getenv("HOME");
if (!home)
throw std::runtime_error("Neither HOME nor XDG_CONFIG_HOME is set in the environment. Cannot determine config directory.");
return home + std::string("/.config");
}
static std::string getMainConfigPath() { static std::string getMainConfigPath() {
return getConfigDir() + "/hypr/hyprlock.conf"; static const auto paths = Hyprutils::Path::findConfig("hyprlock");
if (paths.first.has_value())
return paths.first.value();
else
throw std::runtime_error("Could not find config in HOME, XDG_CONFIG_HOME, XDG_CONFIG_DIRS or /etc/hypr.");
} }
CConfigManager::CConfigManager(std::string configPath) : CConfigManager::CConfigManager(std::string configPath) :