wayland: rewrite hypr* configs again

using upstream hm modules

home/wayland/default.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  inputs,
-  ...
-}: {
   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 = "*";

home/wayland/programs/hyprlock.nix

@@ -1,10 +1,8 @@
-{inputs, ...}: {
+_: {
-  imports = [inputs.hyprlock.homeManagerModules.default];
-  disabledModules = ["${inputs.home-manager}/modules/programs/hyprlock.nix"];
-
   programs.hyprlock = {
     enable = true;
-    backgrounds = let
+    settings = {
+      background = let
         verticalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle.png";
         horizontalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle2.png";
       in [
@@ -43,13 +41,10 @@
         hide_cursor = false;
         no_fade_in = false;
       };
-    input-fields = [
+      input-field = [
         {
           monitor = "DP-2";
-        size = {
+          size = "350, 50";
-          width = 350;
-          height = 50;
-        };
           outline_thickness = 2;
           outer_color = "rgb(f7768e)";
           inner_color = "rgb(1a1b26)";
@@ -70,7 +65,7 @@
           shadow_boost = 1.0;
         }
       ];
-    labels = [
+      label = [
         {
           monitor = "DP-2";
           text = ''
@@ -88,10 +83,7 @@
           monitor = "DP-2";
           text = "$TIME";
           color = "rgb(c0caf5)";
-        position = {
+          position = "0, 120";
-          x = 0;
-          y = 120;
-        };
           valign = "center";
           halign = "center";
           shadow_passes = 3;
@@ -101,4 +93,5 @@
         }
       ];
     };
+  };
 }

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;
+    settings = {
-    lockCmd = lib.getExe config.programs.hyprlock.package;
+      general = {
-    beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session";
+        ignore_dbus_inhibit = false;
-    listeners = [
+        lock_cmd = lib.getExe config.programs.hyprlock.package;
+        before_sleep_cmd = "${pkgs.systemd}/bin/loginctl lock-session";
+      };
+      listener = [
         {
           timeout = 400;
-        onTimeout = "${lib.getExe config.programs.hyprlock.package}";
+          on-timeout = "${lib.getExe config.programs.hyprlock.package}";
         }
         {
           timeout = 460;
-        onTimeout = "${pkgs.systemd}/bin/systemctl suspend";
+          on-timeout = "${pkgs.systemd}/bin/systemctl suspend";
         }
       ];
     };
+  };
 }

home/wayland/services/hyprpaper.nix

@@ -1,25 +1,21 @@
-{
+{pkgs, ...}: {
-  inputs,
-  pkgs,
-  ...
-}: {
   home.packages = [pkgs.hyprpaper];
-  imports = [inputs.hyprpaper.homeManagerModules.default];
-  disabledModules = ["${inputs.home-manager}/modules/services/hyprpaper.nix"];
 
   services.hyprpaper = {
     enable = true;
+    settings = {
       ipc = true;
       splash = false;
-    preloads = [
+      preload = [
         "~/Pictures/wallpapers/sparkle3.png"
         "~/Pictures/wallpapers/sparkle4.png"
       ];
-    wallpapers = [
+      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"
       ];
     };
+  };
 }