home/scripts/reporsync.nix

@@ -79,7 +79,6 @@
 
   rsynchydra() {
   	_parse_rsync_args "$@"
-    # the name of RR_TO is a bit misleading, it just describes the 2nd positional arg here
-  	_do_rsync "$RR_FROM" "hydra01" "$RR_TO"
+  	_do_rsync "$RR_FROM" "hydra01" "$RR_TARGET"
   }
 ''

home/workmac.nix

@@ -32,21 +32,11 @@ in
 
   programs.ssh = {
     enable = true;
-    # defaults in bottom match block "*"
-    # TODO: common config for desktop as well
-    # multiplexer, e.g. to avoid rate limiting on jumphost usage
-    serverAliveInterval = 60;
-    controlMaster = "auto";
-    controlPersist = "4h";
     # ssh host config
     matchBlocks = {
 
-      # early catchall to enforce agent socket usage. **NOT** the place for fallback defaults.
       "*" = {
-        extraOptions = {
-          IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
-          #ControlPath = "/tmp/ssh_mux_%h_%p_%r";
-        };
+        extraOptions.IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
       };
 
       "hydra01" = lib.hm.dag.entryAfter [ "*" ] {