From bf8ccc69c6acab2b0b1ba72fcdc01e0495a97a6a Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Mon, 6 Nov 2023 20:00:12 -0500
Subject: [PATCH] updated hyprland, new wallpaper app, color picker, etc

---
 channels.scm                          | 2 +-
 home-config/home-configuration.scm    | 1 +
 home-config/hypr/autostart.sh         | 8 +++++++-
 home-config/hypr/hyprland.conf        | 4 ++++
 home-config/hypr/kanshi.conf          | 4 ++++
 home-config/hypr/wallpaper.sh         | 6 ++++++
 home-config/nix-home-manager/home.nix | 3 +++
 modules/ryan-packages/freedesktop.scm | 4 ++--
 8 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 home-config/hypr/kanshi.conf
 create mode 100755 home-config/hypr/wallpaper.sh

diff --git a/channels.scm b/channels.scm
index e91cfa7..a3f2b8c 100644
--- a/channels.scm
+++ b/channels.scm
@@ -25,7 +25,7 @@
         (url "https://codeberg.org/hako/rosenthal.git")
         (branch "trunk")
         (commit
-          "6b1a540e247ad31c9b06488119f986966ee37015")
+          "417dd04e821084a7137872d3bf16f10379017a18")
         (introduction
           (make-channel-introduction
             "7677db76330121a901604dfbad19077893865f35"
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index 89a4511..9dd47a2 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -98,6 +98,7 @@
                                                     "git"
                                                     "password-store"
                                                     "node"
+                                                    "kanshi"
                                                     "git-lfs"))
                     (list my-neovim wl-mirror firefox-wayland-new)))
 
diff --git a/home-config/hypr/autostart.sh b/home-config/hypr/autostart.sh
index c53aeee..b05b71d 100755
--- a/home-config/hypr/autostart.sh
+++ b/home-config/hypr/autostart.sh
@@ -6,8 +6,14 @@ waybar &
 
 mako &
 
-swaybg -i ~/.config/hypr/Wallpapers/above-clouds.jpg &
+#swaybg -i ~/.config/hypr/Wallpapers/above-clouds.jpg &
+
+swww init &
 
 swayidle -w timeout 300 'swaylock --screenshots --clock --indicator --grace 3 --fade-in 1 --effect-blur 7x5 --effect-greyscale' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -c 000000' &
 
 syncthing serve --no-browser &
+
+wl-clip-persist -c regular &
+
+kanshi -c ~/.config/hypr/kanshi.conf
diff --git a/home-config/hypr/hyprland.conf b/home-config/hypr/hyprland.conf
index 7367d6c..a3545b8 100644
--- a/home-config/hypr/hyprland.conf
+++ b/home-config/hypr/hyprland.conf
@@ -197,6 +197,9 @@ bind = $mainMod SHIFT, Print, exec, grimblast edit area
 bind = $mainMod, N, exec, makoctl dismiss
 bind = $mainMod SHIFT, N, exec, makoctl dismiss -a
 
+# Color picker
+bind = $mainMod SHIFT, C, exec, hyprpicker -a
+
 # Window Rules
 
 # Firefox PiP
@@ -222,4 +225,5 @@ exec-once = ~/.config/hypr/autostart.sh
 
 misc {
     disable_hyprland_logo = true
+    force_default_wallpaper = 0
 }
diff --git a/home-config/hypr/kanshi.conf b/home-config/hypr/kanshi.conf
new file mode 100644
index 0000000..6a2cbfe
--- /dev/null
+++ b/home-config/hypr/kanshi.conf
@@ -0,0 +1,4 @@
+profile {
+    output * enable
+    exec ~/.config/hypr/wallpaper.sh
+}
diff --git a/home-config/hypr/wallpaper.sh b/home-config/hypr/wallpaper.sh
new file mode 100755
index 0000000..7d9ea21
--- /dev/null
+++ b/home-config/hypr/wallpaper.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Eventually allow for multiple animated backgrounds to be rotated.
+# Right now just reset the current image for when outputs are changed
+
+swww img ~/.config/hypr/Wallpapers/above-clouds.jpg
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index c535157..c6aed16 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -34,6 +34,9 @@
     gcc
     pkg-config
     wttrbar
+    swww
+    hyprpicker
+    wl-clip-persist
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
diff --git a/modules/ryan-packages/freedesktop.scm b/modules/ryan-packages/freedesktop.scm
index b8be19b..1dd5d0d 100644
--- a/modules/ryan-packages/freedesktop.scm
+++ b/modules/ryan-packages/freedesktop.scm
@@ -44,7 +44,7 @@
 (define-public xdg-desktop-portal-hyprland-ryan
   (package
     (name "xdg-desktop-portal-hyprland")
-    (version "1.2.2")
+    (version "1.2.4")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -53,7 +53,7 @@
               (file-name (git-file-name name version))
               (sha256
                 (base32
-                  "1s458wg9zl76nj2ya8iw5qfjsrpawp78ldilkwyqi4cn2kzjhqsh"))))
+                  "1m82rrir2fg7h2cpch6wm3h1rkpnbh9pawlw1wdknw75mi6139r0"))))
     (build-system meson-build-system)
     (arguments
       (list