commit 4d7b2006196013ec63dddacf398c35b9a5d08810
parent 1c0e812675c420029370e95819d4cf4b8c93a818
Author: mtmn <miro@haravara.org>
Date: Sun, 5 Jul 2026 14:10:17 +0200
nix: add furion host and use it as builder
Diffstat:
23 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/.gitattributes b/.gitattributes
@@ -10,6 +10,9 @@ hosts/work/** filter=git-crypt diff=git-crypt
# nixaran
hosts/nixaran/** filter=git-crypt diff=git-crypt
+# furion
+hosts/furion/** filter=git-crypt diff=git-crypt
+
# ragenix
secrets/* filter=git-crypt diff=git-crypt
diff --git a/flake.lock b/flake.lock
@@ -162,11 +162,11 @@
]
},
"locked": {
- "lastModified": 1783134515,
- "narHash": "sha256-qMoZazubXlXUD9k/syJ/aiWC4X4g73mwVmZ7Z4+rdpM=",
+ "lastModified": 1783222121,
+ "narHash": "sha256-E/ElL373TO8lQ2aMvYyzN+k4xkVaUGoRqoa8AtM71tI=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "b885baad531fa3d3beae2ba9a0712d22974d8016",
+ "rev": "a1645f40777620c4bd2b6d854b290c2fc354a266",
"type": "github"
},
"original": {
@@ -204,11 +204,11 @@
]
},
"locked": {
- "lastModified": 1783023993,
- "narHash": "sha256-gaOvvY/lL1eWoSmSRO17pWry8R49AuPMrF4nzu47K5o=",
+ "lastModified": 1783233851,
+ "narHash": "sha256-jzisD+3wWZPC4QvAsKtYguiGsmlH2SN3Mjx5LWd68Ok=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "f8ed6cdcb1fd28a6ab7b61f4467a4f67fe2d9074",
+ "rev": "fab14c7b63499d57cb6673d5690168c3ec42b99a",
"type": "github"
},
"original": {
@@ -248,11 +248,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1782978903,
- "narHash": "sha256-bG1LAS3YehMzp4RSXw99o3yMEO/Ktb0Tx29RCtEU0Tk=",
+ "lastModified": 1783214977,
+ "narHash": "sha256-0lkauQbtrljJqwtzTCILPAiHAJyMvn6XDo264moDv30=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d33369954a67ae3322177dc9a3d564092912120c",
+ "rev": "6edbf1a6a03e75886a6609c088801a0856449e88",
"type": "github"
},
"original": {
@@ -264,11 +264,11 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1782918843,
- "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=",
+ "lastModified": 1782978903,
+ "narHash": "sha256-bG1LAS3YehMzp4RSXw99o3yMEO/Ktb0Tx29RCtEU0Tk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e8273b29fe1390ec8d4603f2477357555291432e",
+ "rev": "d33369954a67ae3322177dc9a3d564092912120c",
"type": "github"
},
"original": {
@@ -339,11 +339,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
- "lastModified": 1783030661,
- "narHash": "sha256-KSwu5An298CLSfMqFLbbYJKOjnvVRUjg2Ipw8TJBfHs=",
+ "lastModified": 1783199967,
+ "narHash": "sha256-6adf9Kb6bJTuBnRU0gtXNmzplCDQxUUz4onbn7UjPE0=",
"owner": "~mtmn",
"repo": "shirts",
- "rev": "c90ff1d67a4cd293a0b84487c15c63321c056956",
+ "rev": "98a81071c6742c037abdeacd2cc90cfce15fb09c",
"type": "sourcehut"
},
"original": {
diff --git a/hosts.nix b/hosts.nix
@@ -9,6 +9,12 @@
nixos = true;
disko = true;
};
+ furion = {
+ system = "x86_64-linux";
+ hostname = "furion";
+ nixos = true;
+ disko = true;
+ };
bbox = {
system = "x86_64-linux";
hostDir = "bbox";
diff --git a/hosts/furion/configuration.nix b/hosts/furion/configuration.nix
Binary files differ.
diff --git a/hosts/furion/disk-config.nix b/hosts/furion/disk-config.nix
Binary files differ.
diff --git a/hosts/furion/hardware-configuration.nix b/hosts/furion/hardware-configuration.nix
Binary files differ.
diff --git a/hosts/nixaran/configuration.nix b/hosts/nixaran/configuration.nix
Binary files differ.
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -47,6 +47,7 @@
nb
yq
jdupes
+ plakar
];
vcs = [
diff --git a/justfile b/justfile
@@ -7,9 +7,9 @@ update:
check:
nix flake check --no-update-lock-file
-deploy host="nixaran":
+deploy host:
@backup git:nix
- NH_ELEVATION_STRATEGY=none nh os switch . --hostname {{ host }} --target-host root@{{ host }} --build-host root@{{ host }}
+ NH_ELEVATION_STRATEGY=none nh os switch . --hostname {{ host }} --target-host root@{{ host }} --build-host root@furion
home:
-@backup git:nix
@@ -20,7 +20,7 @@ diff:
home-manager build --flake ".#$(whoami)@$(hostname)" --no-update-lock-file
nvd diff $HOME/.local/state/nix/profiles/home-manager ./result
-diffr host="nixaran":
+diffr host:
-@backup git:nix
nix store diff-closures \
$(ssh {{ host }} readlink -f /run/current-system) \
diff --git a/modules/services/monitoring/default.nix b/modules/services/monitoring/default.nix
@@ -105,7 +105,9 @@ in {
}
{
job_name = "systemd_exporter";
- static_configs = [{targets = ["127.0.0.1:${toString config.services.prometheus.exporters.systemd.port}"];}];
+ static_configs =
+ [{targets = ["127.0.0.1:${toString config.services.prometheus.exporters.systemd.port}"];}]
+ ++ cfg.exporters.extraSystemdStaticConfigs;
metrics_path = "/metrics";
}
])
diff --git a/modules/services/monitoring/exporters.nix b/modules/services/monitoring/exporters.nix
@@ -13,6 +13,11 @@ in {
default = [];
description = "Additional static_configs appended to the node_exporter job";
};
+ extraSystemdStaticConfigs = lib.mkOption {
+ type = lib.types.listOf lib.types.attrs;
+ default = [];
+ description = "Additional static_configs appended to the systemd_exporter job";
+ };
blackbox = {
enable = lib.mkEnableOption "Blackbox Prometheus exporter for endpoint probing";
port = lib.mkOption {
diff --git a/secrets.nix b/secrets.nix
@@ -1,8 +1,9 @@
let
amen = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEShZSmhIjIXf0DbFG8fZQFBy6CgDU2tFMMTAvCF5/ca";
nixaran = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILR1AXTb/mETWJgd1b1F4xvwa/MOeeElCUZ9/nklcZuX";
+ furion = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOnE4In8jiKVkTZbak1kscrQrYUT843JcoxbcJk2HlAg";
- allKeys = [amen nixaran];
+ allKeys = [amen nixaran furion];
in {
"secrets/grafana-secret-key.age".publicKeys = allKeys;
"secrets/oauth2-proxy-client-secret.age".publicKeys = allKeys;
diff --git a/secrets/corpus.age b/secrets/corpus.age
Binary files differ.
diff --git a/secrets/dex-client-secret.age b/secrets/dex-client-secret.age
Binary files differ.
diff --git a/secrets/grafana-secret-key.age b/secrets/grafana-secret-key.age
Binary files differ.
diff --git a/secrets/headscale-api-key.age b/secrets/headscale-api-key.age
Binary files differ.
diff --git a/secrets/lastfm-password.age b/secrets/lastfm-password.age
Binary files differ.
diff --git a/secrets/listenbrainz-token.age b/secrets/listenbrainz-token.age
Binary files differ.
diff --git a/secrets/miniflux-secrets.age b/secrets/miniflux-secrets.age
Binary files differ.
diff --git a/secrets/oauth2-proxy-client-secret.age b/secrets/oauth2-proxy-client-secret.age
Binary files differ.
diff --git a/secrets/oauth2-proxy-cookie-secret.age b/secrets/oauth2-proxy-cookie-secret.age
Binary files differ.
diff --git a/secrets/searx-secret-key.age b/secrets/searx-secret-key.age
Binary files differ.
diff --git a/secrets/smtp-alerts-password.age b/secrets/smtp-alerts-password.age
Binary files differ.
