home/config/ssh/default.nix

@@ -1,25 +1,55 @@
 # SSH client configuration.
-{ util, ... }: let
+{ util, ... }: {
-	mkHost = name: address: port: user: extra: util.trimTabs ''
+	text = util.trimTabs ''
-		Host ${name}
+		Host dasha
-			HostName ${address}
+			HostName 10.0.0.7
-			User ${user}
+			User root
-			Port ${toString port}
+			Port 22143
-			ControlPath ~/.ssh/${name}.socket
-			ControlMaster auto
-			ControlPersist yes
-	'' + extra;
-in {
-	text = ""
-		+ mkHost "dasha"    "10.0.0.7"       22143 "root" ""
-		+ mkHost "desktop"  "10.0.0.3"       22143 "root" ""
-		+ mkHost "fmpmaven" "10.30.22.10"    22    "root" ""
-		+ mkHost "home"     "10.0.0.1"       22143 "root" ""
-		+ mkHost "laptop"   "192.168.1.9"    22143 "root" ""
-		+ mkHost "pi"       "192.168.1.6"    22143 "root" ""
-		+ mkHost "vpn"      "194.113.233.38" 22143 "root" ""
-		+ mkHost "work"     "192.168.1.5"    22143 "root" ""
 
-		+ mkHost "nixbuilder" "10.0.0.1"    "22143" "nixbuilder" "StrictHostKeyChecking=accept-new"
+		Host desktop
-		;
+			Hostname 10.0.0.3
+			User root
+			Port 22143
+
+		Host fmpmaven
+			Hostname 10.30.22.10
+			User root
+			Port 22
+
+		Host fsight
+			Hostname 10.30.217.25
+			User root
+			Port 22143
+
+		Host home
+			HostName 10.0.0.1
+			User root
+			Port 22143
+
+		Host nixbuilder
+			HostName 10.0.0.1
+			User nixbuilder
+			StrictHostKeyChecking=accept-new
+			Port 22143
+
+		Host laptop
+			Hostname 192.168.1.9
+			User root
+			Port 22143
+
+		Host pi
+			Hostname 192.168.1.6
+			User root
+			Port 22143
+
+		Host vpn
+			Hostname 194.113.233.38
+			User root
+			Port 22143
+
+		Host work
+			Hostname 192.168.1.5
+			User root
+			Port 22143
+	'';
 }

module/AutoUpdateSigned.nix

@@ -39,7 +39,7 @@ in {
 					echo "Verification failed."
 					exit 1
 				};
-				${getExe pkgs.gnumake} switch fix-hm-root
+				${getExe pkgs.gnumake} switch
 			'';
 			after = [ "network-online.target" ];
 			wants = [ "network-online.target" ];