.config/guix/system: Factor %ambrevar/file-systems.

master
Pierre Neidhardt 2021-01-26 11:48:56 +01:00
parent 8818a4bf87
commit ab7202a456
2 changed files with 20 additions and 17 deletions

View File

@ -180,6 +180,19 @@ StrictNodes 1")
;; TODO: Can we default to name? ;; TODO: Can we default to name?
(home-directory "/home/ambrevar"))) (home-directory "/home/ambrevar")))
(define-public %ambrevar/file-systems
(cons* (file-system
(device (file-system-label "guix"))
(mount-point "/")
(type "btrfs")
(options "subvol=rootfs,compress=zstd"))
(file-system
(mount-point "/tmp")
(device "none")
(type "tmpfs")
(check? #f))
%base-file-systems))
(define-public %ambrevar/default-os (define-public %ambrevar/default-os
(operating-system (operating-system
(host-name "ambrevar-system") (host-name "ambrevar-system")
@ -197,12 +210,12 @@ StrictNodes 1")
;; TODO: Remove all virtio modules? ;; TODO: Remove all virtio modules?
;; (initrd-modules (delete "virtio-rng" %base-initrd-modules)) ;; (initrd-modules (delete "virtio-rng" %base-initrd-modules))
(file-systems (cons* ;; WARNING: Each EFI system must set their own EFI partition!
(file-system (file-systems (cons* (file-system
(device (file-system-label "guix")) (device (uuid "CAE6-BFFA" 'fat))
(mount-point "/") (mount-point "/boot/efi")
(type "ext4")) (type "vfat"))
%base-file-systems)) %ambrevar-file-systems))
(users (cons* %ambrevar/user (users (cons* %ambrevar/user
%base-user-accounts)) %base-user-accounts))

View File

@ -52,17 +52,7 @@
(device (uuid "CAE6-BFFA" 'fat)) (device (uuid "CAE6-BFFA" 'fat))
(mount-point "/boot/efi") (mount-point "/boot/efi")
(type "vfat")) (type "vfat"))
(file-system %ambrevar-file-systems))
(device (file-system-label "guix"))
(mount-point "/")
(type "btrfs")
(options "subvol=rootfs,compress=zstd"))
(file-system
(mount-point "/tmp")
(device "none")
(type "tmpfs")
(check? #f))
%base-file-systems))
(packages (delete iw (operating-system-packages %ambrevar/default-os))) (packages (delete iw (operating-system-packages %ambrevar/default-os)))