feat: merge colmena to nixos

17 files changed, 3 insertions, 2 deletions

diff --git a/flake.nix b/flake.nix
index 581b53e..780c422 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,6 +29,8 @@
 
       nixosConfigurations = import ./nixos inputs;
 
+      colmena = import ./nixos/colmena.nix inputs;
+
       darwinConfigurations = import ./darwin inputs;
 
       homeConfigurations = import ./home inputs;
@@ -36,7 +38,6 @@
       packages.x86_64-linux = self.lib.nixosConfigurationsAsPackages.x86_64-linux
         // self.lib.homeConfigurationsAsPackages.x86_64-linux;
 
-      colmena = import ./colmena inputs;
 
       checks = self.packages;
 
diff --git a/lib/mk_colmena.nix b/lib/mk_colmena.nix
index b9c50a6..641dd34 100644
--- a/lib/mk_colmena.nix
+++ b/lib/mk_colmena.nix
@@ -10,7 +10,7 @@
 , ...
 }:
 let
-  configFolder = "${self}/colmena";
+  configFolder = "${self}/nixos";
   entryPoint = "${configFolder}/${name}/configuration.nix";
   hardware = "${configFolder}/${name}/hardware-configuration.nix";
 in
diff --git a/colmena/cobalt/configuration.nix b/nixos/cobalt/configuration.nix
index c596536..c596536 100644
--- a/colmena/cobalt/configuration.nix
+++ b/nixos/cobalt/configuration.nix
diff --git a/colmena/cobalt/hardware-configuration.nix b/nixos/cobalt/hardware-configuration.nix
index 95ecb96..95ecb96 100644
--- a/colmena/cobalt/hardware-configuration.nix
+++ b/nixos/cobalt/hardware-configuration.nix
diff --git a/colmena/cobalt/modules/git-daemon.nix b/nixos/cobalt/modules/git-daemon.nix
index 76b395e..76b395e 100644
--- a/colmena/cobalt/modules/git-daemon.nix
+++ b/nixos/cobalt/modules/git-daemon.nix
diff --git a/colmena/cobalt/modules/soju.nix b/nixos/cobalt/modules/soju.nix
index d14082c..d14082c 100644
--- a/colmena/cobalt/modules/soju.nix
+++ b/nixos/cobalt/modules/soju.nix
diff --git a/colmena/cobalt/services/README.md b/nixos/cobalt/services/README.md
index 89d9ca5..89d9ca5 100644
--- a/colmena/cobalt/services/README.md
+++ b/nixos/cobalt/services/README.md
diff --git a/colmena/cobalt/services/acme.nix b/nixos/cobalt/services/acme.nix
index b41ae1c..b41ae1c 100644
--- a/colmena/cobalt/services/acme.nix
+++ b/nixos/cobalt/services/acme.nix
diff --git a/colmena/cobalt/services/cgit.nix b/nixos/cobalt/services/cgit.nix
index 4e030c8..4e030c8 100644
--- a/colmena/cobalt/services/cgit.nix
+++ b/nixos/cobalt/services/cgit.nix
diff --git a/colmena/cobalt/services/fail2ban.nix b/nixos/cobalt/services/fail2ban.nix
index 9731ef6..9731ef6 100644
--- a/colmena/cobalt/services/fail2ban.nix
+++ b/nixos/cobalt/services/fail2ban.nix
diff --git a/colmena/cobalt/services/git-daemon.nix b/nixos/cobalt/services/git-daemon.nix
index 21e957e..21e957e 100644
--- a/colmena/cobalt/services/git-daemon.nix
+++ b/nixos/cobalt/services/git-daemon.nix
diff --git a/colmena/cobalt/services/gitolite-noncore/fix-refs b/nixos/cobalt/services/gitolite-noncore/fix-refs
index 8ffec9e..8ffec9e 100644
--- a/colmena/cobalt/services/gitolite-noncore/fix-refs
+++ b/nixos/cobalt/services/gitolite-noncore/fix-refs
diff --git a/colmena/cobalt/services/gitolite-noncore/rename b/nixos/cobalt/services/gitolite-noncore/rename
index 00aa5ca..00aa5ca 100644
--- a/colmena/cobalt/services/gitolite-noncore/rename
+++ b/nixos/cobalt/services/gitolite-noncore/rename
diff --git a/colmena/cobalt/services/gitolite.nix b/nixos/cobalt/services/gitolite.nix
index 94c7ac9..94c7ac9 100644
--- a/colmena/cobalt/services/gitolite.nix
+++ b/nixos/cobalt/services/gitolite.nix
diff --git a/colmena/cobalt/services/nginx.nix b/nixos/cobalt/services/nginx.nix
index cb5ced3..cb5ced3 100644
--- a/colmena/cobalt/services/nginx.nix
+++ b/nixos/cobalt/services/nginx.nix
diff --git a/colmena/cobalt/services/soju.nix b/nixos/cobalt/services/soju.nix
index c150879..c150879 100644
--- a/colmena/cobalt/services/soju.nix
+++ b/nixos/cobalt/services/soju.nix
diff --git a/colmena/default.nix b/nixos/colmena.nix
index 99945e6..99945e6 100644
--- a/colmena/default.nix
+++ b/nixos/colmena.nix