From 4c224791514de329fa031435b741ef5f721e16c9 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Fri, 3 Nov 2023 23:05:46 -0400
Subject: [PATCH] feat: switch hyprpaper to swww because hyprpaper stopped
 working

---
 devices/wim/config/hypr/main.conf |  5 ++++-
 devices/wim/home/hyprland.nix     | 10 +++-------
 modules/greetd/default.nix        |  9 ++-------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/devices/wim/config/hypr/main.conf b/devices/wim/config/hypr/main.conf
index 3739121..64e6921 100644
--- a/devices/wim/config/hypr/main.conf
+++ b/devices/wim/config/hypr/main.conf
@@ -7,6 +7,10 @@ plugin {
   }
 }
 
+xwayland {
+	force_zero_scaling = true
+}
+
 # See https://wiki.hyprland.org/Configuring/Monitors/                    x   y
 monitor=desc:Acer Technologies Acer K212HQL T3EAA0014201, 1920x1080@60,  840x1000,     1, transform, 3
 monitor=desc:BOE 0x0964,                                  1920x1200@60,  0x2920,    1
@@ -31,7 +35,6 @@ exec-once = squeekboard
 
 exec-once = bash -c "sleep 3; ags -t applauncher"
 layerrule = blur, overview
-exec-once = hyprpaper
 
 exec-once = wl-paste --watch cliphist store
 
diff --git a/devices/wim/home/hyprland.nix b/devices/wim/home/hyprland.nix
index 2e19513..2e84e90 100644
--- a/devices/wim/home/hyprland.nix
+++ b/devices/wim/home/hyprland.nix
@@ -40,6 +40,7 @@ in {
       exec-once = [
         "${polkit}/libexec/polkit-kde-authentication-agent-1"
         "${osConfig.programs.kdeconnect.package}/libexec/kdeconnectd"
+        "swww init --no-cache && swww img -t none ${pkgs.dracula-theme}/wallpapers/waves.png"
       ];
 
       source = [ "~/.config/hypr/main.conf" ];
@@ -47,12 +48,7 @@ in {
   };
 
   xdg.configFile = {
-    "hypr/main.conf".source    = symlink "${configDir}/hypr/main.conf";
-
-    "hypr/hyprpaper.conf".text = ''
-      preload = ${pkgs.dracula-theme}/wallpapers/waves.png
-      wallpaper = eDP-1, ${pkgs.dracula-theme}/wallpapers/waves.png
-    '';
+    "hypr/main.conf".source = symlink "${configDir}/hypr/main.conf";
   };
 
   home.packages = with pkgs; [
@@ -73,7 +69,7 @@ in {
 
 
     # Hyprland
-    hyprpaper
+    swww
     swayidle
     lisgd
     swayosd
diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
index 80fa878..64b9022 100644
--- a/modules/greetd/default.nix
+++ b/modules/greetd/default.nix
@@ -10,13 +10,8 @@
 
   css = pkgs.writeText "style.css" ''${builtins.readFile ./style.css}'';
 
-  paperConf = pkgs.writeText "hyprpaper.conf" ''
-    preload = ${pkgs.dracula-theme}/wallpapers/waves.png
-    wallpaper = eDP-1, ${pkgs.dracula-theme}/wallpapers/waves.png
-  '';
-
   hyprConf = pkgs.writeText "greetd-hypr-config" ''
-    exec-once = hyprpaper --config ${paperConf}
+    exec-once = swww init --no-cache && swww img -t none ${pkgs.dracula-theme}/wallpapers/waves.png
 
     ${builtins.readFile ./hyprland.conf}
 
@@ -32,7 +27,7 @@ in {
     packages = with pkgs; [
       dracula-theme
       flat-remix-icon-theme
-      hyprpaper
+      swww
       gtk3
       glib
       squeekboard