ctucx.git: nixfiles

flake.nix: add colmena-hive

diff --git a/flake.nix b/flake.nix
@@ -1,8 +1,51 @@
 {
 
-  description = "A flake for building Hello World";
+  description = "A flake for building my infra";
 
   outputs = inputs: rec {
+
+    darwinConfigurations = {
+      blechkasten = inputs.darwin.lib.darwinSystem rec {
+        system = "aarch64-darwin";
+        pkgs = import inputs.nixpkgsDarwin {
+          inherit system;
+          overlays = overlays ++ [(import ./pkgs/darwin-overlay.nix)];
+        };
+        specialArgs = {
+          currentSystem = system;
+          inherit inputs;
+        };
+        modules = [ ./machines/blechkasten/darwin-configuration.nix ];
+      };
+    };
+
+    colmena = {
+      meta = rec {
+        nixpkgs = import inputs.nixpkgs {
+          system   = "x86_64-linux";
+          overlays = overlays;
+        };
+
+        specialArgs = {
+          inherit inputs;
+          currentSystem = nixpkgs.system;
+        };
+      };
+
+      defaults     = import ./configurations/common;
+
+      briefkasten  = import ./machines/briefkasten/configuration.nix;
+
+      trabbi       = import ./machines/trabbi/configuration.nix;
+      wanderduene  = import ./machines/wanderduene/configuration.nix;
+    };
+
+    nixosConfigurations = (import (inputs.colmena + "/src/nix/hive/eval.nix") {
+      rawFlake = inputs.self;
+      colmenaOptions = import (inputs.colmena + "/src/nix/hive/options.nix");
+      colmenaModules = import (inputs.colmena + "/src/nix/hive/modules.nix");
+    }).nodes;
+
     overlays = [
       (import ./pkgs/overlay.nix)
 

@@ -27,40 +70,10 @@
       inputs.ctucx-things.overlay
       inputs.ctucx-gallery.overlay
 
-      inputs.oeffisearch.overlay
-      inputs.oeffi-web.overlay
-
       inputs.dnsmasq-lease-overview.overlay
       inputs.flauschehorn-sexy.overlay
     ];
 
-    darwinConfigurations = {
-
-      blechkasten = let
-        system = "aarch64-darwin";
-      in inputs.darwin.lib.darwinSystem {
-        inherit system;
-        pkgs = import inputs.nixpkgsDarwin {
-          inherit system;
-          overlays = overlays ++ [(import ./pkgs/darwin-overlay.nix)];
-        };
-        specialArgs = {
-          currentSystem = system;
-          inherit inputs;
-        };
-        modules = [ ./machines/blechkasten/darwin-configuration.nix ];
-      };
-
-    };
-
-    colmena = import ./hive.nix inputs overlays;
-
-    nixosConfigurations = (import (inputs.colmena + "/src/nix/hive/eval.nix") {
-      rawFlake = inputs.self;
-      colmenaOptions = import (inputs.colmena + "/src/nix/hive/options.nix");
-      colmenaModules = import (inputs.colmena + "/src/nix/hive/modules.nix");
-    }).nodes;
-
   };
 
   inputs = {

@@ -100,14 +113,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    simple-nixos-mailserver = {
-      type  = "gitlab";
-      owner = "simple-nixos-mailserver";
-      repo  = "nixos-mailserver";
-      ref   = "nixos-22.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     darwin = {
       type  = "github";
       owner = "lnl7";

@@ -139,6 +144,14 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    simple-nixos-mailserver = {
+      type  = "gitlab";
+      owner = "simple-nixos-mailserver";
+      repo  = "nixos-mailserver";
+      ref   = "nixos-22.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     flake-utils = {
       type  = "github";
       owner = "numtide";

@@ -233,22 +246,6 @@
       inputs.flake-utils.follows = "flake-utils";
     };
 
-    oeffisearch = {
-      type  = "git";
-      url   = "https://git.ctu.cx/oeffisearch";
-      ref   = "master";
-      inputs.nixpkgs.follows     = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-
-    oeffi-web = {
-      type  = "git";
-      url   = "https://git.ctu.cx/oeffi-web";
-      ref   = "master";
-      inputs.nixpkgs.follows     = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-
     mobile-coverage-map = {
       type  = "git";
       url   = "https://git.ctu.cx/mobile-coverage-map";

diff --git a/hive.nix b/hive.nix
@@ -1,24 +0,0 @@
-inputs: overlays:
-
-{
-
-  meta = rec {
-    nixpkgs = import inputs.nixpkgs {
-      system   = "x86_64-linux";
-      overlays = overlays;
-    };
-
-    specialArgs = {
-      inherit inputs;
-      currentSystem = nixpkgs.system;
-    };
-  };
-
-  defaults     = import ./configurations/common;
-
-  briefkasten  = import ./machines/briefkasten/configuration.nix;
-
-  trabbi       = import ./machines/trabbi/configuration.nix;
-  wanderduene  = import ./machines/wanderduene/configuration.nix;
-
-}