Config: use hyprutils helper (#77)

* flake.lock: update

* config: use hyprutils helper

* Nix: add hyprutils dep

flake.lock: update

CMakeLists.txt

@@ -33,7 +33,7 @@ message(STATUS "Checking deps...")
 
 find_package(Threads REQUIRED)
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols hyprlang>=0.4.0 sdbus-c++)
+pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols hyprlang>=0.4.0 hyprutils>=0.2.0 sdbus-c++)
 
 file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
 add_executable(hypridle ${SRCFILES})

flake.nix

@@ -8,6 +8,14 @@
     hyprlang = {
       url = "github:hyprwm/hyprlang";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+      inputs.hyprutils.follows = "hyprutils";
+    };
+
+    hyprutils = {
+      url = "github:hyprwm/hyprutils";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
     };
   };
 

nix/default.nix

@@ -4,6 +4,7 @@
   cmake,
   pkg-config,
   hyprlang,
+  hyprutils,
   sdbus-cpp,
   systemd,
   wayland,
@@ -22,6 +23,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     hyprlang
+    hyprutils
     sdbus-cpp
     systemd
     wayland

nix/overlays.nix

@@ -12,6 +12,7 @@ in {
 
   hypridle = lib.composeManyExtensions [
     inputs.hyprlang.overlays.default
+    inputs.hyprutils.overlays.default
     (final: prev: {
       hypridle = prev.callPackage ./default.nix {
         stdenv = prev.gcc13Stdenv;

src/config/ConfigManager.cpp

@@ -1,20 +1,17 @@
 #include "ConfigManager.hpp"
+#include <hyprutils/path/Path.hpp>
 #include <filesystem>
 
-static std::string getConfigDir() {
-    static const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
-
-    if (xdgConfigHome && std::filesystem::path(xdgConfigHome).is_absolute())
-        return xdgConfigHome;
-
-    return getenv("HOME") + std::string("/.config");
-}
-
 static std::string getMainConfigPath() {
-    return getConfigDir() + "/hypr/hypridle.conf";
+    static const auto paths = Hyprutils::Path::findConfig("hypridle");
+    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) : m_config(configPath.empty() ? getMainConfigPath().c_str() : configPath.c_str(), Hyprlang::SConfigOptions{.throwAllErrors = true, .allowMissingConfig = false}) {
+CConfigManager::CConfigManager(std::string configPath) :
+    m_config(configPath.empty() ? getMainConfigPath().c_str() : configPath.c_str(), Hyprlang::SConfigOptions{.throwAllErrors = true, .allowMissingConfig = false}) {
     ;
 }