diff --git a/home-config/hypr/kanshi.conf b/home-config/hypr/kanshi.conf
index db7d45a..92eed88 100644
--- a/home-config/hypr/kanshi.conf
+++ b/home-config/hypr/kanshi.conf
@@ -2,7 +2,20 @@ profile {
output "AU Optronics 0x103D Unknown" enable
}
-profile {
+profile tylerdesk {
output "AU Optronics 0x103D Unknown" disable
output "Dell Inc. DELL U3421WE 6WK8753" enable
}
+
+profile emilydesk {
+ output "AU Optronics 0x103D Unknown" disable
+ output "Dell Inc. DELL U2422H JN4SF83" position 0,0 mode 1920x1080
+ output "Dell Inc. DELL U2414H R9F1P5C59WDL" position 1920,0 mode 1920x1080
+ output "Dell Inc. DELL U2422H 5S9SF83" position 3840,0 mode 1920x1080
+}
+
+profile justindesk {
+ output "AU Optronics 0x103D Unknown" position 0,0 mode 1920x1080
+ output "Dell Inc. DELL U2417H XVNNT7CDC80L" position 1920,0 mode 1920x1080
+ output "Dell Inc. DELL U2417H XVNNT82M978L" position 3840,0 mode 1920x1080
+}
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 11329e7..6ecae35 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -112,7 +112,7 @@
;; under their own account: use 'guix search KEYWORD' to search
;; for packages and 'guix install PACKAGE' to install a package.
(packages (append (map specification->package (list "sway"
- "hyprland"
+ ;"hyprland"
"swaybg"
"swayidle"
;"swaylock-effects"
@@ -150,7 +150,7 @@
"wireplumber"
"wireshark"
"zsh"))
- (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan waybar-new virt-manager-ovmf bluez-ryan blueman-ryan)
+ (list my-ca-certs swaylock-effects-new waybar-new xdg-desktop-portal-hyprland-ryan hyprland-temp virt-manager-ovmf bluez-ryan blueman-ryan)
%my-base-packages ))
;; Below is the list of system services. To search for available
diff --git a/modules/ryan-packages/wm.scm b/modules/ryan-packages/wm.scm
index 8f3be42..73973fd 100644
--- a/modules/ryan-packages/wm.scm
+++ b/modules/ryan-packages/wm.scm
@@ -16,6 +16,7 @@
#:use-module (gnu packages check)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (rosenthal packages wm)
#:use-module (ryan-packages gtk)
#:use-module (gnu packages wm))
@@ -52,3 +53,38 @@
#:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true")))
(inputs (modify-inputs (package-inputs waybar) (delete "gtkmm") (prepend gtkmm-ryan))))) ;(prepend python cava catch2 gtkmm)))))
;(native-inputs (modify-inputs (package-native-inputs waybar) (prepend gcc-13)))))
+
+(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))))))
+
+hyprland-temp