From 406295d13964fcce827d07e893981bf94a9922f0 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marekpasnikowski@protonmail.com>
Date: Tue, 10 Jan 2023 00:50:44 +0100
Subject: Define ssh-server module

---
 aisaka.org               | 47 +++++++++++++++++++++++++++++++++++++++++------
 home-configuration.scm   |  7 ++++---
 system-configuration.scm |  7 ++++---
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/aisaka.org b/aisaka.org
index a546e85..620ba27 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -40,6 +40,39 @@ This service installs flashrom.
      (default-value #f)))
 #+end_src
 
+* TODO System Servers
+** TODO Secure Shell
+
+#+name: ssh-server
+#+begin_src scheme :tangle services/ssh-server.scm :noweb yes
+  (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
+
+#+name: ssh-service
+#+begin_src scheme
+  (define-public ssh-service
+    (service openssh-service-type))
+#+end_src
+
+*** TODO SSH Configuration
+
+#+name: ssh-configuration
+#+begin_src scheme
+  (define-public ssh-configuration
+    (simple-service 'ssh-configuration* home-files-service-type
+		    `((".ssh/config" ,(local-file "../ssh.config")))))
+#+end_src
+
 * TODO Desktop Environment
 
 Sway is the currently chosen operating environment.
@@ -106,7 +139,8 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
     #:use-module (gnu services desktop)
     #:use-module (gnu services networking)
     #:use-module (gnu services ssh)
-    #:use-module (gnu services xorg))
+    #:use-module (gnu services xorg)
+    #:use-module (ssh-server))
 
   (define keyboard-layout
     (keyboard-layout "pl"))
@@ -138,11 +172,11 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
 			    "trezord"
 			    "trezord-udev-rules"))
 		     %base-packages))
-   (services (cons* (service cups-service-type
+   (services (cons* ssh-service
+		    (service cups-service-type
 			     (cups-configuration (extensions `(,cups-filters
 							       ,epson-inkjet-printer-escpr))
 						 (web-interface? #t)))
-		    (service openssh-service-type)
 		    (service tor-service-type
 			     (tor-configuration (config-file (local-file "torrc"))
 						(control-socket? #t)))
@@ -186,6 +220,7 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
     #:use-module (gnu packages)
     #:use-module (gnu services)
     #:use-module (guix gexp)
+    #:use-module (ssh-server)
     #:use-module (sway))
 
   (define allow-downgrades
@@ -289,7 +324,8 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
 		    "unzip"
 		    "zip")))
    (services
-    `(,sway-configuration
+    `(,ssh-configuration
+      ,sway-configuration
       ,(service flashrom-service-type)
       ,(service home-bash-service-type
 		(home-bash-configuration
@@ -316,8 +352,7 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
 		       `((".config/git/config" ,(local-file "git.config"))
 			 (".config/guix/shell-authorized-directories"
 			  ,(local-file "guix-shell-authorized-directories"))
-			 (".emacs" ,(local-file "emacs.el"))
-			 (".ssh/config" ,(local-file "ssh.config")))))))
+			 (".emacs" ,(local-file "emacs.el")))))))
 
 #+end_src
 
diff --git a/home-configuration.scm b/home-configuration.scm
index d6a3d16..7f4b395 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -8,6 +8,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu services)
   #:use-module (guix gexp)
+  #:use-module (ssh-server)
   #:use-module (sway))
 
 (define allow-downgrades
@@ -111,7 +112,8 @@
 		  "unzip"
 		  "zip")))
  (services
-  `(,sway-configuration
+  `(,ssh-configuration
+    ,sway-configuration
     ,(service flashrom-service-type)
     ,(service home-bash-service-type
 	      (home-bash-configuration
@@ -138,5 +140,4 @@
 		     `((".config/git/config" ,(local-file "git.config"))
 		       (".config/guix/shell-authorized-directories"
 			,(local-file "guix-shell-authorized-directories"))
-		       (".emacs" ,(local-file "emacs.el"))
-		       (".ssh/config" ,(local-file "ssh.config")))))))
+		       (".emacs" ,(local-file "emacs.el")))))))
diff --git a/system-configuration.scm b/system-configuration.scm
index 51174f7..bd8fd8d 100644
--- a/system-configuration.scm
+++ b/system-configuration.scm
@@ -9,7 +9,8 @@
   #:use-module (gnu services desktop)
   #:use-module (gnu services networking)
   #:use-module (gnu services ssh)
-  #:use-module (gnu services xorg))
+  #:use-module (gnu services xorg)
+  #:use-module (ssh-server))
 
 (define keyboard-layout
   (keyboard-layout "pl"))
@@ -41,11 +42,11 @@
 			  "trezord"
 			  "trezord-udev-rules"))
 		   %base-packages))
- (services (cons* (service cups-service-type
+ (services (cons* ssh-service
+		  (service cups-service-type
 			   (cups-configuration (extensions `(,cups-filters
 							     ,epson-inkjet-printer-escpr))
 					       (web-interface? #t)))
-		  (service openssh-service-type)
 		  (service tor-service-type
 			   (tor-configuration (config-file (local-file "torrc"))
 					      (control-socket? #t)))
-- 
cgit v1.2.3