From bd00284332b8718c21c70d95d54519ac3fde118e Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Mon, 15 Sep 2025 23:30:28 +0200
Subject: [PATCH] uxe nixpkgs lib to replace importDir

---
 flake.nix        | 24 ++++++++++++------------
 hooks/pre-commit |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4d7ec50..679ff61 100644
--- a/flake.nix
+++ b/flake.nix
@@ -132,17 +132,14 @@
             pkgs = nixpkgs.legacyPackages.${system};
           }
         );
+      importModuleDir =
+        directory:
+        nixpkgs.lib.packagesFromDirectoryRecursive {
+          inherit directory;
+          callPackage = path: _args: path;
+        };
     in
     {
-      lib = {
-        importDir =
-          dir:
-          (lib.attrsets.mapAttrs' (
-            m: _:
-            lib.attrsets.nameValuePair (lib.strings.removeSuffix ".nix" m) { imports = [ "${dir}/${m}" ]; }
-          ) (builtins.readDir dir));
-      };
-
       overlays = {
         unstable-packages = final: prev: {
           unstable = import nixpkgs-unstable {
@@ -151,7 +148,7 @@
         };
       };
 
-      nixosModules = (self.lib.importDir ./nixosModules) // {
+      nixosModules = (importModuleDir ./nixosModules) // {
         niri = {
           imports = [ niri.nixosModules.niri ];
           nixpkgs.overlays = [ niri.overlays.niri ];
@@ -168,8 +165,11 @@
         };
       };
 
-      homeModules = self.lib.importDir ./homeModules;
-      homeConfigurations = self.lib.importDir ./homeConfigurations;
+      homeModules = importModuleDir ./homeModules;
+      homeConfigurations = {
+        vinzenz = ./homeConfigurations/vinzenz;
+        ronja = ./homeConfigurations/ronja;
+      };
 
       formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
 
diff --git a/hooks/pre-commit b/hooks/pre-commit
index 6b6b870..1760cfe 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -3,4 +3,4 @@ set -euxo pipefail
 
 nix fmt
 
-nix flake check --all-systems --show-trace
+nix flake check --show-trace