diff --git a/modules/features/hypr/default.nix b/modules/features/hyprland/default.nix
similarity index 68%
rename from modules/features/hypr/default.nix
rename to modules/features/hyprland/default.nix
index 7fad0dc..c106cd0 100644
--- a/modules/features/hypr/default.nix
+++ b/modules/features/hyprland/default.nix
@@ -27,7 +27,6 @@
     ];
   });
   perSystem = {
-    pkgs,
     self',
     system,
     inputs',
@@ -48,28 +47,6 @@
             way-edges = self'.packages.way-edges;
           };
       };
-      wpaperd = let
-        config-file = builtins.toFile "config.toml" ''
-          [any]
-          path = "${./wallpapers}"
-
-          [HDMI-A-1]
-          path = "${./wallpapers/topo1.png}"
-
-          [DP-1]
-          path = "${./wallpapers/topo2.png}"
-
-          [DP-2]
-          path = "${./wallpapers/topo3.png}"
-        '';
-      in
-        inputs.wrappers.lib.wrapPackage ({...}: {
-          inherit pkgs;
-          package = pkgs.wpaperd;
-          flags = {
-            "--config" = config-file;
-          };
-        });
     };
   };
 }
diff --git a/modules/features/wpaperd/default.nix b/modules/features/wpaperd/default.nix
new file mode 100644
index 0000000..03f6fc9
--- /dev/null
+++ b/modules/features/wpaperd/default.nix
@@ -0,0 +1,35 @@
+{
+  moduleWithSystem,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.wpaperd = moduleWithSystem ({self', ...}: {
+    environment.systemPackages = with self'.packages; [
+      wpaperd
+    ];
+  });
+  perSystem = {pkgs, ...}: {
+    packages.wpaperd = let
+      config-file = builtins.toFile "config.toml" ''
+        [any]
+        path = "${./wallpapers}"
+
+        [HDMI-A-1]
+        path = "${./wallpapers/topo1.png}"
+
+        [DP-1]
+        path = "${./wallpapers/topo2.png}"
+
+        [DP-2]
+        path = "${./wallpapers/topo3.png}"
+      '';
+    in
+      inputs.wrappers.lib.wrapPackage ({...}: {
+        inherit pkgs;
+        package = pkgs.wpaperd;
+        flags = {
+          "--config" = config-file;
+        };
+      });
+  };
+}
diff --git a/modules/features/hypr/wallpapers/aesthetic.jpg b/modules/features/wpaperd/wallpapers/aesthetic.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/aesthetic.jpg
rename to modules/features/wpaperd/wallpapers/aesthetic.jpg
diff --git a/modules/features/hypr/wallpapers/bars.jpg b/modules/features/wpaperd/wallpapers/bars.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/bars.jpg
rename to modules/features/wpaperd/wallpapers/bars.jpg
diff --git a/modules/features/hypr/wallpapers/black-hole.png b/modules/features/wpaperd/wallpapers/black-hole.png
similarity index 100%
rename from modules/features/hypr/wallpapers/black-hole.png
rename to modules/features/wpaperd/wallpapers/black-hole.png
diff --git a/modules/features/hypr/wallpapers/city-horizon.jpg b/modules/features/wpaperd/wallpapers/city-horizon.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/city-horizon.jpg
rename to modules/features/wpaperd/wallpapers/city-horizon.jpg
diff --git a/modules/features/hypr/wallpapers/dragon.jpg b/modules/features/wpaperd/wallpapers/dragon.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/dragon.jpg
rename to modules/features/wpaperd/wallpapers/dragon.jpg
diff --git a/modules/features/hypr/wallpapers/flower-field.jpg b/modules/features/wpaperd/wallpapers/flower-field.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/flower-field.jpg
rename to modules/features/wpaperd/wallpapers/flower-field.jpg
diff --git a/modules/features/hypr/wallpapers/ocean.png b/modules/features/wpaperd/wallpapers/ocean.png
similarity index 100%
rename from modules/features/hypr/wallpapers/ocean.png
rename to modules/features/wpaperd/wallpapers/ocean.png
diff --git a/modules/features/hypr/wallpapers/pink-clouds.jpg b/modules/features/wpaperd/wallpapers/pink-clouds.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/pink-clouds.jpg
rename to modules/features/wpaperd/wallpapers/pink-clouds.jpg
diff --git a/modules/features/hypr/wallpapers/sakura-trees-over-river.jpg b/modules/features/wpaperd/wallpapers/sakura-trees-over-river.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/sakura-trees-over-river.jpg
rename to modules/features/wpaperd/wallpapers/sakura-trees-over-river.jpg
diff --git a/modules/features/hypr/wallpapers/sousou-no-frieren-flowers.png b/modules/features/wpaperd/wallpapers/sousou-no-frieren-flowers.png
similarity index 100%
rename from modules/features/hypr/wallpapers/sousou-no-frieren-flowers.png
rename to modules/features/wpaperd/wallpapers/sousou-no-frieren-flowers.png
diff --git a/modules/features/hypr/wallpapers/sunset.jpg b/modules/features/wpaperd/wallpapers/sunset.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/sunset.jpg
rename to modules/features/wpaperd/wallpapers/sunset.jpg
diff --git a/modules/features/hypr/wallpapers/topo1.png b/modules/features/wpaperd/wallpapers/topo1.png
similarity index 100%
rename from modules/features/hypr/wallpapers/topo1.png
rename to modules/features/wpaperd/wallpapers/topo1.png
diff --git a/modules/features/hypr/wallpapers/topo2.png b/modules/features/wpaperd/wallpapers/topo2.png
similarity index 100%
rename from modules/features/hypr/wallpapers/topo2.png
rename to modules/features/wpaperd/wallpapers/topo2.png
diff --git a/modules/features/hypr/wallpapers/topo3.png b/modules/features/wpaperd/wallpapers/topo3.png
similarity index 100%
rename from modules/features/hypr/wallpapers/topo3.png
rename to modules/features/wpaperd/wallpapers/topo3.png
diff --git a/modules/features/hypr/wallpapers/tree.jpg b/modules/features/wpaperd/wallpapers/tree.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/tree.jpg
rename to modules/features/wpaperd/wallpapers/tree.jpg
diff --git a/modules/features/hypr/wallpapers/unused/wide_lines.png.unused b/modules/features/wpaperd/wallpapers/unused/wide_lines.png.unused
similarity index 100%
rename from modules/features/hypr/wallpapers/unused/wide_lines.png.unused
rename to modules/features/wpaperd/wallpapers/unused/wide_lines.png.unused
diff --git a/modules/features/hypr/wallpapers/unused/wide_lines2.png.unused b/modules/features/wpaperd/wallpapers/unused/wide_lines2.png.unused
similarity index 100%
rename from modules/features/hypr/wallpapers/unused/wide_lines2.png.unused
rename to modules/features/wpaperd/wallpapers/unused/wide_lines2.png.unused
diff --git a/modules/features/hypr/wallpapers/voyager-8.jpg b/modules/features/wpaperd/wallpapers/voyager-8.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/voyager-8.jpg
rename to modules/features/wpaperd/wallpapers/voyager-8.jpg
diff --git a/modules/features/hypr/wallpapers/wallpaper-sun.jpg b/modules/features/wpaperd/wallpapers/wallpaper-sun.jpg
similarity index 100%
rename from modules/features/hypr/wallpapers/wallpaper-sun.jpg
rename to modules/features/wpaperd/wallpapers/wallpaper-sun.jpg
diff --git a/modules/features/hypr/wallpapers/waves.png b/modules/features/wpaperd/wallpapers/waves.png
similarity index 100%
rename from modules/features/hypr/wallpapers/waves.png
rename to modules/features/wpaperd/wallpapers/waves.png
diff --git a/modules/system/desktop/default.nix b/modules/system/desktop/default.nix
index 3d45b9c..29f56ca 100644
--- a/modules/system/desktop/default.nix
+++ b/modules/system/desktop/default.nix
@@ -13,6 +13,7 @@
       hyprland
       sddm
       network
+      omnisearch
     ];
   in {
     imports = modules;