Config: use hyprutils helper (#183)

* config: use hyprutils helper

CMake: add version, add hyprutils

* Nix: add hyprutils dep

flake.lock: update

* Nix: add hyprwayland-scanner dep

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.4)
 project(hyprpaper
     DESCRIPTION "A blazing fast wayland wallpaper utility"
+    VERSION 0.7.0
 )
 
 set(CMAKE_MESSAGE_LOG_LEVEL "STATUS")
@@ -71,7 +72,7 @@ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-m
 find_package(Threads REQUIRED)
 
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols cairo pango pangocairo libjpeg libwebp hyprlang>=0.2.0)
+pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-protocols cairo pango pangocairo libjpeg libwebp hyprlang>=0.2.0 hyprutils>=0.2.0)
 
 file(GLOB_RECURSE SRCFILES "src/*.cpp")
 

flake.nix

@@ -3,10 +3,26 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    systems.url = "github:nix-systems/default-linux";
 
-    hyprlang.url = "github:hyprwm/hyprlang";
+    hyprutils = {
+      url = "github:hyprwm/hyprutils";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
 
-    systems.url = "github:nix-systems/default-linux";
+    hyprlang = {
+      url = "github:hyprwm/hyprlang";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+      inputs.hyprutils.follows = "hyprutils";
+    };
+
+    hyprwayland-scanner = {
+      url = "github:hyprwm/hyprwayland-scanner";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
   };
 
   outputs = {
@@ -31,16 +47,19 @@
   in {
     overlays = {
       default = self.overlays.hyprpaper;
-      hyprpaper = final: prev: rec {
-        hyprpaper = final.callPackage ./nix/default.nix {
-          stdenv = final.gcc13Stdenv;
-          version = "0.pre" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
-          commit = self.rev or "";
-          inherit (final.xorg) libXdmcp;
-          inherit (inputs.hyprlang.packages.${final.system}) hyprlang;
-        };
-        hyprpaper-debug = hyprpaper.override {debug = true;};
-      };
+      hyprpaper = lib.composeManyExtensions [
+        inputs.hyprlang.overlays.default
+        inputs.hyprutils.overlays.default
+        inputs.hyprwayland-scanner.overlays.default
+        (final: prev: rec {
+          hyprpaper = final.callPackage ./nix/default.nix {
+            stdenv = final.gcc13Stdenv;
+            version = "0.7.0" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
+            commit = self.rev or "";
+          };
+          hyprpaper-debug = hyprpaper.override {debug = true;};
+        })
+      ];
     };
 
     packages = eachSystem (system: {

nix/default.nix

@@ -8,6 +8,8 @@
   file,
   fribidi,
   hyprlang,
+  hyprutils,
+  hyprwayland-scanner,
   libdatrie,
   libGL,
   libjpeg,
@@ -22,7 +24,7 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  libXdmcp,
+  xorg,
   commit,
   debug ? false,
   version ? "git",
@@ -45,6 +47,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
+    hyprwayland-scanner
     pkg-config
   ];
 
@@ -54,6 +57,7 @@ stdenv.mkDerivation {
     file
     fribidi
     hyprlang
+    hyprutils
     libdatrie
     libGL
     libjpeg
@@ -67,15 +71,15 @@ stdenv.mkDerivation {
     wayland
     wayland-protocols
     wayland-scanner
-    libXdmcp
+    xorg.libXdmcp
     util-linux
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/hyprwm/hyprpaper";
     description = "A blazing fast wayland wallpaper utility with IPC controls";
+    homepage = "https://github.com/hyprwm/hyprpaper";
     license = licenses.bsd3;
-    platforms = platforms.linux;
     mainProgram = "hyprpaper";
+    platforms = platforms.linux;
   };
 }

src/config/ConfigManager.cpp

@@ -1,5 +1,6 @@
 #include "ConfigManager.hpp"
 #include "../Hyprpaper.hpp"
+#include <hyprutils/path/Path.hpp>
 
 static Hyprlang::CParseResult handleWallpaper(const char* C, const char* V) {
     const std::string COMMAND = C;
@@ -196,14 +197,11 @@ std::string CConfigManager::getMainConfigPath() {
     if (!g_pHyprpaper->m_szExplicitConfigPath.empty())
         return g_pHyprpaper->m_szExplicitConfigPath;
 
-    static const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
-    std::string configPath;
-    if (!xdgConfigHome)
-        configPath = getenv("HOME") + std::string("/.config");
+    static const auto paths = Hyprutils::Path::findConfig("hyprpaper");
+    if (paths.first.has_value())
+        return paths.first.value();
     else
-        configPath = xdgConfigHome;
-
-    return configPath + "/hypr/hyprpaper.conf";
+        throw std::runtime_error("Could not find config in HOME, XDG_CONFIG_HOME, XDG_CONFIG_DIRS or /etc/hypr.");
 }
 
 // trim from both ends