home/common.nix

@@ -3,7 +3,6 @@
   inputs,
   config,
   system,
-  lib,
   ...
 }:
 {
@@ -49,11 +48,6 @@
       init.defaultBranch = "mainline";
       diff.tool = "vimdiff";
       merge.tool = "vimdiff";
-      # provide `git mergetool -t nixfmt`
-      mergetool.nixfmt = {
-        cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
-        trustExitCode = true;
-      };
       core.excludesfile = toString (
         pkgs.writeText ".gitignore_global" ''
           # Direnv stuff #

home/workmac.nix

@@ -94,25 +94,6 @@ in
     + import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; }
   );
 
-  launchd.agents.hydra_proxy = {
-    enable = true;
-    config = {
-      ProgramArguments = [
-        "${lib.getExe pkgs.autossh}"
-        "-M"
-        "0"
-        "-D"
-        "1080"
-        "-oServerAliveInterval=60"
-        "-oControlMaster=no"
-        "-N"
-        "vpn-whq.services.fcio.net"
-      ];
-      # TODO: consider socket activation instead
-      KeepAlive = true;
-      ThrottleInterval = 60;
-    };
-  };
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ];
 
   home.stateVersion = "22.05";