updated things and fish stuff

2 files changed, 371 insertions, 35 deletions

diff --git a/modules/ryan-packages/wm.scm b/modules/ryan-packages/wm.scm
index be24289..0049947 100644
--- a/modules/ryan-packages/wm.scm
+++ b/modules/ryan-packages/wm.scm
@@ -126,38 +126,3 @@
     (synopsis "Screen locker for Hyprland")
     (description "Screen locker for hyprland.")))
 
-
-;(define hyprland-unbundle-wlroots-patch                                            
-;  (origin                                                                          
-;    (method url-fetch)                                                             
-;    (uri (string-append "https://github.com/hyprwm/Hyprland" "/raw/"               
-;                        "13f6f0b923ff3ec94a3bec886c28b90402ceef91"                 
-;                        "/nix/patches/meson-build.patch"))                         
-;    (sha256                                                                        
-;     (base32 "02sq5ymxxrxp93mccafc4ilpsvs4m8bxc3whp7bcc5v9dx41va8k"))))
-
-;(define-public hyprland-temp
-;  (package
-;    (inherit hyprland)
-;    (version "12985fa0d8e43b1e33326dfb49be681970dfaea5")
-;    (source (origin
-;              (method git-fetch)
-;              (uri (git-reference
-;                     (url "https://github.com/hyprwm/Hyprland")
-;                     (commit version)))
-;              (file-name (git-file-name "hyprland" version))
-;              (modules '((guix build utils)))
-;              (snippet
-;                '(begin
-;                   (substitute* "meson.build"
-;                     ((".*hyprpm/src.*") ""))
-;                   (for-each delete-file-recursively
-;                             '("hyprpm"
-;                               "subprojects"))
-;                   (copy-file "src/version.h.in" "src/version.h")))
-;              (sha256
-;                (base32
-;                  "13l95h5krmv7syidw9c4gn62ac5qcqg9pmfh6x8ydjws97h05jvz"))
-;              (patches (list hyprland-unbundle-wlroots-patch))))))
-
-hyprlock
diff --git a/modules/ryan-packages/wmrosenthal.bak b/modules/ryan-packages/wmrosenthal.bak
new file mode 100644
index 0000000..5495378
--- /dev/null
+++ b/modules/ryan-packages/wmrosenthal.bak
@@ -0,0 +1,371 @@
+(define-module (ryan-packages wmrosenthal)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
+  #:use-module (guix build-system qt)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages man)
+  #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages wm)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (rosenthal packages freedesktop))
+
+(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)
+    (arguments
+     (substitute-keyword-arguments (package-arguments hwdata)
+       ((#:phases _) #~%standard-phases)))
+    (outputs '("out"))))
+
+(define libdrm-for-hyprland
+  (package
+    (inherit libdrm)
+    (name "libdrm")
+    (version "2.4.120")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://dri.freedesktop.org/libdrm/libdrm-"
+                    version ".tar.xz"))
+              (sha256
+               (base32
+                "0yijzgg6rdsa68bz03sw0lcfa2nclv9m3as1cja50wkcyxim7x9v"))))))
+
+(define udis86-for-hyprland
+  (let ((revision "186")
+        (commit "5336633af70f3917760a6d441ff02d93477b0c86"))
+    (package
+      (name "udis86")
+      (version (git-version "1.7.2" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/canihavesomecoffee/udis86")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0y5z1169wff578jylpafsww4px4y6gickhcs885a9c660d8xs9qy"))))
+      (build-system gnu-build-system)
+      (native-inputs (list autoconf automake libtool python-minimal-wrapper))
+      (home-page "https://github.com/canihavesomecoffee/udis86")
+      (synopsis "Disassembler Library for x86 and x86-64")
+      (description
+       "Udis86 is a disassembler for the x86 and x86-64 class of instruction
+set architectures.  It consists of a C library called @code{libudis86} and a
+command line tool called @code{udcli} that incorporates the library.")
+      (license license:bsd-2))))
+
+(define wayland-protocols-for-hyprland
+  (package
+    (inherit wayland-protocols)
+    (name "wayland-protocols")
+    (version "1.34")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://gitlab.freedesktop.org/wayland/wayland-protocols"
+                    "/-/releases/" version "/downloads/"
+                    "wayland-protocols-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1sxgvis0abkymc02nhx2svm60myiq3shvy759sphpxl5rp52g6y5"))))))
+
+(define wlroots-hyprland
+  (package
+    (inherit wlroots)
+    (name "wlroots")
+    (version "611a4f24cd2384378f6e500253983107c6656c64")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hyprwm/wlroots-hyprland")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0wpqa241656rcnpszkq14ikz4dxsal2xrrc7ryn22xmciw4rkxxw"))))
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs wlroots)
+       (prepend libdrm-for-hyprland)
+       (replace "libinput-minimal" libinput-minimal-1.24.0)
+       (replace "wayland-protocols" wayland-protocols-for-hyprland)))
+    (native-inputs
+     (modify-inputs (package-native-inputs wlroots)
+       (replace "hwdata" `(,hwdata-for-hyprland "out"))))))
+
+(define-public hyprcursor
+  (package
+    (name "hyprcursor")
+    (version "0.1.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hyprwm/hyprcursor")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0252abb9yjskclhxjc2ar6r2x9pfllpbas7rfp4597i2gnxrzbvv"))))
+    (build-system cmake-build-system)
+    (arguments (list #:tests? #f))      ;FIXME
+    (inputs (list cairo-for-hyprland hyprlang librsvg libzip))
+    (native-inputs (list gcc-13 pkg-config))
+    (home-page "https://hyprland.org/")
+    (synopsis "Hyprland cursor format, library and utilities")
+    (description
+     "This package provides Hyprland cursor format, library and utilities.")
+    (license license:bsd-3)))
+
+(define-public hyprland-protocols
+  (package
+    (name "hyprland-protocols")
+    (version "0.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hyprwm/hyprland-protocols")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1drjznj7fn6m5m6skhzh0p031cb5x0bb4i56jxnxwpwaa71g1z20"))))
+    (build-system meson-build-system)
+    (home-page "https://hyprland.org")
+    (synopsis "Wayland protocol extensions for Hyprland")
+    (description
+     "This package provides Wayland protocol extensions for Hyprland and it
+exists in an effort to bridge the gap between Hyprland and KDE/Gnome's
+functionality.  Since @code{wlr-protocols} is closed for new submissions, and
+@code{wayland-protocols} is very slow with changes, this package will hold
+protocols used by Hyprland to bridge the aforementioned gap.")
+    (license license:bsd-3)))
+
+(define-public hyprland
+  (package
+    (name "hyprland")
+    (version "fe7b748eb668136dd0558b7c8279bfcd7ab4d759")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/hyprwm/Hyprland")
+                     (commit version)
+                     (recursive? #t)))
+              (file-name (git-file-name name "0.39.1"))
+              ; (modules '((guix build utils)))
+              ; (snippet
+              ;  '(begin
+              ;     ;; Remove bundled sources and hyprpm utility.
+              ;     (substitute* "meson.build"
+              ;       ((".*hyprpm/src.*") ""))
+              ;     (for-each delete-file-recursively
+              ;               '("hyprpm"
+              ;                 "subprojects"))))
+              (sha256
+               (base32
+                "1b2l1j7i7fgy66c1nai7z16l0a95ay3xqq7yr2r6h7sq0jlnpgpc"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:build-type "release"
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-path
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* (find-files "src" "\\.cpp$")
+                     (("/usr/local(/bin/Hyprland)" _ path)
+                      (string-append #$output path))
+                     (("/usr") #$output)
+                     (("(execAndGet\\(\")\\<(cat|fc-list|lspci)\\>"
+                       _ pre cmd)
+                      (string-append
+                       pre (search-input-file
+                            inputs (string-append "bin/" cmd))))
+                     (("\\<cc\\>") (search-input-file inputs "bin/gcc"))
+                     ;; NOTE: Add binutils to inputs will override ld-wrapper.
+                     (("(execAndGet\\(\\(\")\\<nm\\>" _ pre)
+                      (string-append pre #$binutils "/bin/nm"))
+                     (("\\<(addr2line|objcopy)\\>" _ cmd)
+                      (string-append #$binutils "/bin/" cmd))))))))
+    (native-inputs (cons* (list "gcc-13" gcc-13) (list "jq" jq) (list "pkg-config" pkg-config) (list "cmake" cmake) (list "hwdata" hwdata-for-hyprland) (package-native-inputs wlroots)))
+    (propagated-inputs
+      (cons*
+        (list "libdrm-for-hyprland" libdrm-for-hyprland)
+        (list "libinput-minimal" libinput-minimal-1.24.0)
+        (list "wayland-protocols" wayland-protocols-for-hyprland)
+        (package-propagated-inputs wlroots)))
+            
+    (inputs
+     (list cairo-for-hyprland
+           gcc-13
+           hyprcursor
+           hyprland-protocols
+           hyprlang
+           pango
+           pciutils))
+    (home-page "https://hyprland.org")
+    (synopsis "Dynamic tiling Wayland compositor based on wlroots")
+    (description
+     "Hyprland is a dynamic tiling Wayland compositor based on @code{wlroots}
+that doesn't sacrifice on its looks.  It supports multiple layouts, fancy
+effects, has a very flexible IPC model allowing for a lot of customization, and
+more.")
+    (license license:bsd-3)))
+
+(define-public hyprlang
+  (package
+    (name "hyprlang")
+    (version "0.5.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hyprwm/hyprlang")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0f8mahg6d6wylybvh6hgayls57miwwv4w69fbaskd8d7dkg2h7kd"))))
+    (build-system cmake-build-system)
+    (native-inputs (list gcc-13))
+    (home-page "https://hyprland.org/hyprlang/")
+    (synopsis "Official implementation library for hypr config language")
+    (description
+     "This package provides the official implementation for hypr configuration
+language used in @code{hyprland}.")
+    (license license:gpl3+)))
+
+(define-public grimblast
+  (package
+    (name "grimblast")
+    (version "0.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hyprwm/contrib")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0ld0sj7ahf9jf8cqzbqkhj3m2w60027ixic24ih26nwy90b5qjwx"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:tests? #f                ;no tests
+           #:make-flags
+           #~(list (string-append "PREFIX=" #$output))
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure)
+               (add-after 'unpack 'chdir
+                 (lambda _
+                   (chdir "grimblast")))
+               (add-after 'install 'wrap
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (let ((grimblast (string-append #$output "/bin/grimblast")))
+                     (wrap-script grimblast
+                       `("PATH" suffix
+                         ,(map (lambda (program)
+                                 (dirname (search-input-file
+                                           inputs (string-append "/bin/" program))))
+                               '("grim" "slurp" "hyprctl" "wl-copy" "jq"
+                                 "notify-send" "date"))))))))))
+    (native-inputs (list scdoc))
+    (inputs (list grim guile-3.0 jq libnotify slurp hyprland wl-clipboard))
+    (home-page "https://github.com/hyprwm/contrib")
+    (synopsis "Hyprland version of Grimshot")
+    (description "A Hyprland version of Grimshot.")
+    (license license:expat)))
+
+(define-public xdg-desktop-portal-hyprland
+  (package
+    (name "xdg-desktop-portal-hyprland")
+    (version "1.3.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hyprwm/xdg-desktop-portal-hyprland")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0fdbzxanmmzrvb9wfzg1pdsnlg7dl6v5k8bl44w10n48s7bbbzn0"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:tests? #f                  ;No tests
+           #:qtbase qtbase
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-path
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* (find-files "." "\\.cp?*$")
+                     (("/bin/sh") "sh")
+                     (("\\<(sh|grim|hyprctl|slurp)\\>" _ cmd)
+                      (search-input-file inputs (string-append "/bin/" cmd)))
+                     (("\\<(hyprland-share-picker)\\>" _ cmd)
+                      (string-append #$output "/bin/" cmd))))))))
+    (native-inputs
+     (list gcc-13 pkg-config wayland))
+    (inputs
+     (list bash-minimal
+           grim
+           hyprland
+           hyprland-protocols
+           hyprlang
+           mesa
+           pipewire
+           qtwayland
+           sdbus-c++
+           slurp
+           wayland-protocols))
+    (home-page "https://github.com/hyprwm/xdg-desktop-portal-hyprland")
+    (synopsis "XDG Desktop Portal backend for Hyprland")
+    (description
+     "This package provides @code{xdg-desktop-portal-hyprland}, which extends
+@code{xdg-desktop-portal-wlr} for Hyprland with support for
+@code{xdg-desktop-portal} screenshot and casting interfaces, while adding a few
+extra portals specific to Hyprland, mostly for window sharing.")
+    (license license:bsd-3)))
+
+hyprland