From 57d62332d20a1421d4c8cdce74b3060362ad0cd1 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Wed, 10 Jun 2020 08:22:02 +0200
Subject: [PATCH] config/guix/system/laptop-mimimi: Working minimal GNOME.

---
 .config/guix/system/laptop-mimimi.scm | 45 +++++++++++++++++----------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/.config/guix/system/laptop-mimimi.scm b/.config/guix/system/laptop-mimimi.scm
index 883566f3..5caa74c9 100644
--- a/.config/guix/system/laptop-mimimi.scm
+++ b/.config/guix/system/laptop-mimimi.scm
@@ -89,10 +89,8 @@ EndSection")
                         (xorg-configuration
                          (xorg-configuration
                           (modules (list xf86-video-vesa
-                                         xf86-video-fbdev
                                          xf86-video-intel
-                                         ;; xf86-video-nouveau
-                                         ))
+                                         xf86-input-libinput))
                           (extra-config (list %mimimi/xorg-touchpad)))))))))
 
 (define-public gnome-minimal
@@ -112,7 +110,7 @@ EndSection")
              "cheese"
              "eog"
              "epiphany"
-             "evince"             ; REVIEW: Keep for gnome-default-applications?
+             "evince"             ; TODO: Remains pulled in with gnome-default-applications.
              "file-roller"
              "gedit"
              "gnome-boxes"
@@ -127,7 +125,7 @@ EndSection")
              ;; "gnome-music"
              ;; "gnome-photos"
              "gnome-screenshot"
-             ;; "gnome-system-monitor" ; Needed for gnome-polkit-settings
+             ;; "gnome-system-monitor" ; TODO: Needed for gnome-polkit-settings: edit package to no break when gnome-system-monitor is missing.
              "gnome-terminal"
              "gnome-weather"
              "simple-scan"
@@ -135,27 +133,42 @@ EndSection")
              ;; Others
              "gnome-online-accounts")))))
 
+(define drive-mapping
+  (list (mapped-device
+         ;; The UUID is that returned by 'cryptsetup luksUUID'.
+         (source (uuid "17d4df8c-04dc-43aa-b017-f69cd3bc5a7d"))
+         (target "guix")
+         (type luks-device-mapping))))
+
+(define root-partition
+  (file-system
+    (device (file-system-label "guix"))
+    (mount-point "/")
+    (type "btrfs")
+    (options "subvol=rootfs,compress=zstd")
+    (dependencies drive-mapping)))
+
 (operating-system
   (inherit %ambrevar/default-os)
   (host-name "mimimi")
 
   (kernel linux)
 
-  ;; The UUID is that returned by 'cryptsetup luksUUID'.
-  (mapped-devices
-   (list (mapped-device
-          (source (uuid "b29cb68b-b154-4228-a131-34e9c474b0bd"))
-          (target "guix")
-          (type luks-device-mapping))))
+  (mapped-devices drive-mapping)
 
   (firmware (append (list iwlwifi-firmware)
                     %ambrevar/firmware))
 
-  (file-systems (cons* (file-system
-                         (device (file-system-label "guix"))
-                         (mount-point "/")
-                         (type "ext4")
-                         (dependencies mapped-devices))
+  (file-systems (cons* root-partition
+                       ;; TODO: Separate boot partition (to avoid double LUKS
+                       ;; password prompt) does not work:
+                       ;; (file-system
+                       ;;   (device (file-system-label "boot"))
+                       ;;   (mount-point "/boot")
+                       ;;   (type "ext4")
+                       ;;   ;; (needed-for-boot? #t)
+                       ;;   (dependencies (list root-partition))
+                       ;;   )
                        (file-system
                          (device (uuid "4E30-891F" 'fat))
                          (mount-point "/boot/efi")