From bb066753e2c5092b0b13832ec557e5ba4447fbbd Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Mon, 22 Apr 2024 23:39:35 +0200
Subject: [PATCH] .

---
 zilti/packages/hyprland.scm | 115 +++++++++++++++---------------------
 1 file changed, 49 insertions(+), 66 deletions(-)

diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm
index 81e8a31..54efef2 100644
--- a/zilti/packages/hyprland.scm
+++ b/zilti/packages/hyprland.scm
@@ -53,6 +53,8 @@
   #:use-module
   (gnu packages cpio)
   #:use-module
+  (gnu packages cpp)
+  #:use-module
   (gnu packages docbook)
   #:use-module
   (gnu packages elf)
@@ -112,31 +114,6 @@
   ((zilti packages utilities)
    #:prefix utils:))
 
-(define-public tomlplusplus ;; SENT to Guix
-  (package
-   (name "tomlplusplus")
-   (version "3.4.0")
-   (source
-    (origin
-     (method git-fetch)
-     (uri
-      (git-reference
-       (url "https://github.com/marzer/tomlplusplus")
-       (commit
-        (string-append "v" version))))
-     (sha256
-      (base32
-       "1hvbifzcc97r9jwjzpnq31ynqnj5y93cjz4frmgddnkg8hxmp6w7"))))
-   (build-system meson-build-system)
-   (native-inputs
-    (list python utils:cmake))
-   (arguments
-    (list #:tests? #f))
-   (home-page "https://marzer.github.io/tomlplusplus/")
-   (synopsis "Header-only TOML config file parser and serializer for C++17")
-   (description "Header-only TOML config file parser and serializer for C++17.")
-   (license license:expat)))
-
 (define-public libliftoff
   (package
    (name "libliftoff")
@@ -165,29 +142,6 @@ way. Users create \"virtual planes\" called layers, set KMS properties on them,
 and libliftoff will pick hardware planes for these layers if possible.")
    (license license:expat)))
 
-(define cairo-for-hyprland
-  (package
-   (inherit cairo)
-   (name "cairo")
-   (version "1.18.0")
-   (source
-    (origin
-     (method url-fetch)
-     (uri
-      (string-append "https://cairographics.org/releases/cairo-"
-                     version ".tar.xz"))
-     (sha256
-      (base32
-       "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4"))))
-   (build-system meson-build-system)
-   (arguments
-    (list #:tests? #f
-          #:glib-or-gtk? #t
-          #:configure-flags
-          #~(list "-Dspectre=disabled")))
-   (outputs
-    '("out"))))
-
 (define hwdata-for-hyprland
   (package
    (inherit hwdata)
@@ -273,7 +227,7 @@ and libliftoff will pick hardware planes for these layers if possible.")
 (define-public hyprland
   (package
    (name "hyprland")
-   (version "0.39.0")
+   (version "0.39.1")
    (source
     (origin
      (method git-fetch)
@@ -285,7 +239,7 @@ and libliftoff will pick hardware planes for these layers if possible.")
        (recursive? #t)))
      (sha256
       (base32
-       "0v6xadkrl138irq43s7y747krdirqz9fskw74jbizs5nij1qm9qi"))))
+       "1b2l1j7i7fgy66c1nai7z16l0a95ay3xqq7yr2r6h7sq0jlnpgpc"))))
    (build-system cmake-build-system )
    (arguments
     (list #:build-type "release"
@@ -317,7 +271,7 @@ and libliftoff will pick hardware planes for these layers if possible.")
           jq
           pkg-config))
    (inputs
-    (list cairo-for-hyprland
+    (list cairo
           eudev
           gcc-13
           hwdata-for-hyprland
@@ -377,20 +331,49 @@ more.")
      (append xcb-util-wm)
      (append xorg-server-xwayland)))))
 
+(define hyprland-official-plugin
+  (package
+   (name "hyprland-official-plugin")
+   (version "e9457e08ca3ff16dc5a815be62baf9e18b539197")
+   (source
+    (origin (method git-fetch)
+            (uri (git-reference
+                  (url "https://github.com/hyprwm/hyprland-plugins")
+                  (commit version)))
+            (sha256
+             (base32
+              "1zh5x83nfr5893snnz38kmxvj31m8n8pgjdd0759amm41f4gw2ia"))))
+   (build-system meson-build-system)
+   (native-inputs
+    (list gcc-13
+          pkg-config
+          hyprland
+          wayland))
+   (inputs
+    (list pango
+          cairo
+          pixman
+          libdrm-for-hyprland
+          libinput
+          libxkbcommon))
+   (home-page "https://github.com/hyprwm/hyprland-plugins")
+   (synopsis "A template for official hyprland plugins")
+   (description "A template for official hyprland plugins")
+   (license license:bsd-3)))
+
 (define-public hyprland-plugin-hyprsplit
   (package
    (name "hyprland-plugin-hyprsplit")
-   (version "3b71eaf")
+   (version "6b9db62fab91066bb678f14198771b8e8cc12a8f")
    (source
-    (origin
-     (method git-fetch)
-     (uri
-      (git-reference
-       (url "https://github.com/shezdy/hyprsplit.git")
-       (commit version)))
-     (sha256
-      (base32
-       "0cqr5h5lkwcadavsh9yx0xbc88rlr29s3zws1694ya8ayalbappx"))))
+    (origin (method git-fetch)
+            (uri
+             (git-reference
+              (url "https://github.com/shezdy/hyprsplit.git")
+              (commit version)))
+            (sha256
+             (base32
+              "1zh5x83nfr5893snnz38kmxvj31m8n8pgjdd0759amm41f4gw3ia"))))
    (build-system meson-build-system)
    (arguments
     (list
@@ -407,7 +390,7 @@ more.")
           pkg-config
           wayland))
    (inputs
-    (list cairo-for-hyprland
+    (list cairo
           hyprlang
           libdrm-for-hyprland
           libinput
@@ -470,7 +453,7 @@ more.")
     (list gcc-13
           pkg-config))
    (inputs
-    (list cairo-for-hyprland
+    (list cairo
           mesa
           rosenthal:hyprland-protocols
           wayland-protocols-for-hyprland
@@ -489,7 +472,7 @@ more.")
 (define-public hypridle
   (package
    (name "hypridle")
-   (version "0.1.1")
+   (version "0.1.2")
    (source
     (origin
      (method git-fetch)
@@ -500,7 +483,7 @@ more.")
         (string-append "v" version))))
      (sha256
       (base32
-       "0k0izx34zp65lawl25n8my2m4yfql9zmfljlkz50k4yr8d9qbb31"))))
+       "10l0yxy1avryjj54gimw2blhl7348dypyhh43b73a8ncjicpjnzc"))))
    (build-system cmake-build-system)
    (arguments
     (list
@@ -554,7 +537,7 @@ more.")
           egl-wayland
           eglexternalplatform))
    (inputs
-    (list cairo-for-hyprland
+    (list cairo
           pango
           linux-pam
           mesa