diff options
| -rw-r--r-- | aisaka.org | 34 | ||||
| -rw-r--r-- | home-configuration.scm | 6 | ||||
| -rw-r--r-- | services/ssh-server.scm | 12 | ||||
| -rw-r--r-- | system-configuration.scm | 5 |
4 files changed, 14 insertions, 43 deletions
@@ -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 diff --git a/home-configuration.scm b/home-configuration.scm index 1a89920..212775a 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -6,8 +6,7 @@ #: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 ") @@ -132,7 +131,8 @@ "emacs-org-fc-tn")))))) (description "Custom version of ORG-FC.") (default-value #f))) - ssh-configuration + (simple-service 'ssh-configuration* home-files-service-type + `((".ssh/config" ,(local-file "ssh.config")))) (service (service-type (name 'trezor-user-packages) diff --git a/services/ssh-server.scm b/services/ssh-server.scm deleted file mode 100644 index 2fbdbfb..0000000 --- a/services/ssh-server.scm +++ /dev/null @@ -1,12 +0,0 @@ -(define-module (ssh-server) - #:use-module (gnu) - #:use-module (gnu home) - #:use-module (gnu home services) - #:use-module (gnu services ssh)) - -(define-public ssh-service - (service openssh-service-type)) - -(define-public ssh-configuration - (simple-service 'ssh-configuration* home-files-service-type - `((".ssh/config" ,(local-file "../ssh.config"))))) diff --git a/system-configuration.scm b/system-configuration.scm index d799cfd..feeddc4 100644 --- a/system-configuration.scm +++ b/system-configuration.scm @@ -10,8 +10,7 @@ #: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")) @@ -40,7 +39,7 @@ "nss-certs" "ntfs-3g")) %base-packages)) - (services (cons* ssh-service + (services (cons* (service openssh-service-type) (service (service-type (name 'trezor-system-packages) |