From 6e43db6c79dd4a286db34f1102acad03468789b7 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Thu, 1 Jun 2023 08:21:55 +0200 Subject: [PATCH] various system fixes --- nixos/machines/chungus/configuration.nix | 4 ++-- nixos/machines/chungus/prometheus.nix | 11 ----------- nixos/machines/chungus/rbackup.nix | 8 ++++---- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/nixos/machines/chungus/configuration.nix b/nixos/machines/chungus/configuration.nix index 8c70f2e..62752e5 100644 --- a/nixos/machines/chungus/configuration.nix +++ b/nixos/machines/chungus/configuration.nix @@ -13,7 +13,7 @@ ./hass.nix ./hass-zigbee2mqtt.nix ./hass-mqtt.nix - ./hass-wifi.nix + #./hass-wifi.nix #./mail-fetcher.nix @@ -40,7 +40,7 @@ ./sync-script.nix ./syncthing.nix - ./kiosk.nix + #./kiosk.nix ./trilium.nix ]; diff --git a/nixos/machines/chungus/prometheus.nix b/nixos/machines/chungus/prometheus.nix index 6624501..77a8e30 100644 --- a/nixos/machines/chungus/prometheus.nix +++ b/nixos/machines/chungus/prometheus.nix @@ -69,7 +69,6 @@ #}; exporters = { - systemd.enable = true; node = { enable = true; enabledCollectors = [ "systemd" ]; @@ -93,16 +92,6 @@ } ]; } - { - job_name = "systemd"; - static_configs = [{ - targets = [ "localhost:${toString config.services.prometheus.exporters.systemd.port}" ]; - labels = { - service = "systemd-exporter"; - server = config.networking.hostName; - }; - }]; - } { job_name = "node"; static_configs = [{ diff --git a/nixos/machines/chungus/rbackup.nix b/nixos/machines/chungus/rbackup.nix index 8aaa691..352d637 100644 --- a/nixos/machines/chungus/rbackup.nix +++ b/nixos/machines/chungus/rbackup.nix @@ -10,18 +10,18 @@ }; taskwarrior = { sshKeyPath = config.sops.secrets.rsync_private_key.path; - src = "root@robi:/var/lib/taskwarrior/"; - dst = "/services/taskwarrior"; + src = "root@robi:/var/lib/taskserver/"; + dst = "/srv/taskwarrior"; }; gitea = { sshKeyPath = config.sops.secrets.rsync_private_key.path; src = "root@robi:/var/lib/gitea/"; - dst = "/services/gitea"; + dst = "/srv/gitea"; }; bitwarden = { sshKeyPath = config.sops.secrets.rsync_private_key.path; src = "root@robi:/var/lib/bitwarden_rs/"; - dst = "/services/bitwarden_rs"; + dst = "/srv/bitwarden_rs"; }; torrent = { sshKeyPath = config.sops.secrets.rsync_private_key.path;