Add Colmena to manage systems, use better pathing for smallfetch, use better mountpoints and hostnames from Colema

flake.nix

@@ -41,6 +41,7 @@
       url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "stable";
     };
+
     nur = {
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "unstable";
@@ -52,23 +53,31 @@
 
   outputs = inputs: with inputs;
 
-  let 
-    mkNix = name: channel: channel.lib.nixosSystem {
-      modules = [ (./hosts + "/${name}") ];
-      specialArgs = inputs;
-    };
-  in {
-    nixosConfigurations = builtins.mapAttrs (name: channel: mkNix name channel) {
-      tower = stable;
-      detritus = stable;
-      hidden = stable;
+  {
+    colmena = {
+      meta = {
+        nixpkgs = import stable {};
+        specialArgs = inputs;
 
-      intuos = stable;
-      jupiter = unstable;
+        # Use a different Nixpkgs import on some systems
+        nodeNixpkgs.jupiter = import unstable {};
+      };
 
-      midas = stable;
-      kitty = stable;
-      prophet = stable;
+      # Desktops
+      tower.imports = [ ./hosts/tower ];
+      #detritus.imports = [ ./hosts/detritus ];
+
+      # Laptops
+      intuos.imports = [ ./hosts/intuos ];
+      jupiter.imports = [ ./hosts/jupiter ];
+
+      # Servers
+      midas.imports = [ ./hosts/midas ];
+      kitty.imports = [ ./hosts/kitty ];
+      prophet.imports = [ ./hosts/prophet ];
+
+      # Misc
+      hidden.imports = [ ./hosts/hidden ];
     };
   }