reorganize

flake.nix

@@ -41,7 +41,7 @@
     outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
 
         profiles = let 
-            dir = builtins.readDir ./system/profiles;
+            dir = builtins.readDir ./profiles;
             filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
         in (builtins.listToAttrs 
             (builtins.map 
@@ -51,7 +51,7 @@
                     value = { ... }: {
                         imports = [
                             ./system
-                            ./system/profiles/${name}
+                            ./profiles/${name}
                         ];
                     };
                 })) filtered)

system/default.nix

@@ -1,11 +1,11 @@
 { config, lib, pkgs, nixpkgs, ... }: {
 
-    imports = [ 
+    imports = let 
-        ./services
+        dir = builtins.readDir ./.;
-        ./packages
+    in builtins.map (x: ./${x}) (builtins.filter 
-        ./programs
+        (file: (dir.${file} == "directory"))
-        ./users
+        (builtins.attrNames dir)
-    ];
+    );
 
     options.sysconfig = with lib; {
         host = mkOption {

system/services/default.nix

@@ -6,14 +6,4 @@
         (file: (dir.${file} == "directory"))
         (builtins.attrNames dir)
     );
-  /*imports = [
-    ./ollama
-    ./wyoming
-    ./openssh
-    ./pipewire
-    ./containers
-    ./sddm
-    ./novnc
-    ./kdePlasma6
-  ];*/
 }

system/virtualization/default.nix

@@ -0,0 +1,9 @@
+{ ... }: {
+
+    imports = let 
+        dir = builtins.readDir ./.;
+    in builtins.map (x: ./${x}) (builtins.filter 
+        (file: (dir.${file} == "directory"))
+        (builtins.attrNames dir)
+    );
+}

system/virtualization/docker/portainer/default.nix

@@ -27,7 +27,7 @@
 
             labels = {
                 "traefik.http.routers.portainer.entrypoints" = "localsecure";
-                "traefik.http.routers.portainer.rule" = "Host(`prtnr.esotericbytes.com`) || Host(`portainer.esotericbytes.com`)";
+                "traefik.http.routers.portainer.rule" = "Host(`prtnr.esotericbytes.com`)";
                 "traefik.http.routers.portainer.service" = "portainer";
                 "traefik.http.routers.portainer.tls.certResolver" = "cloudflare";
                 

system/virtualization/virtual-machines/default.nix

@@ -0,0 +1 @@
+{ ... }: {}