nifty import functions

.gitignore

@@ -1 +1,2 @@
-./direnv
+.direnv/
+*result*

flake.nix

@@ -47,18 +47,23 @@
     ...
   }: let
     lib = unstable.lib;
+
+    importAll = path:
+      lib.forEach (
+        builtins.filter (file: lib.hasSuffix ".nix" file)
+        (lib.filesystem.listFilesRecursive path)
+      )
+      (module: (import module inputs));
+
     mkSystems = system: names:
       lib.genAttrs names (
         name:
           lib.nixosSystem {
             inherit system;
-            specialArgs = {
+            specialArgs = {inherit self;};
-              inherit self;
+            modules =
-            };
+              importAll ./modules
-            modules = [
+              ++ importAll "${self}/systems/${name}";
-              (import ./modules inputs)
-              (import "${self}/systems/${name}" inputs)
-            ];
           }
       );
   in
@@ -94,11 +99,20 @@
               inherit system;
               format = "install-iso";
               modules = [
-                (import ./pkgs/nixos-iso inputs)
+                (import ./installer inputs)
               ];
             };
           }
-          // (import ./pkgs pkgs);
+          // builtins.listToAttrs (
+            lib.forEach (
+              builtins.filter (file: lib.hasSuffix ".nix" file)
+              (lib.filesystem.listFilesRecursive ./pkgs)
+            )
+            (module: {
+              name = lib.removeSuffix ".nix" (builtins.baseNameOf module);
+              value = pkgs.callPackage module {};
+            })
+          );
       }
     );
 }

modules/DE/default.nix

@@ -1,7 +0,0 @@
-inputs: {
-  imports = [
-    (import ./dwm.nix inputs)
-    (import ./gnome.nix inputs)
-    (import ./xfce.nix inputs)
-  ];
-}

modules/DM/default.nix

@@ -1,7 +0,0 @@
-inputs: {
-  imports = [
-    (import ./autoLogin.nix inputs)
-    (import ./lightDM.nix inputs)
-    (import ./misc.nix inputs)
-  ];
-}

modules/boot/default.nix

@@ -1,7 +0,0 @@
-inputs: {
-  imports = [
-    (import ./stage2patch.nix inputs)
-    (import ./silent.nix inputs)
-    (import ./misc.nix inputs)
-  ];
-}

modules/default.nix

@@ -1,18 +0,0 @@
-inputs: {
-  imports = [
-    (import ./DE inputs)
-    (import ./DM inputs)
-    (import ./boot inputs)
-
-    (import ./git.nix inputs)
-    (import ./hardware.nix inputs)
-    (import ./misc.nix inputs)
-    (import ./nix.nix inputs)
-    (import ./packages.nix inputs)
-    (import ./shell.nix inputs)
-    (import ./sops.nix inputs)
-    (import ./theming.nix inputs)
-    (import ./unfree.nix inputs)
-    (import ./X11.nix inputs)
-  ];
-}

pkgs/default.nix

@@ -1,5 +0,0 @@
-pkgs: {
-  t-rex-miner = pkgs.callPackage ./t-rex-miner {};
-  afk-cmds = pkgs.callPackage ./afk-cmds {};
-  parrot = pkgs.callPackage ./parrot {};
-}

pkgs/t-rex/t-rex.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   stdenv,
   fetchzip,
   glibc,

systems/game-laptop/default.nix

@@ -1,13 +1,8 @@
-inputs: {
+_: {
   pkgs,
   config,
   ...
 }: {
-  imports = [
-    (import ./prime.nix inputs)
-    (import ./disko.nix inputs)
-  ];
-
   localModules = {
     DE.gnome.enable = true;
     DM = {

systems/gerg-desktop/containers/default.nix

@@ -1,6 +0,0 @@
-inputs: {
-  imports = [
-    (import ./minecraft.nix inputs)
-    #   (import ./website.nix inputs)
-  ];
-}

systems/gerg-desktop/containers/minecraft.nix

@@ -1,4 +1,4 @@
-_: {...}: {
+_: {
   containers."minecraft" = {
     ephemeral = true;
     autoStart = true;

systems/gerg-desktop/default.nix

@@ -3,16 +3,6 @@ inputs: {
   config,
   ...
 }: {
-  imports = [
-    (import ./vfio.nix inputs)
-    (import ./parrot.nix inputs)
-    (import ./spicetify.nix inputs)
-    (import ./zfs.nix inputs)
-    (import ./containers inputs)
-    (import ./erase-your-darlings.nix inputs)
-    (import ./disko.nix inputs)
-  ];
-
   localModules = {
     X11Programs = {
       sxhkd.enable = true;

systems/moms-laptop/default.nix

@@ -1,13 +1,8 @@
-inputs: {
+_: {
   pkgs,
   config,
   ...
 }: {
-  imports = [
-    (import ./printing.nix inputs)
-    (import ./disko.nix inputs)
-  ];
-
   localModules = {
     DM = {
       lightdm.enable = true;