Merge branch 'dedistribution' into staging

1 files changed, 5 insertions, 6 deletions

diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm
index a7d48d2..dc2f65e 100644
--- a/deployment/systems/akashi.scm
+++ b/deployment/systems/akashi.scm
@@ -5,6 +5,7 @@
   #:use-module ((gnu packages linux)      #:prefix gnu:packages:linux:)
   #: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 systems)       #:prefix sovereign:systems:)
   #:use-module (users id1000))
@@ -21,16 +22,14 @@
   "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 (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
@@ -63,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))))