From 1d4a7cfd631faef4cf4e904435dd0a79d629917c Mon Sep 17 00:00:00 2001
From: notohh <github@notohh.dev>
Date: Sun, 26 May 2024 16:48:37 -0400
Subject: [PATCH] wayland: rewrite hypr* configs again

using upstream hm modules
---
 home/wayland/default.nix            |   7 +-
 home/wayland/programs/hyprlock.nix  | 191 ++++++++++++++--------------
 home/wayland/services/hypridle.nix  |  34 ++---
 home/wayland/services/hyprpaper.nix |  34 +++--
 4 files changed, 125 insertions(+), 141 deletions(-)

diff --git a/home/wayland/default.nix b/home/wayland/default.nix
index 0dec355..379e553 100644
--- a/home/wayland/default.nix
+++ b/home/wayland/default.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [./services/greetd.nix];
   environment = {
     systemPackages = with pkgs; [
@@ -38,7 +34,6 @@
     enable = true;
     extraPortals = with pkgs; [
       xdg-desktop-portal-gtk
-      inputs.xdg-portal-hyprland.packages.${pkgs.system}.default
     ];
     config = {
       common.default = "*";
diff --git a/home/wayland/programs/hyprlock.nix b/home/wayland/programs/hyprlock.nix
index 06eb05c..c82bafd 100644
--- a/home/wayland/programs/hyprlock.nix
+++ b/home/wayland/programs/hyprlock.nix
@@ -1,104 +1,97 @@
-{inputs, ...}: {
-  imports = [inputs.hyprlock.homeManagerModules.default];
-  disabledModules = ["${inputs.home-manager}/modules/programs/hyprlock.nix"];
-
+_: {
   programs.hyprlock = {
     enable = true;
-    backgrounds = let
-      verticalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle.png";
-      horizontalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle2.png";
-    in [
-      {
-        monitor = "HDMI-A-1";
-        path = verticalWallpaper;
-        blur_passes = 3;
-        blur_size = 4;
-        brightness = 0.5;
-      }
-      {
-        monitor = "DP-3";
-        path = verticalWallpaper;
-        blur_passes = 3;
-        blur_size = 4;
-        brightness = 0.5;
-      }
-      {
-        monitor = "DP-1";
-        path = horizontalWallpaper;
-        blur_passes = 3;
-        blur_size = 4;
-        brightness = 0.5;
-      }
-      {
-        monitor = "DP-2";
-        path = horizontalWallpaper;
-        blur_passes = 3;
-        blur_size = 4;
-        brightness = 0.5;
-      }
-    ];
-    general = {
-      grace = 5;
-      disable_loading_bar = false;
-      hide_cursor = false;
-      no_fade_in = false;
+    settings = {
+      background = let
+        verticalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle.png";
+        horizontalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle2.png";
+      in [
+        {
+          monitor = "HDMI-A-1";
+          path = verticalWallpaper;
+          blur_passes = 3;
+          blur_size = 4;
+          brightness = 0.5;
+        }
+        {
+          monitor = "DP-3";
+          path = verticalWallpaper;
+          blur_passes = 3;
+          blur_size = 4;
+          brightness = 0.5;
+        }
+        {
+          monitor = "DP-1";
+          path = horizontalWallpaper;
+          blur_passes = 3;
+          blur_size = 4;
+          brightness = 0.5;
+        }
+        {
+          monitor = "DP-2";
+          path = horizontalWallpaper;
+          blur_passes = 3;
+          blur_size = 4;
+          brightness = 0.5;
+        }
+      ];
+      general = {
+        grace = 5;
+        disable_loading_bar = false;
+        hide_cursor = false;
+        no_fade_in = false;
+      };
+      input-field = [
+        {
+          monitor = "DP-2";
+          size = "350, 50";
+          outline_thickness = 2;
+          outer_color = "rgb(f7768e)";
+          inner_color = "rgb(1a1b26)";
+          font_color = "rgb(c0caf5)";
+          fail_color = "rgb(f7768e)";
+          fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
+          check_color = "rgb(ff9e64)";
+          swap_font_color = false;
+          placeholder_text = ''
+            <i><span foreground="##c0caf5">Password...</span></i>
+          '';
+          fade_on_empty = false;
+          dots_spacing = 0.5;
+          dots_center = true;
+          shadow_passes = 3;
+          shadow_size = 1;
+          shadow_color = "rgba(00000099)";
+          shadow_boost = 1.0;
+        }
+      ];
+      label = [
+        {
+          monitor = "DP-2";
+          text = ''
+            Hi, <i><span foreground="##f7768e">$USER</span></i>
+          '';
+          color = "rgb(c0caf5)";
+          valign = "center";
+          halign = "center";
+          shadow_passes = 3;
+          shadow_size = 1;
+          shadow_color = "rgba(00000099)";
+          shadow_boost = 1.0;
+        }
+        {
+          monitor = "DP-2";
+          text = "$TIME";
+          color = "rgb(c0caf5)";
+          position = "0, 120";
+          valign = "center";
+          halign = "center";
+          shadow_passes = 3;
+          shadow_size = 1;
+          shadow_color = "rgba(00000099)";
+          shadow_boost = 0.6;
+        }
+      ];
     };
-    input-fields = [
-      {
-        monitor = "DP-2";
-        size = {
-          width = 350;
-          height = 50;
-        };
-        outline_thickness = 2;
-        outer_color = "rgb(f7768e)";
-        inner_color = "rgb(1a1b26)";
-        font_color = "rgb(c0caf5)";
-        fail_color = "rgb(f7768e)";
-        fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
-        check_color = "rgb(ff9e64)";
-        swap_font_color = false;
-        placeholder_text = ''
-          <i><span foreground="##c0caf5">Password...</span></i>
-        '';
-        fade_on_empty = false;
-        dots_spacing = 0.5;
-        dots_center = true;
-        shadow_passes = 3;
-        shadow_size = 1;
-        shadow_color = "rgba(00000099)";
-        shadow_boost = 1.0;
-      }
-    ];
-    labels = [
-      {
-        monitor = "DP-2";
-        text = ''
-          Hi, <i><span foreground="##f7768e">$USER</span></i>
-        '';
-        color = "rgb(c0caf5)";
-        valign = "center";
-        halign = "center";
-        shadow_passes = 3;
-        shadow_size = 1;
-        shadow_color = "rgba(00000099)";
-        shadow_boost = 1.0;
-      }
-      {
-        monitor = "DP-2";
-        text = "$TIME";
-        color = "rgb(c0caf5)";
-        position = {
-          x = 0;
-          y = 120;
-        };
-        valign = "center";
-        halign = "center";
-        shadow_passes = 3;
-        shadow_size = 1;
-        shadow_color = "rgba(00000099)";
-        shadow_boost = 0.6;
-      }
-    ];
   };
 }
diff --git a/home/wayland/services/hypridle.nix b/home/wayland/services/hypridle.nix
index 94074ff..95fc048 100644
--- a/home/wayland/services/hypridle.nix
+++ b/home/wayland/services/hypridle.nix
@@ -1,27 +1,27 @@
 {
-  inputs,
   pkgs,
   lib,
   config,
   ...
 }: {
-  imports = [inputs.hypridle.homeManagerModules.default];
-  disabledModules = ["${inputs.home-manager}/modules/services/hypridle.nix"];
-
   services.hypridle = {
     enable = true;
-    ignoreDbusInhibit = false;
-    lockCmd = lib.getExe config.programs.hyprlock.package;
-    beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session";
-    listeners = [
-      {
-        timeout = 400;
-        onTimeout = "${lib.getExe config.programs.hyprlock.package}";
-      }
-      {
-        timeout = 460;
-        onTimeout = "${pkgs.systemd}/bin/systemctl suspend";
-      }
-    ];
+    settings = {
+      general = {
+        ignore_dbus_inhibit = false;
+        lock_cmd = lib.getExe config.programs.hyprlock.package;
+        before_sleep_cmd = "${pkgs.systemd}/bin/loginctl lock-session";
+      };
+      listener = [
+        {
+          timeout = 400;
+          on-timeout = "${lib.getExe config.programs.hyprlock.package}";
+        }
+        {
+          timeout = 460;
+          on-timeout = "${pkgs.systemd}/bin/systemctl suspend";
+        }
+      ];
+    };
   };
 }
diff --git a/home/wayland/services/hyprpaper.nix b/home/wayland/services/hyprpaper.nix
index 0556bdf..415eef9 100644
--- a/home/wayland/services/hyprpaper.nix
+++ b/home/wayland/services/hyprpaper.nix
@@ -1,25 +1,21 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = [pkgs.hyprpaper];
-  imports = [inputs.hyprpaper.homeManagerModules.default];
-  disabledModules = ["${inputs.home-manager}/modules/services/hyprpaper.nix"];
 
   services.hyprpaper = {
     enable = true;
-    ipc = true;
-    splash = false;
-    preloads = [
-      "~/Pictures/wallpapers/sparkle3.png"
-      "~/Pictures/wallpapers/sparkle4.png"
-    ];
-    wallpapers = [
-      "HDMI-A-1,~/Pictures/wallpapers/sparkle3.png"
-      "DP-1,~/Pictures/wallpapers/sparkle4.png"
-      "DP-2,~/Pictures/wallpapers/sparkle4.png"
-      "DP-3,~/Pictures/wallpapers/sparkle3.png"
-    ];
+    settings = {
+      ipc = true;
+      splash = false;
+      preload = [
+        "~/Pictures/wallpapers/sparkle3.png"
+        "~/Pictures/wallpapers/sparkle4.png"
+      ];
+      wallpaper = [
+        "HDMI-A-1,~/Pictures/wallpapers/sparkle3.png"
+        "DP-1,~/Pictures/wallpapers/sparkle4.png"
+        "DP-2,~/Pictures/wallpapers/sparkle4.png"
+        "DP-3,~/Pictures/wallpapers/sparkle3.png"
+      ];
+    };
   };
 }