diff --git a/home/modules/default.nix b/home/modules/default.nix
index 72420a6..8146a86 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -2,13 +2,14 @@
   config,
   lib,
   pkgs,
+  myUtils,
   ...
 }:
 
 {
   imports =
     let
-      dirs = lib.attrNames (lib.filterAttrs (_: v: v == "directory") (builtins.readDir ./.));
+      dirs = myUtils.dirNames ./.;
       hasDef = name: builtins.pathExists ./${name}/default.nix;
     in
     map (name: ./${name}) (builtins.filter hasDef dirs);
diff --git a/home/modules/desktop/niri/default.nix b/home/modules/desktop/niri/default.nix
index 9ca4110..faf83f7 100644
--- a/home/modules/desktop/niri/default.nix
+++ b/home/modules/desktop/niri/default.nix
@@ -6,15 +6,6 @@
 }:
 
 {
-  imports = [
-    ../../clipboard
-    ../../fuzzel
-    ../../mako
-    ../../shikane
-    ../../swayidle
-    ../../waybar
-  ];
-
   options.desktop.niri.enable = lib.mkEnableOption "niri desktop";
 
   config = lib.mkIf config.desktop.niri.enable {
diff --git a/home/modules/shell/default.nix b/home/modules/shell/default.nix
index 7987224..0957921 100644
--- a/home/modules/shell/default.nix
+++ b/home/modules/shell/default.nix
@@ -9,7 +9,6 @@
     ./bash.nix
     ./utils.nix
     ./prompt.nix
-    ../tmux
   ];
 
   options.shell.enable = lib.mkEnableOption "shell";