changes for wails development

home-config/aerc/accounts.conf

@@ -10,6 +10,16 @@ signature-file = ~/.config/aerc/signature_personal
 check-mail = 5m
 aliases = Ryan S <ryan+ritlugdemo@rschanz.org>, Ryan Schanzenbacher <ryan+guixdevel@rschanz.org>
 
+[Development]
+source  = imaps://ryan_devel%40rschanz.org@mail.rschanz.org:993
+source-cred-cmd = pass emails/development 2>/dev/null | tr -d '\n'
+outgoing = smtps://ryan_devel%40rschanz.org@mail.rschanz.org:465
+outgoing-cred-cmd = pass emails/development 2>/dev/null | tr -d '\n'
+default = INBOX
+from = Ryan <ryan_devel@rschanz.org>
+copy-to = Sent
+check-mail = 5m
+
 [School]
 source  = imaps+oauthbearer://rjs1877%40rit.edu@imap.gmail.com:993?token_endpoint=https%3A%2F%2Faccounts.google.com%2Fo%2Foauth2%2Ftoken&client_id=667738788924-0rdfvaq9ijfo1vk4474eb3quf8206h2t.apps.googleusercontent.com&client_secret=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
 source-cred-cmd = pass emails/rit_personal 2>/dev/null | tr -d '\n'

home-config/fish/config.fish

@@ -12,8 +12,12 @@ if status is-login
     fish_add_path -Pp ~/.guix-home/profile/bin
     fish_add_path -Pp /run/setuid-programs
     fish_add_path -Pp ~/.nix-profile/bin
+    fish_add_path -Pp ~/.go/bin
+    set -gx GOPATH ~/.go
     set -gx EDITOR nvim
     set -gax --path XDG_DATA_DIRS ~/.nix-profile/share
+    set -gax --path PKG_CONFIG_PATH /run/current-system/profile/lib/pkgconfig
+    set -gax --path LD_LIBRARY_PATH /run/current-system/profile/lib
     # Bad
     find ~/.config/fish/ -name "*tmp*" -exec rm {} +
 end

home-config/home-configuration.scm

