From e2301c7682621b66b9487ad6b212fe86a6309a29 Mon Sep 17 00:00:00 2001 From: hektor Date: Sat, 11 Jul 2026 23:19:12 +0200 Subject: [PATCH] refactor(home/modules): use module discovery --- home/modules/default.nix | 3 ++- home/modules/desktop/niri/default.nix | 9 --------- home/modules/shell/default.nix | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) 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";