diff options
Diffstat (limited to 'systems/izumi')
| -rw-r--r-- | systems/izumi/izumi.scm | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm index b00c919..6e132b2 100644 --- a/systems/izumi/izumi.scm +++ b/systems/izumi/izumi.scm @@ -3,8 +3,7 @@ (define radicale-keys "/secrets/radicale/keys") (define dovecot-keys "/secrets/dovecot") -(use-modules (gnu system file-systems) - (gnu system keyboard) +(use-modules (gnu system keyboard) (gnu system mapped-devices) (guix build-system emacs) (guix gexp) @@ -442,7 +441,8 @@ (htpasswd-encryption 'plain)))))) (define swap-device-izumi-1-label - (file-system-label "izumi-swap-f")) + ((@ (gnu system file-systems) file-system-label) + "izumi-swap-f")) (define (syncthing) (use-modules (gnu services syncthing)) @@ -463,13 +463,15 @@ (define (file-systems-izumi) (use-modules (gnu system file-systems)) (append %base-file-systems - (list (file-system (device "/dev/sda1") - (mount-point "/boot/efi") - (type "vfat")) - (file-system (dependencies mapped-devices-izumi) - (device "/dev/mapper/izumi") - (mount-point "/") - (type "xfs"))))) + (list ((@ (gnu system file-systems) file-system) + (device "/dev/sda1") + (mount-point "/boot/efi") + (type "vfat")) + ((@ (gnu system file-systems) file-system) + (dependencies mapped-devices-izumi) + (device "/dev/mapper/izumi") + (mount-point "/") + (type "xfs"))))) (define groups-izumi (append %base-groups @@ -499,7 +501,8 @@ (syncthing)))) (define swap-device-izumi-1 - (swap-space (target swap-device-izumi-1-label))) + ((@ (gnu system file-systems) swap-space) + (target swap-device-izumi-1-label))) (define (users-izumi) (use-modules (gnu system shadow) |