clerie/nixfiles
1
0
Fork 0
Code

flake.nix: Remove colmena

Browse Source
This commit is contained in:
clerie 2024-05-13 16:11:09 +02:00
parent 9210767036
commit 1f7ffd82ba
Signed by: clerie
GPG Key ID: BD9F56480870BAD2
4 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configuration/common/programs.nix
View File

@ -13,7 +13,6 @@
# Deployment # Deployment
bij bij
colmena
clerie-sops clerie-sops
clerie-sops-edit clerie-sops-edit
sops sops

6
flake.nix
View File

@ -92,12 +92,6 @@
nixosConfigurations = helper.mapToNixosConfigurations self.clerie.hosts; nixosConfigurations = helper.mapToNixosConfigurations self.clerie.hosts;
colmena = {
meta = {
nixpkgs = localNixpkgs.x86_64-linux;
};
} // helper.mapToColmenaHosts self.nixosConfigurations;
overlays = { overlays = {
nixfilesInputs = import ./flake/overlay.nix inputs; nixfilesInputs = import ./flake/overlay.nix inputs;
clerie = import ./pkgs/overlay.nix; clerie = import ./pkgs/overlay.nix;

2
lib/default.nix
View File

@ -11,8 +11,6 @@ let
inherit ("flake-helper") inherit ("flake-helper")
generateNixosSystem generateNixosSystem
mapToNixosConfigurations mapToNixosConfigurations
generateColmenaHost
mapToColmenaHosts
buildHosts; buildHosts;
clerie-monitoring-ids = callLibs ./clerie-monitoring-ids.nix; clerie-monitoring-ids = callLibs ./clerie-monitoring-ids.nix;
}; };

15
lib/flake-helper.nix
View File

@ -55,20 +55,5 @@ rec {
mapToNixosConfigurations = hosts: builtins.mapAttrs (name: host: generateNixosSystem host) hosts; 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); buildHosts = hosts: builtins.mapAttrs (name: host: host.config.system.build.toplevel) (nixpkgs.lib.filterAttrs (name: host: (builtins.substring 0 1 name) != "_") hosts);
} }