@@ -36,6 +36,7 @@
 (define %home-symlinks
   `((".config/guix/home-config/fish" ".config/fish")
     (".config/guix/home-config/nix-config" ".config/nix")
+    (".config/guix/home-config/tridactyl/native_main" ".local/share/tridactyl/native_main")
     (".config/guix/home-config/nix-home-manager" ".config/home-manager")))
 
 (home-symlinks %home-symlinks)
@@ -51,11 +52,13 @@
                                                     "libnotify"
                                                     "fzf"
                                                     "waypipe"
+                                                    "foot"
                                                     "pulseaudio" ;only for pactl
                                                     "qpwgraph"
                                                     "gnunet"
                                                     "ffmpeg"
                                                     "qrencode"
+                                                    "tmux"
                                                     "binutils"
                                                     "gcc-toolchain"
                                                     "borg"
@@ -64,6 +67,7 @@
                                                     "cloc"
                                                     "sc-im"
                                                     "pv"
+                                                    "jq"
                                                     "bombadillo"
                                                     "python-msgpack"
                                                     "wdisplays"
@@ -128,6 +132,7 @@
                                                     "kanshi"
                                                     ;"firefox"
                                                     "signal-desktop"
+                                                    "sc-im"
                                                     "git-lfs"))
                     (list my-neovim wl-mirror firefox-wrapped calcurse-fixed superfile-bin)))
 
@@ -159,6 +164,7 @@
          (service home-files-service-type
                   `((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))
                     (".ssh/config" ,(local-file "ssh/config"))
+                    (".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))
                     ;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
                     ;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))
                     (".fonts" ,(local-file "fonts" #:recursive? #t))

home-config/hypr/hyprlock.conf

@@ -0,0 +1,55 @@
+background {
+    monitor =
+    path = /home/ryan/.config/hypr/Wallpapers/static/autumn1.png
+
+    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+    blur_passes = 2 # 0 disables blurring
+    blur_size = 7
+    noise = 0.2
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    monitor =
+    size = 200, 50
+    outline_thickness = 3
+    dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = false
+    dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
+    outer_color = rgb(151515)
+    inner_color = rgb(200, 200, 200)
+    font_color = rgb(10, 10, 10)
+    fade_on_empty = true
+    fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
+    placeholder_text = <i>Input Password...</i> # Text rendered in the input box when it's empty.
+    hide_input = false
+    rounding = -1 # -1 means complete rounding (circle/oval)
+    check_color = rgb(204, 136, 34)
+    fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color
+    fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i> # can be set to empty
+    fail_timeout = 2000 # milliseconds before fail_text and fail_color disappears
+    fail_transition = 300 # transition time in ms between normal outer_color and fail_color
+    capslock_color = -1
+    numlock_color = -1
+    bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
+    invert_numlock = false # change color if numlock is off
+    swap_font_color = false # see below
+
+    position = 0, -20
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%-H:%M:%S")"
+    #color = rgba(255, 255, 255, 0.6)
+    font_size = 80
+    position = 0, 300
+    halign = center
+    valign = center
+}

home-config/ssh/config

@@ -16,5 +16,9 @@ Host rncorepub
     Hostname 5.161.89.186
     User root
 
+Host 192.168.216.1
+    HostkeyAlgorithms +ssh-rsa
+    PubkeyAcceptedAlgorithms +ssh-rsa
+
 Host *
     KexAlgorithms -sntrup761x25519-sha512@openssh.com

home-config/tridactyl/tridactyl.json

@@ -0,0 +1,7 @@
+{
+    "name": "tridactyl",
+    "description": "Tridactyl native command handler",
+    "path": "/home/ryan/.local/share/tridactyl/native_main",
+    "type": "stdio",
+    "allowed_extensions": [ "tridactyl.vim@cmcaine.co.uk","tridactyl.vim.betas@cmcaine.co.uk", "tridactyl.vim.betas.nonewtab@cmcaine.co.uk" ]
+}

home-config/waybar/config

@@ -110,8 +110,8 @@
         "format": "{percent}% {icon}",
         "format-alt-click": "click-right",
         "format-icons": ["", ""],
-        "on-scroll-down": "light -A 1",
-        "on-scroll-up": "light -U 1"
+        "on-scroll-up": "light -A 1",
+        "on-scroll-down": "light -U 1"
     },
     "custom/weather_OLD": {
         "format-alt": "{}",

modules/ryan-config/base-system.scm

@@ -158,8 +158,9 @@
                                                           "dconf"
                                                           "wireplumber"
                                                           "wireshark"
+                                                          "webkitgtk-with-libsoup2" ; Needed for Go wails development
                                                           "zsh"))
-                           (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new waybar-new hyprlock)
+                           (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new waybar-new)
                            %my-base-packages ))
 
     ;; Below is the list of system services.  To search for available

modules/ryan-packages/gl.scm

