config/guix/system: Remove stumpwm and linux-nonfree from default.

.config/guix/system/default.scm

@@ -1,8 +1,7 @@
 (define-module (default)
   #:use-module (gnu)
   #:use-module (gnu system nss)
-  #:use-module (gnu system mapped-devices)
-  #:use-module (nongnu packages linux))
+  #:use-module (gnu system mapped-devices))
 
 (use-service-modules
  desktop
@@ -14,9 +13,8 @@
  ;; desktop                                ;
  linux                                  ; ntfs-3g
  mtools                                 ; exfat
- emacs-xyz                              ; EXWM
- ;; Stumpwm:
- wm)
+ ;; EXWM
+ emacs-xyz)
 
 (define %ambrevar/cdemu-vhba-udev-rule
  ;; For the "uaccess" tag to be applied properly, the rule must be executed
@@ -103,12 +101,8 @@ StrictNodes 1")
                  (timeout 1)
                  (target "/boot/efi")))
 
-    (kernel linux)
-    ;; (kernel-arguments
-    ;;  '("modprobe.blacklist=pcspkr"
-    ;;    "modprobe.blacklist=nouveau"))
     (firmware %ambrevar/firmware)
-    ;; TODO: Remove all virtio modules.
+    ;; TODO: Remove all virtio modules?
     (initrd-modules (delete "virtio-rng" %base-initrd-modules))
 
     ;; Assume the target root file system is labelled "guix",
@@ -149,7 +143,6 @@ StrictNodes 1")
                      ntfs-3g
                      ;; exfat-utils        ; TODO: Needed for macOS drives?  Does not seem to work.
                      fuse-exfat
-                     stumpwm
                      emacs-exwm
                      %base-packages))
 

.config/guix/system/desktop-bababa.scm

@@ -17,7 +17,9 @@
 (use-package-modules
  linux
  ;; nix:
- package-management)
+ package-management
+ ;; Stumpwm:
+ wm)
 
 (define %bababa/services
   (cons*
@@ -33,6 +35,7 @@
                (timeout 1)
                (target "/dev/sdb")))
 
+  (kernel linux)
   (firmware (append (list amdgpu-firmware)
                     %ambrevar/firmware))
 
@@ -53,6 +56,7 @@
                        %base-file-systems))
 
   (packages (cons* nix
+                   stumpwm
                    (operating-system-packages default-operating-system)))
 
   (services (cons*

.config/guix/system/laptop-mimimi.scm

@@ -18,7 +18,6 @@
 
 (use-package-modules
  linux                                  ; For custom kernel.
- wm                                     ; To remove stumpwm.
  ;; xf86-video-nouveau:
  xorg)
 
@@ -122,7 +121,12 @@ EndSection")
 (operating-system
   (inherit default-operating-system)
   (host-name "mimimi")
+
+  (kernel linux)
   ;; (kernel linux-xiaomi-air-13)
+  ;; (kernel-arguments
+  ;;  '("modprobe.blacklist=pcspkr"
+  ;;    "modprobe.blacklist=nouveau"))
 
   ;; The UUID is that returned by 'cryptsetup luksUUID'.
   (mapped-devices
@@ -149,6 +153,5 @@ EndSection")
                          (type "tmpfs")
                          (check? #f))
                        %base-file-systems))
-  (packages (delete stumpwm (operating-system-packages default-operating-system)))
   (services (cons* (service gnome-desktop-service-type)
                    %mimimi/services)))