home: big refactor

1 files changed, 7 insertions, 4 deletions

diff --git a/home/ssh/default.nix b/home/environ/ssh.nix
index 220d18d..29829be 100644
--- a/home/ssh/default.nix
+++ b/home/environ/ssh.nix
@@ -1,7 +1,10 @@
 { config, lib, pkgs, ... }:
-with lib; {
-  config = {
-    programs.ssh = mkIf (!config.home.isolation.active) {
+with lib; let
+  cfg = config.local.environ;
+in
+{
+  config = mkIf cfg.enable {
+    programs.ssh = {
       enable = true;
 
       compression = true;
@@ -10,7 +13,7 @@ with lib; {
 
       extraOptionOverrides.AddKeysToAgent = "true";
 
-      matchBlocks = import ./match.nix;
+      matchBlocks = import ./ssh-match.nix;
     };
 
     systemd.user.tmpfiles.rules = [