diff --git a/configuration/common/programs.nix b/configuration/common/programs.nix index 61e70be..a970166 100644 --- a/configuration/common/programs.nix +++ b/configuration/common/programs.nix @@ -13,7 +13,6 @@ # Deployment bij - colmena clerie-sops clerie-sops-edit sops diff --git a/flake.nix b/flake.nix index 982a51c..3fac2d4 100644 --- a/flake.nix +++ b/flake.nix @@ -92,12 +92,6 @@ nixosConfigurations = helper.mapToNixosConfigurations self.clerie.hosts; - colmena = { - meta = { - nixpkgs = localNixpkgs.x86_64-linux; - }; - } // helper.mapToColmenaHosts self.nixosConfigurations; - overlays = { nixfilesInputs = import ./flake/overlay.nix inputs; clerie = import ./pkgs/overlay.nix; diff --git a/lib/default.nix b/lib/default.nix index d43387f..d0ff32d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -11,8 +11,6 @@ let inherit ("flake-helper") generateNixosSystem mapToNixosConfigurations - generateColmenaHost - mapToColmenaHosts buildHosts; clerie-monitoring-ids = callLibs ./clerie-monitoring-ids.nix; }; diff --git a/lib/flake-helper.nix b/lib/flake-helper.nix index 4557974..eb78beb 100644 --- a/lib/flake-helper.nix +++ b/lib/flake-helper.nix @@ -55,20 +55,5 @@ rec { mapToNixosConfigurations = hosts: builtins.mapAttrs (name: host: generateNixosSystem host) hosts; - generateColmenaHost = name: hostSystem: { - deployment = { - targetHost = hostSystem.config.networking.fqdn; - targetUser = null; - tags = let - group = nixpkgs.lib.attrByPath [ "clerie" "monitoring" "serviceLevel" ] null hostSystem.config; - in nixpkgs.lib.lists.optional (group != null) group; - }; - nixpkgs.system = hostSystem.config.nixpkgs.system; - imports = hostSystem._module.args.modules; - deployment.allowLocalDeployment = builtins.any (n: n == name) [ "osmium" ]; - }; - - mapToColmenaHosts = hosts: builtins.mapAttrs (generateColmenaHost) hosts; - buildHosts = hosts: builtins.mapAttrs (name: host: host.config.system.build.toplevel) (nixpkgs.lib.filterAttrs (name: host: (builtins.substring 0 1 name) != "_") hosts); }