From b4d952460bdd970d90e91d7b8e778b44a0ef3394 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 12 Mar 2022 22:53:15 +0100
Subject: deploy-rs home-manager

---
 flake.nix                                     | 14 ++++++++++----
 overlays/prometheus-node-exporter/default.nix | 15 ---------------
 2 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 overlays/prometheus-node-exporter/default.nix

diff --git a/flake.nix b/flake.nix
index b2337d99..597ac14a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -176,11 +176,17 @@
           inherit hostname;
           sshUser = "root";
             
-          profiles.system = {
-            path = deploy-rs.lib.${self.nixosConfigurations.${hostname}.config.nixpkgs.system}.activate.nixos self.nixosConfigurations.${hostname};
-          };
+          profilesOrder = ["system"]; # system first
+          profiles = {
+            system = {
+              path = deploy-rs.lib.${self.nixosConfigurations.${hostname}.config.nixpkgs.system}.activate.nixos self.nixosConfigurations.${hostname};
+            };
+          } // (mapAttrs (_user: usercfg: {
+            user = usercfg.home.username;
+            path = deploy-rs.lib.${self.nixosConfigurations.${hostname}.config.nixpkgs.system}.activate.home-manager usercfg.home;
+          }) self.nixosConfigurations.${hostname}.config.home-manager.users);
         }) (nixImport { dir = ./hosts; _import = (_path: name: name); });
 
-        # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
+        checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
       };
 }
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 @@
-final: prev: {
-  prometheus-systemd-exporter = prev.prometheus-systemd-exporter.overrideAttrs (oldAttrs: {
-    patches = oldAttrs.patches or [] ++ [
-      (prev.runCommand "cpu-unified.diff" {
-        src = prev.fetchurl {
-          url = "https://github.com/pelov/systemd_exporter/commit/2880a8dd1ca4909e51a569093284fad47343016a.diff";
-          hash = "sha256-i6sptiCdXmOqK5kfjLbIupctM34RqDahAE/39+35dRI=";
-        };
-        buildInputs = with prev; [ patchutils ];
-      } ''
-        filterdiff -x '**/CHANGELOG.md' $src > $out
-      '')
-    ];
-  });
-}
-- 
cgit v1.2.3