Change lib.moduleImports -> lib.imports, and make it more generic

KubqoA · Mar 1, 2025 · 1d068fb · 1d068fb
1 parent 9b67040
commit 1d068fb
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 44 deletions.
diff --git a/homes/jakub-macos/default.nix b/homes/jakub-macos/default.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: {
-  imports = lib.moduleImports [
+  imports = lib.imports [
     "common/aliases"
     "common/env"
     "common/ghostty"

diff --git a/homes/jakub-nixos/default.nix b/homes/jakub-nixos/default.nix
@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: {
-  imports = lib.moduleImports [
+  imports = lib.imports [
     "common/aliases"
     "common/env"
     "common/git"

diff --git a/homes/jakub-server/default.nix b/homes/jakub-server/default.nix
@@ -1,5 +1,5 @@
 {lib, ...}: {
-  imports = lib.moduleImports [
+  imports = lib.imports [
     "common/aliases"
     "common/env"
     "common/git"

diff --git a/hosts/harmonium/default.nix b/hosts/harmonium/default.nix
@@ -5,16 +5,13 @@
   pkgs,
   ...
 }: {
-  imports =
-    [
-      inputs.lanzaboote.nixosModules.lanzaboote
-      inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen2
-      ./hardware-configuration.nix
-    ]
-    ++ lib.moduleImports [
-      "common/nix"
-      "common/packages"
-    ];
+  imports = lib.imports [
+    inputs.lanzaboote.nixosModules.lanzaboote
+    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen2
+    ./hardware-configuration.nix
+    "common/nix"
+    "common/packages"
+  ];
 
   hardware.enableAllFirmware = true;
 

diff --git a/hosts/nyckelharpa/default.nix b/hosts/nyckelharpa/default.nix
@@ -4,16 +4,13 @@
   system,
   ...
 }: {
-  imports =
-    [
-      ./homebrew.nix
-      ./system.nix
-    ]
-    ++ lib.moduleImports [
-      "common/nix"
-      "common/packages"
-      "darwin/icons"
-    ];
+  imports = lib.imports [
+    ./homebrew.nix
+    ./system.nix
+    "common/nix"
+    "common/packages"
+    "darwin/icons"
+  ];
 
   desktop.icons = {
     "/Applications/Beekeeper Studio.app" = ./icons/beekeeper-studio.icns;

diff --git a/hosts/organ/default.nix b/hosts/organ/default.nix
@@ -4,25 +4,22 @@
   modulesPath,
   ...
 }: {
-  imports =
-    [
-      (modulesPath + "/profiles/qemu-guest.nix")
-      ./disko.nix
-      # ./git.nix
-      ./mail.nix
-      ./networking.nix
-      ./nginx.nix
-      ./ssh.nix
-      ./syncthing.nix
-      ./users.nix
-    ]
-    ++ lib.moduleImports [
-      "common/nix"
-      "common/packages"
-      "server/dns"
-      "server/seafile"
-      "server/tailscale"
-    ];
+  imports = lib.imports [
+    (modulesPath + "/profiles/qemu-guest.nix")
+    ./disko.nix
+    # ./git.nix
+    ./mail.nix
+    ./networking.nix
+    ./nginx.nix
+    ./ssh.nix
+    ./syncthing.nix
+    ./users.nix
+    "common/nix"
+    "common/packages"
+    "server/dns"
+    "server/seafile"
+    "server/tailscale"
+  ];
 
   age.secrets = lib.defineSecrets {
     organ-tailscale-auth-key = {};

diff --git a/lib.nix b/lib.nix
@@ -7,9 +7,11 @@ inputs: lib: _:
     map (file: optionsDir + "/${file}") (builtins.attrNames nixFiles);
 
   # Helper to easily import modules in home/system configs
-  moduleImports = let
+  imports = let
     modulePath = path:
-      if builtins.pathExists ./modules/${path}
+      if builtins.isPath path
+      then path
+      else if builtins.pathExists ./modules/${path}
       then ./modules/${path}
       else ./modules/${path}.nix;
   in