Improve getImports function and add to hs

rhoriguchi · Nov 4, 2023 · 2315f98 · 2315f98
1 parent 73f8937
commit 2315f98
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/configuration/devices/headless/server/home-assistant/default.nix b/configuration/devices/headless/server/home-assistant/default.nix
@@ -1,18 +1,9 @@
-{ pkgs, config, secrets, ... }: {
-  imports = [
-    ./adguard.nix
-    ./deluge.nix
-    ./generate-wifi-guest-qr.nix
-    ./lovelace.nix
-    ./mystrom.nix
-    ./netatmo.nix
-    ./postgres.nix
-    ./proxy.nix
-    ./systemmonitor.nix
-    ./unifi.nix
-    ./weather.nix
-    ./yeelight.nix
-  ];
+{ pkgs, lib, config, secrets, ... }:
+let
+  getFiles = dir: lib.attrNames (builtins.readDir dir);
+  getImports = dir: map (file: dir + "/${file}") (lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (getFiles dir));
+in {
+  imports = getImports ./.;
 
   services.home-assistant = {
     enable = true;

diff --git a/modules/default/default.nix b/modules/default/default.nix
@@ -1,5 +1,5 @@
 { lib, ... }:
 let
   getFiles = dir: lib.attrNames (builtins.readDir dir);
-  getImports = dir: map (file: dir + "/${file}") (lib.filter (file: file != "default.nix") (getFiles dir));
+  getImports = dir: map (file: dir + "/${file}") (lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (getFiles dir));
 in { imports = getImports ./.; }
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 let
   getFiles = dir: lib.attrNames (builtins.readDir dir);
-  getImports = dir: map (file: dir + "/${file}") (lib.filter (file: file != "default.nix") (getFiles dir));
+  getImports = dir: map (file: dir + "/${file}") (lib.filter (file: lib.hasSuffix ".nix" file && file != "default.nix") (getFiles dir));
 in {
   imports = getImports ./.;