From 103c5e758155ff480cbe02abc4a44463997e580a Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Tue, 16 Jul 2024 22:41:40 +0300
Subject: [PATCH] Nix: add hyprutils dep

flake.lock: update
---
 flake.lock       | 34 +++++++++++-----------------------
 flake.nix        |  8 ++++++++
 nix/default.nix  |  2 ++
 nix/overlays.nix |  1 +
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9997630..0c9f072 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,15 @@
   "nodes": {
     "hyprlang": {
       "inputs": {
-        "hyprutils": "hyprutils",
+        "hyprutils": [
+          "hyprutils"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": [
+          "systems"
+        ]
       },
       "locked": {
         "lastModified": 1720381373,
@@ -25,20 +29,18 @@
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
-          "hyprlang",
           "nixpkgs"
         ],
         "systems": [
-          "hyprlang",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1717881334,
-        "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=",
+        "lastModified": 1721071737,
+        "narHash": "sha256-qmC9jGfbE4+EIBbbSAkrfR/p49wShjpv4/KztgE/P54=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e",
+        "rev": "eb1ceff2b87f6820789249f63faa8e9dcb54d05f",
         "type": "github"
       },
       "original": {
@@ -66,8 +68,9 @@
     "root": {
       "inputs": {
         "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
         "nixpkgs": "nixpkgs",
-        "systems": "systems_2"
+        "systems": "systems"
       }
     },
     "systems": {
@@ -84,21 +87,6 @@
         "repo": "default-linux",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 1f07e96..24364c7 100644
--- a/flake.nix
+++ b/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";
     };
   };
 
diff --git a/nix/default.nix b/nix/default.nix
index c96914f..4ada676 100644
--- a/nix/default.nix
+++ b/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
diff --git a/nix/overlays.nix b/nix/overlays.nix
index 216345e..5ab3bd5 100644
--- a/nix/overlays.nix
+++ b/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;