summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix14
-rw-r--r--overlays/prometheus-node-exporter/default.nix15
2 files changed, 10 insertions, 19 deletions
diff --git a/flake.nix b/flake.nix
index b2337d99..597ac14a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -176,11 +176,17 @@
176 inherit hostname; 176 inherit hostname;
177 sshUser = "root"; 177 sshUser = "root";
178 178
179 profiles.system = { 179 profilesOrder = ["system"]; # system first
180 path = deploy-rs.lib.${self.nixosConfigurations.${hostname}.config.nixpkgs.system}.activate.nixos self.nixosConfigurations.${hostname}; 180 profiles = {
181 }; 181 system = {
182 path = deploy-rs.lib.${self.nixosConfigurations.${hostname}.config.nixpkgs.system}.activate.nixos self.nixosConfigurations.${hostname};
183 };
184 } // (mapAttrs (_user: usercfg: {
185 user = usercfg.home.username;
186 path = deploy-rs.lib.${self.nixosConfigurations.${hostname}.config.nixpkgs.system}.activate.home-manager usercfg.home;
187 }) self.nixosConfigurations.${hostname}.config.home-manager.users);
182 }) (nixImport { dir = ./hosts; _import = (_path: name: name); }); 188 }) (nixImport { dir = ./hosts; _import = (_path: name: name); });
183 189
184 # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; 190 checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
185 }; 191 };
186} 192}
diff --git a/overlays/prometheus-node-exporter/default.nix b/overlays/prometheus-node-exporter/default.nix
deleted file mode 100644
index 1133af05..00000000
--- a/overlays/prometheus-node-exporter/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
1final: prev: {
2 prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs (oldAttrs: {
3 patches = oldAttrs.patches or [] ++ [
4 (prev.runCommand "cpu-unified.diff" {
5 src = prev.fetchurl {
6 url = "https://github.com/pelov/systemd_exporter/commit/2880a8dd1ca4909e51a569093284fad47343016a.diff";
7 hash = "sha256-i6sptiCdXmOqK5kfjLbIupctM34RqDahAE/39+35dRI=";
8 };
9 buildInputs = with prev; [ patchutils ];
10 } ''
11 filterdiff -x '**/CHANGELOG.md' $src > $out
12 '')
13 ];
14 });
15}