From 7a52f4dd2f8fb65b660092d75249e357037f7177 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Fri, 16 Feb 2024 22:57:16 +0100
Subject: Generate home-openssh-configuration instead of full service

This lets me extend the configuration, if I need to, by inheriting from the
generated configuration.
---
 tw/home.scm      | 6 +++---
 tw/home/btl.scm  | 4 +++-
 tw/home/cern.scm | 4 +++-
 tw/home/frm.scm  | 4 +++-
 tw/home/lap.scm  | 4 +++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tw/home.scm b/tw/home.scm
index 990c4c24..9eca91b9 100644
--- a/tw/home.scm
+++ b/tw/home.scm
@@ -668,9 +668,9 @@ show_border=1
 (define (make-own-ssh-host host port)
   (openssh-host (name host) (port port) (user "timo")))
 
-(define-public (openssh-service proxy-to-cern?)
-  (define no-proxy (list (proxy-jump (host-name "none"))))
-  (service home-openssh-service-type
+(export tw-openssh-configuration)
+(define* (tw-openssh-configuration #:key (proxy-to-cern? #t))
+  (let ((no-proxy (list (proxy-jump (host-name "none")))))
     (home-openssh-configuration
      (hosts
       ;; Earlier rules take precedence over later ones.
diff --git a/tw/home/btl.scm b/tw/home/btl.scm
index b75a9b04..2b27f70a 100644
--- a/tw/home/btl.scm
+++ b/tw/home/btl.scm
@@ -10,6 +10,7 @@
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services guix)
   #:use-module (gnu home services pm)
+  #:use-module (gnu home services ssh)
   #:use-module (gnu packages finance)
   #:use-module (gnu packages networking)
   #:use-module (gnu services)
@@ -72,7 +73,8 @@
                 (email "timo.wilken@cern.ch")
                 (signing-key "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C"))))))
 
-     (openssh-service #t)
+     (service home-openssh-service-type
+       (tw-openssh-configuration))
 
      (service home-gnupg-service-type
        (home-gnupg-configuration
diff --git a/tw/home/cern.scm b/tw/home/cern.scm
index 57232288..d00b29ac 100644
--- a/tw/home/cern.scm
+++ b/tw/home/cern.scm
@@ -10,6 +10,7 @@
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services guix)
   #:use-module (gnu home services pm)
+  #:use-module (gnu home services ssh)
   #:use-module (gnu packages)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages dav)
@@ -83,7 +84,8 @@
         (default-email "timo.wilken@cern.ch")
         (default-signing-key "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C")))
 
-     (openssh-service #f)
+     (service home-openssh-service-type
+       (tw-openssh-configuration #:proxy-to-cern? #f))
 
      (service home-gnupg-service-type
        (home-gnupg-configuration
diff --git a/tw/home/frm.scm b/tw/home/frm.scm
index 9123e711..64839757 100644
--- a/tw/home/frm.scm
+++ b/tw/home/frm.scm
@@ -10,6 +10,7 @@
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services guix)
   #:use-module (gnu home services pm)
+  #:use-module (gnu home services ssh)
   #:use-module (gnu packages finance)
   #:use-module (gnu packages networking)
   #:use-module (gnu services)
@@ -77,7 +78,8 @@
                 (email "timo.wilken@cern.ch")
                 (signing-key "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C"))))))
 
-     (openssh-service #t)
+     (service home-openssh-service-type
+       (tw-openssh-configuration))
 
      (service home-gnupg-service-type
        (home-gnupg-configuration
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index 42b7c17e..de6d2d76 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -10,6 +10,7 @@
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services guix)
   #:use-module (gnu home services pm)
+  #:use-module (gnu home services ssh)
   #:use-module (gnu packages finance)
   #:use-module (gnu packages networking)
   #:use-module (gnu services)
@@ -122,7 +123,8 @@
                 (email "timo.wilken@cern.ch")
                 (signing-key "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C"))))))
 
-     (openssh-service #t)
+     (service home-openssh-service-type
+       (tw-openssh-configuration))
 
      (service home-gnupg-service-type
        (home-gnupg-configuration
-- 
cgit v1.2.3