From c7a1a3562e18fb2bcabc22edee8034bb2d3b36d0 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marekpasnikowski@protonmail.com>
Date: Tue, 7 Feb 2023 12:20:06 +0100
Subject: Integrate the SSH declaration

---
 aisaka.org | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

(limited to 'aisaka.org')

diff --git a/aisaka.org b/aisaka.org
index fec951f..9e95266 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -24,8 +24,7 @@ https://guix.gnu.org/en/manual/devel/en/html_node/System-Configuration.html
     #:use-module (gnu services networking)
     #:use-module (gnu services ssh)
     #:use-module (gnu services version-control)
-    #:use-module (gnu services xorg)
-    #:use-module (ssh-server))
+    #:use-module (gnu services xorg))
 
   (define keyboard-layout
     (keyboard-layout "pl"))
@@ -53,7 +52,7 @@ https://guix.gnu.org/en/manual/devel/en/html_node/System-Configuration.html
         "nss-certs"
         "ntfs-3g"))
      %base-packages))
-   (services (cons* ssh-service
+   (services (cons* <<ssh-system-service>>
                     <<trezor-system-packages>>
                     (service cups-service-type
                              (cups-configuration (extensions `(,cups-filters
@@ -100,8 +99,7 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
     #:use-module (gnu home services shells)
     #:use-module (gnu packages)
     #:use-module (gnu services)
-    #:use-module (guix gexp)
-    #:use-module (ssh-server))
+    #:use-module (guix gexp))
 
   (define allow-downgrades
     "--allow-downgrades ")
@@ -216,7 +214,7 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
                                     "emacs-org-fc-tn"))))))
        (description "Custom version of ORG-FC.")
        (default-value #f)))
-     ssh-configuration
+     <<ssh-user-configuration>>
      <<trezor-user-packages>>
      (service home-bash-service-type
               (home-bash-configuration
@@ -327,31 +325,17 @@ memory without overprovisioning, as well as to prolog the lifetime of SSD.
 
 ** TODO Secure Shell
 
-#+begin_src scheme :noweb-ref ssh-server :tangle services/ssh-server.scm
-  (define-module (ssh-server)
-    #:use-module (gnu)
-    #:use-module (gnu home)
-    #:use-module (gnu home services)
-    #:use-module (gnu services ssh))
-
-  <<ssh-service>>
-
-  <<ssh-configuration>>
-#+end_src
-
 *** TODO SSH Installation
 
-#+begin_src scheme :noweb-ref ssh-service
-  (define-public ssh-service
-    (service openssh-service-type))
+#+begin_src scheme :noweb-ref ssh-system-service
+  (service openssh-service-type)
 #+end_src
 
 *** TODO SSH Configuration
 
-#+begin_src scheme :noweb-ref ssh-configuration
-  (define-public ssh-configuration
-    (simple-service 'ssh-configuration* home-files-service-type
-		    `((".ssh/config" ,(local-file "../ssh.config")))))
+#+begin_src scheme :noweb-ref ssh-user-configuration
+  (simple-service 'ssh-configuration* home-files-service-type
+                  `((".ssh/config" ,(local-file "ssh.config"))))
 #+end_src
 
 * TODO Device Management
-- 
cgit v1.2.3