From ab7202a456a7ec7cb63f7bb4c8a85d181106e739 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Tue, 26 Jan 2021 11:48:56 +0100
Subject: [PATCH] .config/guix/system: Factor %ambrevar/file-systems.

---
 .config/guix/system/default.scm        | 25 +++++++++++++++++++------
 .config/guix/system/desktop-nanana.scm | 12 +-----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.config/guix/system/default.scm b/.config/guix/system/default.scm
index 6c3b383a..d747a907 100644
--- a/.config/guix/system/default.scm
+++ b/.config/guix/system/default.scm
@@ -180,6 +180,19 @@ StrictNodes 1")
    ;; TODO: Can we default to name?
    (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
   (operating-system
     (host-name "ambrevar-system")
@@ -197,12 +210,12 @@ StrictNodes 1")
     ;; TODO: Remove all virtio modules?
     ;; (initrd-modules (delete "virtio-rng" %base-initrd-modules))
 
-    (file-systems (cons*
-                   (file-system
-                     (device (file-system-label "guix"))
-                     (mount-point "/")
-                     (type "ext4"))
-                   %base-file-systems))
+    ;; WARNING: Each EFI system must set their own EFI partition!
+    (file-systems (cons* (file-system
+                           (device (uuid "CAE6-BFFA" 'fat))
+                           (mount-point "/boot/efi")
+                           (type "vfat"))
+                         %ambrevar-file-systems))
 
     (users (cons* %ambrevar/user
                   %base-user-accounts))
diff --git a/.config/guix/system/desktop-nanana.scm b/.config/guix/system/desktop-nanana.scm
index 8738f6b1..555c68b6 100644
--- a/.config/guix/system/desktop-nanana.scm
+++ b/.config/guix/system/desktop-nanana.scm
@@ -52,17 +52,7 @@
                            (device (uuid "CAE6-BFFA" 'fat))
                            (mount-point "/boot/efi")
                            (type "vfat"))
-                         (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))
+                         %ambrevar-file-systems))
 
     (packages (delete iw (operating-system-packages %ambrevar/default-os)))