From f38f17af41157eb3ea86b77656a5d6de59d62230 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sun, 1 Dec 2024 16:51:04 +0100 Subject: [PATCH] Post-migration cleanups --- README.md | 12 ++++++++---- nixos/prometheus.nix | 14 +------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 50a33d2..d31f501 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,21 @@ -# nixos-laptop +# nixos-configs -NixOS configurations for my personal machines (contrary to the repo's name, it contains a desktop and two servers). +NixOS configurations for the machines I manage. Currently managed systems: - **sue**: My current laptop, a Dell XPS 9315. It has two flavours: - Default running GNOME - - Specialisation running Cosmic (commented out because building takes too long) + - Specialisation running Cosmic - **gamepc**: My gaming PC running Cinnamon - **warwick**: A Raspberry Pi 4 Model B, which mostly does some monitoring -- **atlas**: A Gigabyte Brix, running Kubernetes +- **atlas**: A Gigabyte Brix, one of my Kubernetes nodes +- **jefke**: A Gigabyte Brix, one of my Kubernetes nodes +- **lewis**: A Gigabyte Brix, one of my Kubernetes nodes. Additionally, contains my media collection and does backups. ## Deployment +I use [Colmena](https://colmena.cli.rs) for deploying my machines. + Create garbage collection roots like so: ``` colmena build --keep-result --experimental-flake-eval diff --git a/nixos/prometheus.nix b/nixos/prometheus.nix index 6735607..f786506 100644 --- a/nixos/prometheus.nix +++ b/nixos/prometheus.nix @@ -27,18 +27,6 @@ })) ]; - # TODO: Remove this once they are migrated to this repo. - compat = map ( - name: { - job_name = name; - static_configs = [ - { - targets = ["${name}.dmz:${toString config.services.prometheus.exporters.node.port}"]; - } - ]; - } - ) ["lewis" "jefke"]; - pikvm = { job_name = "pikvm"; metrics_path = "/api/export/prometheus/metrics"; @@ -58,7 +46,7 @@ ]; }; in - generated ++ compat ++ [pikvm] + generated ++ [pikvm] ); };