diff --git a/home/wayland/programs/hyprlock.nix b/home/wayland/programs/hyprlock.nix
index 40de5e1..06eb05c 100644
--- a/home/wayland/programs/hyprlock.nix
+++ b/home/wayland/programs/hyprlock.nix
@@ -1,103 +1,104 @@
-_: {
+{inputs, ...}: {
+  imports = [inputs.hyprlock.homeManagerModules.default];
+  disabledModules = ["${inputs.home-manager}/modules/programs/hyprlock.nix"];
+
   programs.hyprlock = {
     enable = true;
-    settings = {
-      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;
-      };
-      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;
-        }
-      ];
+    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;
     };
+    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 fd2d6c7..94074ff 100644
--- a/home/wayland/services/hypridle.nix
+++ b/home/wayland/services/hypridle.nix
@@ -1,25 +1,27 @@
 {
+  inputs,
   pkgs,
   lib,
   config,
   ...
 }: {
+  imports = [inputs.hypridle.homeManagerModules.default];
+  disabledModules = ["${inputs.home-manager}/modules/services/hypridle.nix"];
+
   services.hypridle = {
     enable = true;
-    settings = {
-      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";
-        }
-      ];
-    };
+    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";
+      }
+    ];
   };
 }
diff --git a/home/wayland/services/hyprpaper.nix b/home/wayland/services/hyprpaper.nix
index e997e39..0556bdf 100644
--- a/home/wayland/services/hyprpaper.nix
+++ b/home/wayland/services/hyprpaper.nix
@@ -1,19 +1,25 @@
-_: {
+{
+  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 = [
-        "~/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"
-      ];
-    };
+    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"
+    ];
   };
 }