modules/prometheus: refactor

This commit is contained in:
xinyangli 2024-11-30 11:25:35 +08:00
parent ebf69d94dd
commit ec63c8b6cc
Signed by: xin
SSH key fingerprint: SHA256:UU5pRTl7NiLFJbWJZa+snLylZSXIz5rgHmwjzv8v4oE
26 changed files with 579 additions and 407 deletions

View file

@ -60,8 +60,8 @@
outputs =
{
self,
home-manager,
nixpkgs,
home-manager,
nixos-hardware,
sops-nix,
flake-utils,
@ -84,6 +84,7 @@
overlayModule =
{ ... }:
{
_module.args.my-lib = import ./overlays/my-lib;
nixpkgs.overlays = [
editorOverlay
(import ./overlays/add-pkgs.nix)
@ -118,10 +119,6 @@
./machines/dolomite/bandwagon.nix
./machines/dolomite/common.nix
];
tok-00 = [
./machines/dolomite/lightsail.nix
./machines/dolomite/common.nix
];
fra-00 = [
./machines/dolomite/fra.nix
./machines/dolomite/common.nix
@ -178,7 +175,6 @@
};
in
{
nixpkgs = nixpkgs;
nixosModules.default = {
imports = [
./modules/nixos
@ -190,7 +186,9 @@
colmenaHive = colmena.lib.makeHive {
meta = {
# FIXME:
nixpkgs = import nixpkgs { system = "x86_64-linux"; };
nixpkgs = import nixpkgs {
system = "x86_64-linux";
};
};
massicot =
@ -205,20 +203,6 @@
] ++ sharedColmenaModules;
};
tok-00 =
{ ... }:
{
imports = nodeNixosModules.tok-00 ++ sharedColmenaModules;
nixpkgs.system = "x86_64-linux";
networking.hostName = "tok-00";
system.stateVersion = "23.11";
deployment = {
targetHost = "video01.namely.icu";
buildOnTarget = false;
tags = [ "proxy" ];
};
};
la-00 =
{ ... }:
{
@ -310,7 +294,6 @@
osmium = mkNixos {
hostname = "osmium";
};
} // self.colmenaHive.nodes;
}