feat: server test

nixos/default.nix

@@ -1,5 +1,7 @@
 let
   modulesPath = ./modules;
+  servicePath = modulesPath + "/services";
+
   moduleImport = path: nameTransform:
     builtins.listToAttrs (
       map
@@ -13,25 +15,10 @@ let
         (builtins.attrNames (builtins.readDir path))
       )
     );
+
   modules =
     moduleImport modulesPath (name: builtins.replaceStrings [".nix"] [""] name)
-    // (
-      let
-        path = modulesPath;
-      in
-        builtins.listToAttrs (
-          map
-          (name: {
-            name = name;
-            value = import (path + "/${name}");
-          })
-          (
-            builtins.filter
-            (name: (builtins.readDir path).${name} == "directory")
-            (builtins.attrNames (builtins.readDir path))
-          )
-        )
-    );
+    // moduleImport servicePath (name: builtins.replaceStrings [".nix"] [""] name);
 in {
   flake.nixosModules = {
     personal = {
@@ -72,7 +59,19 @@ in {
       imports = builtins.attrValues {
         inherit
           (modules)
-          services
+          acme
+          caddy
+          jellyfin
+          logrotate
+          mastodon
+          minecraft
+          nextcloud
+          ollama
+          owncast
+          peertube
+          postgresql
+          samba
+          vaultwarden
           ;
       };
     };

nixos/modules/services/default.nix

@@ -1,27 +0,0 @@
-{
-  imports = let
-    configPath = ./config;
-  in
-    (map
-      (folder: (configPath + ./${folder}))
-      [
-        "mastodon"
-      ])
-    ++ (map
-      (file: (configPath + ./${file}.nix))
-      [
-        "acme"
-        "caddy"
-        "jellyfin"
-        "logrotate"
-        "minecraft"
-        "ollama"
-        "peertube"
-        "postgresql"
-        "owncast"
-        "samba"
-        "vaultwarden"
-        # "forgejo"
-        # "nextcloud"
-      ]);
-}