Move ssh config to desktop role

rake5k · Jun 27, 2024 · 17f535f · 17f535f
1 parent 4ad40c3
commit 17f535f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/home/programs/ssh/default.nix b/home/programs/ssh/default.nix
@@ -31,6 +31,11 @@ in
     custom.roles.homeage.enable = true;
 
     homeage.file = listToAttrs (map mkHomeageFile cfg.identities);
-    programs.ssh.enable = true;
+    programs.ssh = {
+      enable = true;
+      controlMaster = "auto";
+      controlPath = "~/.ssh/master-%r@%n:%p";
+      controlPersist = "10m";
+    };
   };
 }
diff --git a/home/roles/desktop/default.nix b/home/roles/desktop/default.nix
@@ -91,6 +91,7 @@ in
     custom = {
       programs = {
         logseq.enable = true;
+        ssh.enable = true;
         syncthing.enable = true;
       };
       roles = {

diff --git a/home/users/christian/shell/default.nix b/home/users/christian/shell/default.nix
@@ -73,8 +73,6 @@ in
     };
 
     programs = {
-      ssh = import ./ssh.nix;
-
       bat.enable = true;
       eza.enable = true;
       fzf.enable = true;

diff --git a/home/users/christian/shell/ssh.nix b/home/users/christian/shell/ssh.nix