From 4783757141fa729752847c74286c7e647b1e4eb9 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Fri, 12 Apr 2024 11:32:48 +0200
Subject: [PATCH] Merge

---
 zilti/packages/hyprland.scm | 45 +++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm
index 2e898bb..1fcf71a 100644
--- a/zilti/packages/hyprland.scm
+++ b/zilti/packages/hyprland.scm
@@ -262,7 +262,14 @@ command line tool called @code{udcli} that incorporates the library.")
                                          (invoke "make"
                                                  (string-append "PREFIX=" #$output)
                                                  "installheaders")))))))
-   (native-inputs (list cmake gcc-13 jq pkg-config cpio))
+   (native-inputs
+    (list cmake
+          cpio
+          gcc-13
+          jq
+          pkg-config
+          rosenthal:hyprland-protocols
+          eglexternalplatform))
    (inputs
     (list cairo-for-hyprland
           gcc-13
@@ -286,36 +293,40 @@ effects, has a very flexible IPC model allowing for a lot of customization, and
 more.")
    (license license:bsd-3)))
 
-(define-public hyprland-split-monitor-workspaces
+(define-public hyprland-plugin-hyprsplit
   (package
-   (name "hyprland-split-monitor-workspaces")
-   (version "d0012b8")
+   (name "hyprland-plugin-hyprsplit")
+   (version "8a542c2")
    (source (origin
             (method git-fetch)
             (uri (git-reference
-                  (url "https://github.com/Duckonaut/split-monitor-workspaces.git")
+                  (url "https://github.com/shezdy/hyprsplit.git")
                   (commit version)))
             (sha256
              (base32
-              "0651nvj9a9hccb699akfpv6p3s886pajmafs05c2va4bxwnhp9yy"))))
-   (build-system gnu-build-system)
+              "1lk2z2xm13cp94lg538k8a10n0bnydxz4scacnn2hfzfy1kvqrd7"))))
+   (build-system meson-build-system)
    (arguments
     (list
+     #:configure-flags #~(list "-Dcpp_std=none" "-Dcpp_args=-std=gnu++2b")
      #:phases #~(modify-phases %standard-phases
-                               (delete 'configure))))
+                               (delete 'check))))
    (native-inputs
-    (list gcc-13
+    (list cmake
+          gcc-13
           pkg-config
+          rosenthal:hyprland-protocols
+          wlroots-for-hyprland))
+   (inputs
+    (list cairo-for-hyprland
           hyprland
-          cairo-for-hyprland
-          libdrm-for-hyprland
           rosenthal:hyprlang
-          pixman
-          wlroots-for-hyprland
-          jq))
-   (home-page "https://github.com/Duckonaut/split-monitor-workspaces.git")
-   (synopsis "A small Hyprland plugin to provide awesome-like workspace behavior")
-   (description "A small plugin to provide awesome/dwm-like behavior with workspaces: split them between monitors and provide independent numbering.")
+          libdrm-for-hyprland
+          libinput
+          pixman))
+   (home-page "https://github.com/shezdy/hyprsplit")
+   (synopsis "hyprland plugin for separate sets of workspaces on each monitor")
+   (description "A complete rewrite of split-monitor-workspaces that attempts to fix the issues I experienced with it.")
    (license license:bsd-3)))
 
 (define-public hyprpaper