From 014c90517b38e855b89ec1e557cb7e08f239c93f Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Thu, 29 Feb 2024 15:55:10 -0500 Subject: [PATCH] updated channels, added kanshi, fixed xdph, fixed firefox to not rebuild --- channels.scm | 6 +++--- home-config/home-configuration.scm | 2 ++ home-config/hypr/autostart.sh | 2 ++ home-config/hypr/hyprland.conf | 6 +++--- home-config/hypr/kanshi.conf | 8 ++++++++ modules/ryan-packages/freedesktop.scm | 25 ++----------------------- modules/ryan-packages/mozilla.scm | 2 +- 7 files changed, 21 insertions(+), 30 deletions(-) create mode 100644 home-config/hypr/kanshi.conf diff --git a/channels.scm b/channels.scm index 003443e..604ea31 100644 --- a/channels.scm +++ b/channels.scm @@ -3,7 +3,7 @@ (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") (commit - "cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d") + "9ca2161ef43c43b2f52c4b8fc51d6bc882b04b76") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" @@ -14,7 +14,7 @@ (url "https://gitlab.com/nonguix/nonguix") (branch "master") (commit - "e4fe4809f88d91eda5a7dc29e44ee649ded7e830") + "b6d05dbefd2664aa6706d13ec4f46526a814369f") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" @@ -25,7 +25,7 @@ (url "https://codeberg.org/hako/rosenthal.git") (branch "trunk") (commit - "d29af1023320c35d3d00162f4794cc01d29c8c0c") + "0e31205d7392c450bf33de24d7f0cc38aa82d4d5") (introduction (make-channel-introduction "7677db76330121a901604dfbad19077893865f35" diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index 7e22c4d..f6d8240 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -54,6 +54,8 @@ "pv" "bombadillo" "python-msgpack" + "wdisplays" + "kanshi" "libreoffice" "flatpak" "gnupg" diff --git a/home-config/hypr/autostart.sh b/home-config/hypr/autostart.sh index dfa5f53..5d7363d 100755 --- a/home-config/hypr/autostart.sh +++ b/home-config/hypr/autostart.sh @@ -19,3 +19,5 @@ syncthing serve --no-browser & wl-clip-persist -c regular & ~/.config/guix/home-config/hypr/hyprland-monitor-attached ~/.config/hypr/wallpaper.sh ~/.config/hypr/wallpaper.sh & + +kanshi -c ~/.config/hypr/kanshi.conf diff --git a/home-config/hypr/hyprland.conf b/home-config/hypr/hyprland.conf index 0998980..b8da5be 100644 --- a/home-config/hypr/hyprland.conf +++ b/home-config/hypr/hyprland.conf @@ -100,7 +100,8 @@ gestures { # Example per-device config # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more -device:epic-mouse-v1 { +device { + name = epic-mouse-v1 sensitivity = -0.5 } @@ -216,8 +217,7 @@ windowrulev2 = size 578 326, class:^(firefox)$, title:^(Picture-in-Picture)$ windowrulev2 = float, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$ windowrulev2 = size 56 31, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$ windowrulev2 = move 50% 0, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$ -windowrulev2 = nomaximizerequest, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$ -windowrulev2 = nofullscreenrequest, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$ +windowrulev2 = suppressevent fullscreen maximize, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$ # Weather windowrulev2 = float,class:^(ala-wttr)$ diff --git a/home-config/hypr/kanshi.conf b/home-config/hypr/kanshi.conf new file mode 100644 index 0000000..db7d45a --- /dev/null +++ b/home-config/hypr/kanshi.conf @@ -0,0 +1,8 @@ +profile { + output "AU Optronics 0x103D Unknown" enable +} + +profile { + output "AU Optronics 0x103D Unknown" disable + output "Dell Inc. DELL U3421WE 6WK8753" enable +} diff --git a/modules/ryan-packages/freedesktop.scm b/modules/ryan-packages/freedesktop.scm index add4a6d..56b5633 100644 --- a/modules/ryan-packages/freedesktop.scm +++ b/modules/ryan-packages/freedesktop.scm @@ -59,6 +59,7 @@ (list #:tests? #f #:configure-flags #~(list "-Dsystemd=disabled") + #:qtbase qtbase #:phases ;; After building the portal, we need to build the share selector using qt #~(modify-phases %standard-phases @@ -71,7 +72,7 @@ (("\\<(hyprctl-share-picker)\\>" _ cmd) (string-append #$output "/bin/" cmd)))))))) (native-inputs (list gcc-13 pkg-config wayland hyprlang)) - (inputs (list bash-minimal grim hyprland hyprland-protocols mesa pipewire qtbase sdbus-c++ slurp wayland-protocols qtwayland)) + (inputs (list bash-minimal grim hyprland hyprland-protocols mesa pipewire sdbus-c++ slurp wayland-protocols qtwayland)) (home-page "") (synopsis "test") (description "test") @@ -140,28 +141,6 @@ (description "test") (license license:bsd-3))) -(define-public hyprlang - (package - (name "hyprlang") - (version "0.3.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 - "1sxr7whzjamjg9pcvpbxniwph5p3yy2qs87n91zqwb5y9z3gfd7m")))) - (build-system cmake-build-system) - (native-inputs - (list gcc-13)) - (home-page "") - (synopsis "test") - (description "test") - (license license:gpl3))) - - (define-public wl-mirror (package (name "wl-mirror") diff --git a/modules/ryan-packages/mozilla.scm b/modules/ryan-packages/mozilla.scm index 8959b07..0a16014 100644 --- a/modules/ryan-packages/mozilla.scm +++ b/modules/ryan-packages/mozilla.scm @@ -26,7 +26,7 @@ (inputs `(("bash" ,bash-minimal) ("pipewire" ,pipewire) - ("firefox" ,firefox*))) + ("firefox" ,firefox))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils))