remove colmena

4 files changed, 1 insertions, 80 deletions

diff --git a/flake.nix b/flake.nix
index 851a2f7..c624df9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,11 +60,6 @@
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
 
-    colmena = {
-      url = "github:zhaofengli/colmena";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     my-go-tools.url = "git+https://code.fcuny.net/fcuny/x";
     my-site.url = "git+https://code.fcuny.net/fcuny/fcuny.net";
   };
diff --git a/flake/devshells.nix b/flake/devshells.nix
index 19f9497..3b4209f 100644
--- a/flake/devshells.nix
+++ b/flake/devshells.nix
@@ -52,7 +52,6 @@
             with pkgs;
             [
               nixos-rebuild
-              inputs.colmena.packages."${system}".colmena
               git
               inputs.agenix.packages."${system}".default
             ]
diff --git a/flake/hosts.nix b/flake/hosts.nix
index e736d96..df19f45 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -175,82 +175,9 @@ let
       );
     }
   ) (mapHosts (mapSystems "${self}/machines/nixos"));
-
-  adminUser = {
-    name = "fcuny";
-    uid = 1000;
-    userinfo = {
-      email = "franck@fcuny.net";
-      fullName = "Franck Cuny";
-    };
-  };
 in
 {
   flake = {
     inherit nixosConfigurations darwinConfigurations;
-    colmenaHive = inputs.colmena.lib.makeHive self.outputs.colmena;
-    colmena = {
-      meta = {
-        nixpkgs = import inputs.nixpkgs {
-          system = "x86_64-linux";
-          overlays = [
-            inputs.agenix.overlays.default
-            inputs.my-go-tools.overlays.default
-          ];
-        };
-
-        specialArgs = {
-          inherit inputs self;
-          adminUser = adminUser;
-        };
-      };
-
-      defaults =
-        {
-          ...
-        }:
-        {
-          imports = defaultModules ++ [
-            inputs.my-go-tools.nixosModules.default
-          ];
-        };
-
-      do-rproxy =
-        { name, ... }:
-        {
-          imports = [ ../machines/nixos/x86_64-linux/${name} ];
-          deployment = {
-            tags = [ "droplet" ];
-            targetHost = "fcuny.net";
-            targetUser = "fcuny";
-            buildOnTarget = true;
-            allowLocalDeployment = false;
-          };
-        };
-      synology-vm =
-        { name, ... }:
-        {
-          imports = [ ../machines/nixos/x86_64-linux/${name} ];
-          deployment = {
-            tags = [ "vm" ];
-            targetHost = "vm-synology";
-            targetUser = "fcuny";
-            buildOnTarget = true;
-            allowLocalDeployment = false;
-          };
-        };
-      rivendell =
-        { name, ... }:
-        {
-          imports = [ ../machines/nixos/x86_64-linux/${name} ];
-          deployment = {
-            tags = [ "bm" ];
-            targetHost = "rivendell";
-            targetUser = "fcuny";
-            buildOnTarget = true;
-            allowLocalDeployment = false;
-          };
-        };
-    };
   };
 }
diff --git a/flake/scripts/default.nix b/flake/scripts/default.nix
index 6b16e75..6170cd7 100644
--- a/flake/scripts/default.nix
+++ b/flake/scripts/default.nix
@@ -6,7 +6,7 @@
 let
   common = import ./common.nix { inherit pkgs; };
   darwin = import ./darwin.nix { inherit pkgs system inputs; };
-  remote = import ./remote.nix { inherit pkgs system inputs; };
+  remote = import ./remote.nix { inherit pkgs inputs; };
 in
 {
   common = common;