diff --git a/flake.lock b/flake.lock index 1b3b17a..a9bc533 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1746001439, - "narHash": "sha256-MQplzhcXXrAlfDIfklvYxXtnxv5akmeLaeGIvouYYUI=", + "lastModified": 1745921824, + "narHash": "sha256-8FFSHBE0HgW0HGrTULbaUVH29aeVP31Clf2HDtDfqaE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "769f426eb3f6bc6d26f03106ac5772b98595a7b8", + "rev": "841c18a6fe787b669ea362e3e14f54a5bd12a63c", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1745987135, - "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=", + "lastModified": 1745894335, + "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e", + "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1745994134, - "narHash": "sha256-rYMXlL9qSv+Syz0udsOJxKeLRQ9FdGmHz6j+YzDi5uE=", + "lastModified": 1745775537, + "narHash": "sha256-X/mfPstVkj3hhIIBU/tGAuOraiYpm3i/A3BiBg1VH4s=", "ref": "refs/heads/main", - "rev": "a66c91e1018f9e556574f60f8e4cb14544e0e875", - "revCount": 17809, + "rev": "dad17a54f7cf2bae24274dc2b9a535c1938e6eb0", + "revCount": 17805, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -569,11 +569,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1745907084, + "narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "f1e52a018166e1a324f832de913e12c0e55792d0", "type": "github" }, "original": { @@ -647,11 +647,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1745921652, - "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", + "lastModified": 1745742390, + "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", + "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", "type": "github" }, "original": { @@ -711,11 +711,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1745794561, + "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", "type": "github" }, "original": { @@ -742,11 +742,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1745794561, + "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", "type": "github" }, "original": { diff --git a/modules/prometheus-exporters/default.nix b/modules/prometheus-exporters/default.nix index bdfe268..4d1a70e 100644 --- a/modules/prometheus-exporters/default.nix +++ b/modules/prometheus-exporters/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let @@ -16,7 +15,6 @@ in "sisko" "picard" "kirk" - "pike" ] { enable = true; @@ -55,7 +53,6 @@ in "sisko" "picard" "kirk" - "pike" ] { enable = true; @@ -65,17 +62,13 @@ in [ "picard" "kirk" - "pike" ] { enable = true; }; - restic = mkFor [ "sisko" ] { - # https://github.com/ngosang/restic-exporter/issues/31 - enable = false; - repository = config.services.restic.backups.sisko.repository; - passwordFile = config.age.secrets.SISKO_RESTIC_PASSWORD.path; - }; + # restic = mkFor ["sisko"] { + # enable = true; + # }; postgres = mkFor [ "sisko" ] { enable = true; }; @@ -88,12 +81,9 @@ in "sisko" "picard" "kirk" - "pike" ] { enable = true; }; }; - - systemd.services.prometheus-restic-exporter.path = [ pkgs.openssh ]; } diff --git a/modules/prometheus/default.nix b/modules/prometheus/default.nix index 69f1ddf..5636fe6 100644 --- a/modules/prometheus/default.nix +++ b/modules/prometheus/default.nix @@ -27,14 +27,14 @@ in } ]; } - # { - # job_name = "pushgateway"; - # static_configs = [ - # { - # targets = [ cfg.pushgateway.web.listen-address ]; - # } - # ]; - # } + { + job_name = "pushgateway"; + static_configs = [ + { + targets = [ cfg.pushgateway.web.listen-address ]; + } + ]; + } { job_name = "node"; static_configs = [ @@ -43,7 +43,6 @@ in "sisko" "picard" "kirk" - "pike" ]; } ]; @@ -55,7 +54,6 @@ in targets = builtins.map (host: "${host}.wg.aciceri.dev:9586") [ "picard" "kirk" - "pike" ]; } ]; @@ -67,7 +65,6 @@ in targets = builtins.map (host: "${host}.wg.aciceri.dev:9134") [ "picard" "kirk" - "pike" ]; } ]; @@ -104,14 +101,12 @@ in "sisko" "kirk" "picard" - "pike" ]; } ]; } ]; }; - environment.persistence."/persist".directories = [ "/var/lib/${cfg.stateDir}" ]; diff --git a/secrets/home-planimetry.age b/secrets/home-planimetry.age index 9619054..2926aae 100644 Binary files a/secrets/home-planimetry.age and b/secrets/home-planimetry.age differ