@@ -0,0 +1,224 @@
+(define-module (ryan-packages gl)
+               #:use-module ((guix licenses) #:prefix license:)
+               #:use-module (guix packages)
+               #:use-module (guix gexp)
+               #:use-module (guix utils)
+               #:use-module (ice-9 match)
+               #:use-module (gnu packages)
+               #:use-module (gnu packages gl))
+
+(define-public mesa-libglvnd
+  (package
+    (inherit mesa)
+    (inputs (modify-inputs (package-inputs mesa) (prepend libglvnd)))
+    (arguments
+     (list
+      #:configure-flags
+      #~(list
+         #$@(cond
+             ((or (target-aarch64?) (target-arm32?))
+              '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\
+panfrost,r300,r600,svga,swrast,tegra,v3d,vc4,virgl,zink"))
+             ((or (target-ppc64le?) (target-ppc32?) (target-riscv64?))
+              '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink"))
+             (else
+              '("-Dgallium-drivers=crocus,iris,nouveau,r300,r600,radeonsi,\
+svga,swrast,virgl,zink")))
+         ;; Enable various optional features.  TODO: opencl requires libclc,
+         ;; omx requires libomxil-bellagio
+         "-Dplatforms=x11,wayland"
+         "-Dglx=dri"               ;Thread Local Storage, improves performance
+         ;; "-Dopencl=true"
+         ;; "-Domx=true"
+         "-Dosmesa=true"
+         "-Dgallium-xa=enabled"
+
+         ;; features required by wayland
+         "-Dgles2=enabled"
+         "-Dgbm=enabled"
+         "-Dshared-glapi=enabled"
+         "-Dglvnd=true"
+
+         ;; Explicitly enable Vulkan on some architectures.
+         #$@(cond
+             ((or (target-x86-32?) (target-x86-64?))
+              '("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast"))
+             ((or (target-ppc64le?) (target-ppc32?))
+              '("-Dvulkan-drivers=amd,swrast"))
+             ((target-aarch64?)
+              '("-Dvulkan-drivers=freedreno,amd,broadcom,swrast"))
+             ((target-riscv64?)
+              '("-Dvulkan-drivers=amd,swrast"))
+             (else
+              '("-Dvulkan-drivers=auto")))
+
+         ;; Enable the Vulkan overlay layer on all architectures.
+         "-Dvulkan-layers=device-select,overlay"
+
+         ;; Enable all the codecs that were built by default as part of the
+         ;; 21.3.x releases to avoid functionality regressions.
+         "-Dvideo-codecs=all"
+
+         ;; Enable ZSTD compression for shader cache.
+         "-Dzstd=enabled"
+
+         ;; Also enable the tests.
+         "-Dbuild-tests=true"
+
+         "-Dllvm=enabled")              ; default is x86/x86_64 only
+
+       ;; XXX: 'debugoptimized' causes LTO link failures on some drivers.  The
+       ;; documentation recommends using 'release' for performance anyway.
+       #:build-type "release"
+
+       #:modules '((ice-9 match)
+                   (srfi srfi-1)
+                   (guix build utils)
+                   (guix build meson-build-system))
+       #:phases
+       #~(modify-phases %standard-phases
+         #$@(if (%current-target-system)
+              #~((add-after 'unpack 'fix-cross-compiling
+                   (lambda* (#:key native-inputs #:allow-other-keys)
+                     ;; When cross compiling, we use cmake to find llvm, not
+                     ;; llvm-config, because llvm-config cannot be executed
+                     ;; see https://github.com/llvm/llvm-project/issues/58984
+                     (substitute* "meson.build"
+                       (("method : host_machine\\.system.*")
+                        "method : 'cmake',\n"))
+                     (setenv "CMAKE"
+                             (search-input-file
+                              native-inputs "/bin/cmake")))))
+              #~())
+         (add-after 'unpack 'disable-failing-test
+           (lambda _
+             ;; Disable the intel vulkan (anv_state_pool) tests, as they may
+             ;; fail in a nondeterministic fashion (see:
+             ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/5446).
+             (substitute* "src/intel/vulkan/meson.build"
+               (("if with_tests")
+                "if false"))
+             #$@(match (%current-system)
+                 ("riscv64-linux"
+                  ;; According to the test logs the llvm JIT is not designed
+                  ;; for this architecture and the llvmpipe tests all segfault.
+                  ;; The same is true for mesa:gallium / osmesa-render.
+                  `((substitute* '("src/gallium/drivers/llvmpipe/meson.build"
+                                   "src/gallium/targets/osmesa/meson.build")
+                      (("if with_tests") "if false"))))
+                 ("powerpc64le-linux"
+                  ;; Disable some of the llvmpipe tests.
+                  `((substitute* "src/gallium/drivers/llvmpipe/lp_test_arit.c"
+                      (("0\\.5, ") ""))))
+                 ("powerpc-linux"
+                  ;; There are some tests which fail specifically on powerpc.
+                  `((substitute* '(;; LLVM ERROR: Relocation type not implemented yet!
+                                   "src/gallium/drivers/llvmpipe/meson.build"
+                                   "src/gallium/targets/osmesa/meson.build")
+                      (("if with_tests") "if not with_tests"))
+                    ;; This is probably a big-endian test failure.
+                    (substitute* "src/amd/common/meson.build"
+                      (("and not with_platform_windows")
+                       "and with_platform_windows"))))
+                 ("i686-linux"
+                  ;; This test is known to fail on i686 (see:
+                  ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091).
+                  `((substitute* "src/util/meson.build"
+                      ((".*'tests/u_debug_stack_test.cpp',.*") ""))))
+                 ("armhf-linux"
+                  ;; Disable some of the llvmpipe tests.
+                  `((substitute* "src/gallium/drivers/llvmpipe/meson.build"
+                      (("'lp_test_arit', ") ""))))
+                 (_
+                  '((display "No tests to disable on this architecture.\n"))))))
+         (add-before 'configure 'fix-dlopen-libnames
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((out #$output))
+               ;; Remain agnostic to .so.X.Y.Z versions while doing
+               ;; the substitutions so we're future-safe.
+               (substitute* "src/glx/meson.build"
+                 (("-DGL_LIB_NAME=\"lib@0@\\.so\\.@1@\"")
+                  (string-append "-DGL_LIB_NAME=\"" out
+                                 "/lib/lib@0@.so.@1@\"")))
+               (substitute* "src/gbm/backends/dri/gbm_dri.c"
+                 (("\"libglapi\\.so")
+                  (string-append "\"" out "/lib/libglapi.so")))
+               (substitute* "src/gbm/main/backend.c"
+                 ;; No need to patch the gbm_gallium_drm.so reference;
+                 ;; it's never installed since Mesa removed its
+                 ;; egl_gallium support.
+                 (("\"gbm_dri\\.so")
+                  (string-append "\"" out "/lib/dri/gbm_dri.so")))
+               (substitute* "src/gallium/drivers/zink/zink_screen.c"
+                 (("util_dl_open\\(VK_LIBNAME\\)")
+                  (format #f "util_dl_open(\"~a\")"
+                          (search-input-file inputs
+                                             "lib/libvulkan.so.1")))))))
+         (add-after 'install 'split-outputs
+           (lambda _
+             (let ((out #$output)
+                   (bin #$output:bin))
+               ;; Not all architectures have the Vulkan overlay control script.
+               (mkdir-p (string-append out "/bin"))
+               (call-with-output-file (string-append out "/bin/.empty")
+                 (const #t))
+               (copy-recursively (string-append out "/bin")
+                                 (string-append bin "/bin"))
+               (delete-file-recursively (string-append out "/bin")))))
+         (add-after 'install 'symlinks-instead-of-hard-links
+           (lambda _
+             ;; All the drivers and gallium targets create hard links upon
+             ;; installation (search for "hardlink each megadriver instance"
+             ;; in the makefiles).  This is no good for us since we'd produce
+             ;; nars that contain several copies of these files.  Thus, turn
+             ;; them into symlinks, which saves ~124 MiB.
+             (let* ((out    #$output)
+                    (lib    (string-append out "/lib"))
+                    (files  (find-files lib
+                                        (lambda (file stat)
+                                          (and (string-contains file ".so")
+                                               (eq? 'regular
+                                                    (stat:type stat))))))
+                    (inodes (map (compose stat:ino stat) files)))
+               (for-each (lambda (inode)
+                           (match (filter-map (match-lambda
+                                                ((file ino)
+                                                 (and (= ino inode) file)))
+                                              (zip files inodes))
+                             ((_)
+                              #f)
+                             ((reference others ..1)
+                              (format #t "creating ~a symlinks to '~a'~%"
+                                      (length others) reference)
+                              (for-each delete-file others)
+                              (for-each (lambda (file)
+                                          (if (string=? (dirname file)
+                                                        (dirname reference))
+                                              (symlink (basename reference)
+                                                       file)
+                                              (symlink reference file)))
+                                        others))))
+                         (delete-duplicates inodes)))))
+         (add-after 'install 'set-layer-path-in-manifests
+           (lambda _
+             (let* ((out #$output)
+                    (implicit-path (string-append
+                                    out
+                                    "/share/vulkan/implicit_layer.d/"))
+                    (explicit-path (string-append
+                                    out
+                                    "/share/vulkan/explicit_layer.d/"))
+                    (fix-layer-path
+                     (lambda (layer-name)
+                       (let* ((explicit (string-append explicit-path layer-name ".json"))
+                              (implicit (string-append implicit-path layer-name ".json"))
+                              (manifest (if (file-exists? explicit)
+                                            explicit
+                                            implicit)))
+                         (substitute* manifest
+                           (((string-append "\"lib" layer-name ".so\""))
+                             (string-append "\"" out "/lib/lib" layer-name ".so\"")))))))
+               (for-each fix-layer-path '("VkLayer_MESA_device_select"
+                                          "VkLayer_MESA_overlay"))))))))))
+
+mesa-libglvnd

modules/ryan-packages/hyprland.bak

@@ -0,0 +1,495 @@
+(define-module (ryan-packages hyprland)
+  #: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 download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpp)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages wm)
+  #:use-module (gnu packages gl)
+  #:use-module (ryan-packages gl)
+  #:use-module (guix utils))
+
+; hyprland deps
+(define-public libseat-0.8.0
+  (package
+    (inherit libseat)
+    (name "libseat")
+    (version "0.8.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.sr.ht/~kennylevinsen/seatd")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "02wzrgp8di6hqmicnm2fim6jnvbn62wy248ikvdvrhiywrb7i931"))))))
+
+(define-public libinput-minimal-1.26.1
+  (package
+    (inherit libinput-minimal)
+    (name "libinput-minimal")
+    (version "1.26.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.freedesktop.org/libinput/libinput.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "094k23i10jjmgdzhv5lj7xpc3fgkwi9afcihf0l2fjj71ym8l9fy"))))
+    (native-inputs
+     (modify-inputs (package-native-inputs libinput)
+       (append python-minimal-wrapper python-pytest)))))
+
+(define-public cmake-minimal-3.27.0
+  (package
+    (inherit cmake-minimal)
+    (name "cmake-minimal")
+    (version "3.27.0")
+    (source (origin
+              (inherit (package-source cmake-minimal))
+              (method url-fetch)
+              (uri (string-append "https://cmake.org/files/v"
+                                  (version-major+minor version)
+                                  "/cmake-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1f1w9mb868q38nzy145b6q9mc5waf8yi521cwfkd14xr51mxpvda"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments cmake-minimal)
+       ((#:configure-flags flags ''())
+        #~(append (list "-DCMake_ENABLE_DEBUGGER=false") #$flags))
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (delete 'delete-help-documentation)
+            (delete 'check)))))))
+
+; hypr suite
+
+(define hyprutils
+  (package
+    (name "hyprutils")
+    (version "0.2.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/hyprwm/hyprutils")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+                (base32
+                  "0nxx5yb5k9726x95n8gi27xyxyzwb0ma0nj3czpb51sda1k0hz0g"))))
+    (build-system cmake-build-system)
+    ;(arguments (list #:tests? #f))
+    (native-inputs (list pkg-config gcc-13))
+    (inputs (list pixman))
+    (home-page "https://hyprland.org/")
+    (synopsis "Small C++ library for utilities used across the Hypr* ecosystem")
+    (description "C++ library for utilities in the Hypr ecosystem")
+    (license license:bsd-3)))
+
+(define-public libliftoff
+  (package
+    (name "libliftoff")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/emersion/libliftoff"
+                                  "/archive/refs/tags/v" version ".tar.gz"))
+              (sha256
+               (base32
+                "17ssbjbv8njgvfha8zsx4nixpi5xxl1rwvk0lcacgqk0nmjyb23s"))))
+    (build-system meson-build-system)
+    (native-inputs (list gcc-13
+                         pkg-config
+                         cmake-minimal
+                         libdrm))
+    (home-page "https://github.com/emersion/libliftoff")
+    (synopsis "Lightweight KMS plane library")
+    (description "")
+    (license license:expat)))
+
+(define udis86
+  (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 hyprlang
+  (package
+    (name "hyprlang")
+    (version "0.5.2")
+    (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
+                "17i0372yv0fcwnyki36crz7afw8c5f3j985m083p7rjbh4fn3br6"))))
+    (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 hyprcursor
+  (package
+    (name "hyprcursor")
+    (version "0.1.9")
+    (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
+                "0z3ar580n630145nq80qw0p8v0kai6knvhi6nr9z0y1jrb07b0ql"))))
+    (build-system cmake-build-system)
+    (arguments (list #:tests? #f))      ;FIXME
+    (inputs (list cairo hyprlang librsvg libzip tomlplusplus))
+    (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 hyprwayland-scanner
+  (package
+    (name "hyprwayland-scanner")
+    (version "0.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hyprwm/hyprwayland-scanner")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1xc2xcxpq61lg964ihk0wbfzqqvibw20iz09g0p33ym51gwlpxr4"))))
+    (build-system cmake-build-system)
+    (arguments (list #:tests? #f))      ;No tests.
+    (inputs (list pugixml))
+    (native-inputs (list gcc-13 pkg-config))
+    (home-page "https://github.com/hyprwm/hyprwayland-scanner")
+    (synopsis "Hyprland implementation of wayland-scanner, in and for C++")
+    (description
+     "This package provides a Hyprland implementation of wayland-scanner, in and
+for C++.")
+    (license license:bsd-3)))
+
+(define hwdata-for-hyprland
+  (package
+    (inherit hwdata)
+    (arguments
+     (substitute-keyword-arguments (package-arguments hwdata)
+       ((#:phases _) #~%standard-phases)))
+    (outputs '("out"))))
+
+(define-public wayland-protocols-1.36
+  (package
+    (inherit wayland-protocols)
+    (name "wayland-protocols")
+    (version "1.36")
+    (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
+                "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi"))))))
+
+
+(define-public aquamarine
+  (package
+    (name "aquamarine")
+    (version "0.3.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hyprwm/aquamarine")
+                    (commit (string-append "v" version))))
+  				    (patches (list
+                (local-file "patches/aquamarine-fix-cmake.patch")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "114fspibmrwvzdmzv4xdy000vg7mn9r5vas3pr1ndb9xyl15ja1s"))))
+    (build-system cmake-build-system)
+    (arguments
+      (list #:tests? #f))
+    (native-inputs
+      (list gcc-13
+            pkg-config
+            mesa-headers
+            hyprwayland-scanner
+            hwdata-for-hyprland))
+    (propagated-inputs
+      (list mesa-libglvnd
+            libglvnd
+            libseat-0.8.0
+            libinput-minimal-1.26.1
+            libxkbcommon
+            libdisplay-info
+            libxcb
+            libxinerama
+            libxcursor
+            xcb-util
+            xcb-util-errors
+            xcb-util-keysyms
+            xcb-util-wm
+            wayland
+            wayland-protocols-1.36))
+    (inputs
+      (list hyprutils pixman))
+    (home-page "https://hyprland.org")
+    (synopsis "Aquamarine is a very light linux rendering backend library ")
+    (description "") ;; TODO: this
+    (license license:bsd-3)))
+
+
+(define xorg-server-xwayland-for-hyprland
+  (package
+    (inherit xorg-server-xwayland)
+    (arguments
+      (substitute-keyword-arguments (package-arguments xorg-server-xwayland)
+        ((#:phases phases)
+         #~(modify-phases #$phases
+            (add-after 'install 'install-headers
+                (lambda _
+                    (let ((fmw (string-append #$output "/include")))
+                        (mkdir-p fmw)
+                        (copy-recursively "include" fmw))
+                ))
+        ))))))
+
+
+(define-public hyprland-ryan
+  (package
+    (name "hyprland")
+    (version "0.42.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/hyprwm/Hyprland")
+               (commit (string-append "v" version))))
+  			(patches (list
+          (local-file "patches/hyprland-fix-cmake.patch")))
+        (modules '((guix build utils)))
+        (snippet
+          '(begin
+            (for-each delete-file-recursively
+              '("hyprpm"
+                "subprojects"))))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32 "1hp2xafvlymikxsi6pr8iik35g46683bg376n9hkjxgh9y6njzqv"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:tests? #f
+           #:build-type "release"
+           #:cmake cmake-minimal-3.27.0
+           #: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)))
+                  (substitute* "CMakeLists.txt"
+                    (("libudis86") "udis86"))
+                  ))
+              (add-after 'fix-path 'fix-protocols
+                (lambda* (#:key inputs outputs #:allow-other-keys)
+                  (let ((protocols (string-append
+                                     (getcwd)
+                                     "/subprojects/hyprland-protocols/protocols")))
+                    (mkdir-p protocols)
+                    (copy-recursively
+                      (search-input-directory inputs "share/hyprland-protocols/protocols")
+                      protocols))))
+              (add-after 'install 'wrap-program
+                (lambda* (#:key inputs outputs #:allow-other-keys)
+                  (let ((out (assoc-ref outputs "out"))
+                        (mesa (assoc-ref inputs "mesa")))
+                    (wrap-program (string-append out "/bin/Hyprland")
+                      `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d")))))))
+              )))
+    (native-inputs
+      (list gcc-13
+            jq
+            pkg-config
+            hyprwayland-scanner
+            hwdata-for-hyprland))
+    (inputs
+     (list gcc-13
+
+           cairo
+           pango
+           pciutils
+           libliftoff
+           udis86
+
+           aquamarine
+           hyprcursor
+           hyprland-protocols
+           hyprlang
+           hyprutils
+
+           xorg-server-xwayland-for-hyprland))
+    (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 hyprpaper
+  (package
+    (name "hyprpaper")
+    (version "0.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/hyprwm/hyprpaper"
+                                  "/archive/refs/tags/v" version ".tar.gz"))
+              (sha256
+               (base32
+                "1d23nsj5hzyxwvhkg9a7x1b8jgyqwzad91zb1894jnxr2d844h28"))))
+    (build-system cmake-build-system)
+    (arguments
+      `(#:tests? #f))
+      (native-inputs
+        (list gcc-13
+              pkg-config))
+      (inputs
+        (list hyprlang
+              wayland-protocols-1.36
+              wayland
+              cairo
+              libjpeg-turbo
+              libwebp
+              mesa
+              pango
+              libglvnd))
+      (home-page "https://github.com/hyprwm/hyprpaper")
+      (license license:bsd-3)
+      (synopsis "Hyprpaper is a blazing fast wayland wallpaper utility with IPC controls.")
+      (description "Hyprpaper is a blazing fast wayland wallpaper utility with IPC controls.")))
+
+
+(define-public hypridle
+  (package
+    (name "hypridle")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/hyprwm/hypridle"
+                                  "/archive/refs/tags/v" version ".tar.gz"))
+              (sha256
+               (base32
+                "0ybwip7yq9q569naz5bnrvcdz99648c4pln2zi30z21y333hpas0"))))
+    (build-system cmake-build-system)
+    (arguments
+      `(#:tests? #f))
+      (native-inputs
+        (list gcc-13
+              pkg-config))
+      (inputs
+        (list hyprlang
+              wayland-protocols-1.36
+              wayland
+              sdbus-c++))
+      (home-page "https://github.com/hyprwm/hypridle")
+      (license license:bsd-3)
+      (synopsis "Hyprland's idle daemon ")
+      (description "Hyprland's idle daemon ")))

modules/ryan-packages/patches/aquamarine-fix-cmake.patch

@@ -0,0 +1,25 @@
+From 7b6f11ed0708d8775f42107e19d9099835e2498e Mon Sep 17 00:00:00 2001
+From: Freya Murphy <freya@freyacat.org>
+Date: Mon, 5 Aug 2024 17:52:48 -0400
+Subject: [PATCH] fix cmake
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb7a4d6..7f7e7ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@ set(INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+ set(LIBDIR ${CMAKE_INSTALL_FULL_LIBDIR})
+
+ find_package(PkgConfig REQUIRED)
+-find_package(OpenGL REQUIRED COMPONENTS "GLES2")
++find_package(OpenGL REQUIRED)
+ find_package(hyprwayland-scanner 0.4.0 REQUIRED)
+ pkg_check_modules(
+   deps
+--
+2.45.1
+

modules/ryan-packages/patches/hyprland-fix-cmake.patch

@@ -0,0 +1,41 @@
+From 33fac66982422104cc1c2664f9a841fc96295c13 Mon Sep 17 00:00:00 2001
+From: Freya Murphy <freya@freyacat.org>
+Date: Mon, 5 Aug 2024 20:35:50 -0400
+Subject: [PATCH] fix cmake
+
+---
+ CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa58b63d..51ea6cfa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,6 @@ execute_process(COMMAND ./scripts/generateVersion.sh
+                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+ 
+ # udis
+-add_subdirectory("subprojects/udis86")
+ 
+ if(CMAKE_BUILD_TYPE)
+   string(TOLOWER ${CMAKE_BUILD_TYPE} BUILDTYPE_LOWER)
+@@ -85,7 +84,7 @@ if(LEGACY_RENDERER)
+ else()
+   set(GLES_VERSION "GLES3")
+ endif()
+-find_package(OpenGL REQUIRED COMPONENTS ${GLES_VERSION})
++find_package(OpenGL REQUIRED)
+ 
+ pkg_check_modules(
+   deps
+@@ -314,7 +313,6 @@ protocolwayland()
+ 
+ # tools
+ add_subdirectory(hyprctl)
+-add_subdirectory(hyprpm)
+ 
+ # binary and symlink
+ install(TARGETS Hyprland)
+-- 
+2.45.1
+

modules/ryan-packages/wm.scm

@@ -16,6 +16,7 @@
                #:use-module (gnu packages xorg)
                #:use-module (gnu packages linux)
                #:use-module (gnu packages gl)
+               #:use-module (gnu packages image)
                #:use-module (gnu packages llvm)
                #:use-module (gnu packages gcc)
                #:use-module (gnu packages check)
@@ -23,6 +24,7 @@
                #:use-module (guix utils)
                #:use-module (rosenthal packages wm)
                #:use-module (ryan-packages gtk)
+               #:use-module (ryan-packages gl)
                #:use-module (gnu packages wm))
 
 (define-public swaylock-effects-new
@@ -94,11 +96,11 @@
     (outputs '("out"))))
 
 (define-public hyprlock
-  (let ((commit "d9a6229434fba475ea42b634ee2f03919236798d")
+  (let ((commit "dba9d8b5175a6f23463035aafc6b0c741f9b73a5")
         (revision "1"))
     (package
       (name "hyprlock")
-      (version (git-version "0.3.0" revision commit))
+      (version (git-version "0.4.1" revision commit))
       (source
         (origin
           (method git-fetch)
@@ -107,10 +109,19 @@
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
-            (base32 "19cg8vj4sgz5pxib9m08af1lilay9bckjhlr6h333s014l7y09sw"))))
+            (base32 "1zzv7w7hn8k71w75a9mz548cbl4f8zcsd8i92abgnrx5x9i35q63"))))
       (build-system cmake-build-system)
       (arguments
-        `(#:tests? #f))
+        (list
+          #:tests? #f
+          #:phases
+          #~(modify-phases %standard-phases
+              (add-after 'install 'wrap-program
+                (lambda* (#:key inputs outputs #:allow-other-keys)
+                  (let ((out (assoc-ref outputs "out"))
+                        (mesa (assoc-ref inputs "mesa")))
+                    (wrap-program (string-append out "/bin/hyprlock")
+                      `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d"))))))))))
       (native-inputs
         (list gcc-13
               pkg-config
@@ -121,7 +132,7 @@
               pango
               libxkbcommon
               hyprlang
-              mesa
+              mesa-libglvnd
               libdrm
               libglvnd
               wayland-protocols
@@ -131,4 +142,3 @@
       (synopsis "Screen locker for Hyprland")
       (description "Screen locker for hyprland."))))
 
-hyprlock