summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deployment/systems/aisaka.scm12
-rw-r--r--deployment/systems/akashi.scm13
-rw-r--r--deployment/systems/asakura.scm6
-rw-r--r--deployment/systems/cokolwiek.scm3
-rw-r--r--deployment/systems/mcdowell.scm3
-rw-r--r--deployment/systems/rakan.scm13
6 files changed, 9 insertions, 41 deletions
diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm
index c4c01ca..56dad04 100644
--- a/deployment/systems/aisaka.scm
+++ b/deployment/systems/aisaka.scm
@@ -33,8 +33,6 @@
#:prefix gnu:services:networking:)
#:use-module ((gnu services shepherd)
#:prefix gnu:services:shepherd:)
- #:use-module ((gnu services ssh)
- #:prefix gnu:services:ssh:)
#:use-module ((gnu services version-control)
#:prefix gnu:services:version-control:)
#:use-module ((gnu services web)
@@ -78,6 +76,8 @@
#:use-module ((users vmail)
#:prefix users:vmail:))
+(define-public architecture "x86_64-linux")
+
(define-public system-name "aisaka")
(define ip-multimedia "81.190.248.246")
@@ -531,10 +531,6 @@
gnu:services:base:guix-service-type
guix-offload-rakan))
-(define openssh
- (gnu:services:service
- gnu:services:ssh:openssh-service-type))
-
(define radicale-auth-configuration
(gnu:services:mail:radicale-auth-configuration
(type 'htpasswd)
@@ -699,9 +695,6 @@
(define guix-home-service
(sovereign:systems:guix-home-service named-home-environments))
-(define-public architecture
- "x86_64-linux")
-
(define-public system
(gnu:system:operating-system
(kernel nongnu:packages:linux:linux)
@@ -752,7 +745,6 @@
guix-publish-service
nginx
offload-rakan
- openssh
radicale
static-networking
iproute2-networking
diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm
index b7b8361..142ffae 100644
--- a/deployment/systems/akashi.scm
+++ b/deployment/systems/akashi.scm
@@ -37,6 +37,10 @@
#:use-module ((sovereign systems)
#:prefix sovereign:systems:))
+(define-public architecture "x86_64-linux")
+
+(define-public system-name "akashi")
+
(define root-partition
((@ (gnu system file-systems) file-system)
(mount-point "/")
@@ -45,9 +49,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define host-name*
- "akashi")
-
(define system-keyboard-layout
(gnu:system:keyboard:keyboard-layout "pl"))
@@ -87,18 +88,18 @@
gnu:system:%default-kernel-arguments))
(hurd #f)
(bootloader (machines:thinkpad-x200:bootloader-configuration* system-keyboard-layout))
- (label (sovereign:systems:operating-system-label* host-name*
+ (label (sovereign:systems:operating-system-label* system-name
gnu:system:this-operating-system))
(keyboard-layout system-keyboard-layout)
(initrd gnu:system:linux-initrd:base-initrd)
(initrd-modules gnu:system:linux-initrd:%base-initrd-modules)
(firmware (list))
- (host-name host-name*)
+ (host-name system-name)
(hosts-file #f)
(mapped-devices (list))
(file-systems (cons* root-partition
gnu:system:file-systems:%base-file-systems))
- (swap-devices (machines:thinkpad-x200:swap-devices* host-name*))
+ (swap-devices (machines:thinkpad-x200:swap-devices* system-name))
(users (list uid1000-account))
(groups gnu:system:shadow:%base-groups)
(skeletons (gnu:system:shadow:default-skeletons))
diff --git a/deployment/systems/asakura.scm b/deployment/systems/asakura.scm
index 5936ba1..5a617b8 100644
--- a/deployment/systems/asakura.scm
+++ b/deployment/systems/asakura.scm
@@ -52,11 +52,6 @@
((@ (gnu services) service)
virtlog-service-type))
-(define (openssh-service)
- (use-modules (gnu services ssh))
- ((@ (gnu services) service)
- openssh-service-type))
-
(define root-partition
(gnu:system:file-systems:file-system
(mount-point "/")
@@ -99,7 +94,6 @@
(append sovereign:systems:%sovereign-services
(list sovereign:packages:protonmail:nogui-profile
l-guix-home-service
- (openssh-service)
(system-packages-service)))))
(define swap-device-1
diff --git a/deployment/systems/cokolwiek.scm b/deployment/systems/cokolwiek.scm
index 9317926..5802376 100644
--- a/deployment/systems/cokolwiek.scm
+++ b/deployment/systems/cokolwiek.scm
@@ -10,8 +10,6 @@
#:prefix gnu:services:base:)
#:use-module ( (gnu services guix)
#:prefix gnu:services:guix:)
- #:use-module ( (gnu services ssh)
- #:prefix gnu:services:ssh:)
#:use-module ( (gnu system)
#:prefix gnu:system:)
#:use-module ( (gnu system file-systems)
@@ -79,7 +77,6 @@
(l-initrd-modules (cons* "mei_me"
gnu:system:linux-initrd:%base-initrd-modules))
(l-services (cons* l-guix-home-service
- (gnu:services:service gnu:services:ssh:openssh-service-type)
sovereign:packages:protonmail:nogui-profile
sovereign:systems:%sovereign-services))
(l-swap-devices (list swap))
diff --git a/deployment/systems/mcdowell.scm b/deployment/systems/mcdowell.scm
index 0ad5a35..7da49e8 100644
--- a/deployment/systems/mcdowell.scm
+++ b/deployment/systems/mcdowell.scm
@@ -12,8 +12,6 @@
#:prefix gnu:services:base:)
#:use-module ( (gnu services guix)
#:prefix gnu:services:guix:)
- #:use-module ( (gnu services ssh)
- #:prefix gnu:services:ssh:)
#:use-module ( (gnu system)
#:prefix gnu:system:)
#:use-module ( (gnu system file-systems)
@@ -93,7 +91,6 @@
(l-initrd-modules (cons* "mei_me"
gnu:system:linux-initrd:%base-initrd-modules))
(l-services (cons* l-guix-home-service
- (gnu:services:service gnu:services:ssh:openssh-service-type)
sovereign:packages:protonmail:nogui-profile
(gnu:services:simple-service 'offload-rakan
gnu:services:base:guix-service-type
diff --git a/deployment/systems/rakan.scm b/deployment/systems/rakan.scm
index 3510f00..62a06fb 100644
--- a/deployment/systems/rakan.scm
+++ b/deployment/systems/rakan.scm
@@ -19,8 +19,6 @@
#:prefix gnu:services:guix:)
#:use-module ( (gnu services samba)
#:prefix gnu:services:samba:)
- #:use-module ( (gnu services ssh)
- #:prefix gnu:services:ssh:)
#:use-module ( (gnu system)
#:prefix gnu:system:)
#:use-module ( (gnu system file-systems)
@@ -194,16 +192,6 @@
gnu:services:base:guix-service-type
guix-offload-authorizations))
-(define openssh-configuration
- (gnu:services:ssh:openssh-configuration
- (extra-content (string-append "\n"
- "ClientAliveInterval 10\n"
- "ClientAliveCountMax 10\n"))))
-
-(define openssh-service
- (gnu:services:service gnu:services:ssh:openssh-service-type
- openssh-configuration))
-
(define system
(gnu:system:operating-system
(kernel nongnu:packages:linux:linux)
@@ -240,7 +228,6 @@
(services (cons* guix-home-service
guix-publish-service
offload-auth
- openssh-service
sovereign:packages:protonmail:nogui-profile
samba-service
sovereign:systems:%sovereign-services))
generated by cgit v1.3 (git 2.53.0) at 2026-03-28 10:20:37 +0000