From 17f535f8bb39e6f5080e5f91d6492fd68a6cd292 Mon Sep 17 00:00:00 2001
From: Christian Harke <christian@harke.ch>
Date: Thu, 27 Jun 2024 22:32:14 +0200
Subject: [PATCH] Move ssh config to desktop role

---
 home/programs/ssh/default.nix          | 7 ++++++-
 home/roles/desktop/default.nix         | 1 +
 home/users/christian/shell/default.nix | 2 --
 home/users/christian/shell/ssh.nix     | 6 ------
 4 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 home/users/christian/shell/ssh.nix

diff --git a/home/programs/ssh/default.nix b/home/programs/ssh/default.nix
index 7f99b494..6299fd33 100644
--- 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
index 87a78d8d..61db849b 100644
--- 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
index cdbaeea7..855f261a 100644
--- 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
deleted file mode 100644
index e4cf619a..00000000
--- a/home/users/christian/shell/ssh.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  enable = true;
-  controlMaster = "auto";
-  controlPath = "~/.ssh/master-%r@%n:%p";
-  controlPersist = "10m";
-}