From b8f9f86509e4117b33ba0552f57a7180917e4ffc Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Sat, 23 Nov 2024 20:45:46 -0600
Subject: [PATCH] feat: server test

---
 nixos/default.nix                  | 82 ++++++++++--------------------
 nixos/modules/services/default.nix |  8 ++-
 2 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/nixos/default.nix b/nixos/default.nix
index 24375aa..b0d14c8 100755
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,60 +1,34 @@
 let
   modulesPath = ./modules;
-
+  moduleImport = path: nameTransform:
+    builtins.listToAttrs (
+      map
+      (name: {
+        name = nameTransform name;
+        value = import (path + "/${name}");
+      })
+      (
+        builtins.filter
+        (name: (builtins.readDir path).${name} == "regular" && builtins.match ".*\\.nix$" name != null)
+        (builtins.attrNames (builtins.readDir path))
+      )
+    );
   modules =
-    builtins.foldl' (
-      emptySet: importedModules:
-        emptySet // importedModules
-    ) {} (map
-      (name: {
-        "${name}" = import (modulesPath + "/${name}");
-      })
-      [
-        "services"
-      ])
-    // builtins.foldl' (
-      emptySet: importedModules:
-        emptySet // importedModules
-    ) {} (map
-      (name: {
-        "${name}" = import (modulesPath + "/${name}.nix");
-      })
-      [
-        "accounts"
-        "android"
-        "audio"
-        "bluetooth"
-        "corectrl"
-        "dconf"
-        "disks"
-        "doas"
-        "environment"
-        "firejail"
-        "flatpak"
-        "fonts"
-        "gnome"
-        "greetd"
-        "gvfs"
-        "home-manager"
-        "locale"
-        "network"
-        "nix"
-        "nur"
-        "ollama"
-        "plasma"
-        "printing"
-        "regreet"
-        "rsyncd"
-        "sddm"
-        "sops"
-        "ssh"
-        "steam"
-        "syncthing"
-        "sysstat"
-        "system"
-        "virtualization"
-        "xserver"
-      ]);
+    moduleImport modulesPath (name: builtins.replaceStrings [".nix"] [""] name)
+    // (path:
+      builtins.listToAttrs (
+        map
+        (name: {
+          name = name;
+          value = import (path + "/${name}");
+        })
+        (
+          builtins.filter
+          (name: (builtins.readDir path).${name} == "directory")
+          (builtins.attrNames (builtins.readDir path))
+        )
+      ))
+    modulesPath;
 in {
   flake.nixosModules = {
     personal = {
diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix
index 96fbf9f..e84f83b 100644
--- a/nixos/modules/services/default.nix
+++ b/nixos/modules/services/default.nix
@@ -1,14 +1,12 @@
 {
-  imports = let
-    configPath = ./config;
-  in
+  imports =
     (map
-      (folder: (configPath + ./${folder}))
+      (folder: ./${folder})
       [
         "mastodon"
       ])
     ++ (map
-      (file: (configPath + ./${file}.nix))
+      (file: ./${file}.nix)
       [
         "acme"
         "caddy"