diff options
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/systems/aisaka.scm | 4 | ||||
| -rw-r--r-- | deployment/systems/akashi.scm | 30 | ||||
| -rw-r--r-- | deployment/systems/ayase.scm | 5 |
3 files changed, 8 insertions, 31 deletions
diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm index c5c687c..508ebad 100644 --- a/deployment/systems/aisaka.scm +++ b/deployment/systems/aisaka.scm @@ -18,9 +18,6 @@ #:use-module ((sovereign devices amd64) #:prefix sovereign:devices:amd64:) #:use-module ((sovereign packages jekyll) #:prefix sovereign:packages:jekyll:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) - #:use-module ((suweren home) #:prefix suweren:home:) - #:use-module ((suweren system) #:prefix suweren:system:) - #:use-module ((suweren update) #:prefix suweren:update:) #:use-module ((users id1000) #:prefix users:id1000:) #:use-module ((users vmail) #:prefix users:vmail:)) @@ -193,7 +190,6 @@ (hide? #t) (path "/srv/git/marek/packages")))) (project-list (list "deployment.git" - "distribution.git" "nonguix.git" "sovereign.git")) (repository-directory "/var/lib/gitolite/repositories")))) diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index fba424b..dc2f65e 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -3,12 +3,10 @@ (define-module (deployment systems akashi) #:use-module ((gnu packages linux) #:prefix gnu:packages:linux:) - #:use-module ((gnu services) #:prefix gnu:services:) - #:use-module ((gnu services base) #:prefix gnu:services:base:) #:use-module ((gnu services guix) #:prefix gnu:services:guix:) #:use-module ((gnu system) #:prefix gnu:system:) + #:use-module ((gnu system file-systems) #:prefix gnu:system:file-systems:) #:use-module ((machines thinkpad-x200) #:prefix machines:thinkpad-x200:) - #:use-module ((sovereign channels) #:prefix sovereign:channels:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) #:use-module (users id1000)) @@ -24,35 +22,19 @@ "akashi") (define (file-systems) - (use-modules (suweren system)) - (append %suweren-file-systems - (list root-partition))) + (cons* root-partition + gnu:system:file-systems:%base-file-systems)) (define keyboard-layout* ((@ (gnu system keyboard) keyboard-layout) "pl")) -(define (guix-configuration record) - (gnu:services:base:guix-configuration - (inherit record) - (channels (list sovereign:channels:default-guix-channel - sovereign:channels:deployment-channel-staging - sovereign:channels:distribution-channel - sovereign:channels:nonguix-channel - sovereign:channels:sovereign-channel)))) - -(define %sovereign-services* - (gnu:services:modify-services sovereign:systems:%sovereign-services - (gnu:services:base:guix-service-type - record => (guix-configuration record)))) - (define (services) - (use-modules (suweren system)) (let* ((home-environments `((,uid1000-name ,uid1000-home-environment))) (guix-home ((@ (gnu services) service) gnu:services:guix:guix-home-service-type home-environments))) - (append %sovereign-services* + (append sovereign:systems:%sovereign-services (list guix-home ((@ (gnu services base) udev-rules-service) 'adb-udev @@ -80,7 +62,7 @@ (swap-devices (machines:thinkpad-x200:swap-devices* host-name*)) (users users) (timezone timezone*) - (locale polish-locale-string) - (locale-definitions %suweren-locale-definitions) + (locale sovereign:systems:pl-locale) + (locale-definitions sovereign:systems:%sovereign-locale-definitions) (services (services)) (sudoers-file sovereign:systems:%sovereign-sudoers-specification)))) diff --git a/deployment/systems/ayase.scm b/deployment/systems/ayase.scm index 9606c7b..933c211 100644 --- a/deployment/systems/ayase.scm +++ b/deployment/systems/ayase.scm @@ -10,7 +10,6 @@ #:use-module ((sovereign devices amd64) #:prefix sovereign:devices:amd64:) #:use-module ((sovereign packages protonmail) #:prefix sovereign:packages:protonmail:) #:use-module ((sovereign systems) #:prefix sovereign:systems:) - #:use-module ((suweren system) #:prefix suweren:system:) #:use-module ((users id1000) #:prefix users:id1000:)) (define efi-filesystem-uuid @@ -133,7 +132,7 @@ swap-device-2)) (users (users)) (timezone "Europe/Warsaw") - (locale suweren:system:polish-locale-string) - (locale-definitions suweren:system:%suweren-locale-definitions) + (locale sovereign:systems:pl-locale) + (locale-definitions sovereign:systems:%sovereign-locale-definitions) (services services) (sudoers-file sovereign:systems:%sovereign-sudoers-specification))) |