2 files changed, 35 insertions, 0 deletions
diff --git a/lib/default.nix b/lib/default.nix
index 704a15e..13164a9 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -4,6 +4,7 @@ inputs:
   mkSystem = import ./mk_system.nix inputs;
   mkHome = import ./mk_home.nix inputs;
   mkDarwin = import ./mk_darwin.nix inputs;
+  mkColmena = import ./mk_colmena.nix inputs;
   nixosConfigurationsAsPackages = import ./nixos_configurations_as_packages.nix inputs;
   homeConfigurationsAsPackages = import ./home_configurations_as_packages.nix inputs;
 }
diff --git a/lib/mk_colmena.nix b/lib/mk_colmena.nix
new file mode 100644
index 0000000..c4b5bad
--- /dev/null
+++ b/lib/mk_colmena.nix
@@ -0,0 +1,34 @@
+{ self, ... } @ args:
+
+{ name
+, system ? "x86_64-linux"
+, deployment ? null
+, host ? null
+, port ? 22
+, tags ? null
+, extraModules ? null
+, ...
+}:
+let
+  configFolder = "${self}/colmena";
+  entryPoint = "${configFolder}/${name}/configuration.nix";
+  hardware = "${configFolder}/${name}/hardware-configuration.nix";
+in
+{
+  deployment = deployment;
+  # system = system;
+
+  imports = [
+    {
+      _module.args = args;
+      networking.hostName = name;
+      nix.flakes.enable = true;
+      system.configurationRevision = self.rev or "dirty";
+      documentation.man = { enable = true; generateCaches = true; };
+    }
+    entryPoint
+    hardware
+    ../nixos/modules/flake.nix
+    ../nixos/modules/nix.nix
+  ];
+}