diff options
| -rw-r--r-- | deployment/system.scm | 4 | ||||
| -rw-r--r-- | deployment/system/aisaka.scm | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/deployment/system.scm b/deployment/system.scm index 8cb6c8d..1eaeb49 100644 --- a/deployment/system.scm +++ b/deployment/system.scm @@ -98,9 +98,7 @@ (host-name deployment:system:aisaka:host-name-aisaka) (hosts-file #f) (mapped-devices (list)) - (file-systems (cons* deployment:system:aisaka:file-system-boot-aisaka - deployment:system:aisaka:file-system-root-aisaka - gnu:system:file-systems:%base-file-systems)) + (file-systems deployment:system:aisaka:file-systems) (swap-devices (list)) (users (cons* users:id1000:uid1000-account users:vmail:vmail-account diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index cca3ea6..66156a7 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -20,8 +20,7 @@ (define-module (deployment system aisaka) #:export (bootloader-aisaka - file-system-boot-aisaka - file-system-root-aisaka + file-systems host-name-aisaka) #:use-module (guix gexp) #:use-module (sovereign bootloader) @@ -293,15 +292,20 @@ (define bootloader-aisaka (custom-bootloader-configuration bootloader-configuration-targets-aisaka)) -(define file-system-boot-aisaka +(define file-system-boot (gnu:system:file-systems:file-system (inherit file-system/efi) (device (file-system-label* "BOOT")))) -(define file-system-root-aisaka +(define file-system-root (gnu:system:file-systems:file-system (inherit file-system/root) (device (file-system-label* host-name-aisaka "root")))) +(define file-systems + (cons* file-system-root + file-system-boot + gnu:system:file-systems:%base-file-systems)) + ;;; EOF |