diff --git a/flake/modules.nix b/flake/modules.nix
index 05c18b9..f826f4a 100644
--- a/flake/modules.nix
+++ b/flake/modules.nix
@@ -1,6 +1,6 @@
-{ self, ... }:
+{ self, lib, ... }:
 let
-  modulesOf = dir: map (name: "${dir}/${name}") (builtins.attrNames (builtins.readDir dir));
+  modulesOf = dir: builtins.filter (lib.hasSuffix ".nix") (lib.filesystem.listFilesRecursive dir);
 in
 {
   flake = {
diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix
index b30d216..acbcfd6 100644
--- a/modules/home/hyprland/default.nix
+++ b/modules/home/hyprland/default.nix
@@ -6,8 +6,6 @@
   ...
 }@moduleArgs:
 {
-  imports = [ ./keybinds.nix ];
-
   options.myConfig.de.hyprland.enable = lib.mkEnableOption "" // {
     default = moduleArgs.osConfig.myConfig.de.hyprland.enable or false;
   };
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index ec8e271..1140dbc 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -5,11 +5,6 @@
   ...
 }:
 {
-  imports = [
-    ./p10k
-    ./aliases.nix
-  ];
-
   options.myConfig.shell.zsh.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.myConfig.shell.zsh.enable {