From 2528ba11f92c36a242641f62945e9af2b0deaf87 Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <hi@voronind.com>
Date: Thu, 19 Sep 2024 03:21:47 +0300
Subject: [PATCH] HomeManager : Fix ssh in path bug.

---
 Makefile                    | 8 --------
 home/NixOs.nix              | 3 +++
 module/AutoUpdateSigned.nix | 3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 1b9cce0..dc1079a 100644
--- a/Makefile
+++ b/Makefile
@@ -22,14 +22,6 @@ boot-no-nixconf: fix-ulimit
 check:
 	nix flake check --show-trace
 
-# HACK: https://github.com/nix-community/home-manager/issues/5589
-fix-hm:
-	mv /etc/nix/nix.conf /etc/nix/nix.conf_; \
-	systemctl restart home-manager-root.service; \
-	systemctl restart home-manager-voronind.service; \
-	systemctl restart home-manager-dasha.service; \
-	mv /etc/nix/nix.conf_ /etc/nix/nix.conf
-
 fix-ulimit:
 	ulimit -n 999999999
 
diff --git a/home/NixOs.nix b/home/NixOs.nix
index 13d5eae..94d65a3 100644
--- a/home/NixOs.nix
+++ b/home/NixOs.nix
@@ -28,6 +28,9 @@ in {
 						inherit (user) username homeDirectory;
 						file             = import ./config args;
 						sessionVariables = import ./variable args;
+
+						# ISSUE: https://github.com/nix-community/home-manager/issues/5589
+						extraActivationPath = with pkgs; [ openssh ];
 					};
 					xdg      = import ./xdg { inherit (user) homeDirectory; };
 					programs = import ./program args;
diff --git a/module/AutoUpdateSigned.nix b/module/AutoUpdateSigned.nix
index 0b3d969..b735b44 100644
--- a/module/AutoUpdateSigned.nix
+++ b/module/AutoUpdateSigned.nix
@@ -39,8 +39,7 @@ in {
 					echo "Verification failed."
 					exit 1
 				};
-				make switch || true
-				make fix-hm || true
+				make switch
 			'';
 			after = [ "network-online.target" ];
 			wants = [ "network-online.target" ];