From fa7ed4ed11b49adae64b907860974b9fe6385b8a Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Thu, 22 Oct 2020 11:44:24 +0200
Subject: [PATCH] config/guix/system/default: Use official
 emacs-exwm-no-x-toolkit.

---
 .config/guix/system/default.scm | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/.config/guix/system/default.scm b/.config/guix/system/default.scm
index ac87f4c9..52df4f04 100644
--- a/.config/guix/system/default.scm
+++ b/.config/guix/system/default.scm
@@ -2,9 +2,6 @@
 ;; guix size $(guix system -L ~/.config/guix/system build ~/.config/guix/system/default.scm)
 (define-module (default)
   #:use-module (srfi srfi-1)
-  #:use-module (guix packages)          ; For emacs-no-x-toolkit
-  #:use-module (guix build-system gnu)  ; For emacs-no-x-toolkit
-  #:use-module (guix utils)             ; For emacs-no-x-toolkit
   #:use-module (gnu)
   #:use-module (gnu system nss)
   #:use-module (gnu system mapped-devices))
@@ -86,32 +83,13 @@ StrictNodes 1")
                                        (list ;; %nitrokey-udev-rule
                                         %ambrevar/cdemu-vhba-udev-rule))))))))
 
-(define-public emacs-no-x-toolkit-xelb
-   (package
-     (inherit emacs-xelb)
-     (name "emacs-no-x-toolkit-xelb")
-     (arguments
-      (substitute-keyword-arguments (package-arguments emacs-xelb)
-        ((#:emacs emacs) `,emacs-no-x-toolkit)))))
-
-(define-public emacs-no-x-toolkit-exwm         ; No GTK, but the Slim service drags GTK+ anyways.
-   (package
-     (inherit emacs-exwm)
-     (name "emacs-no-x-toolkit-exwm")
-     (synopsis "Emacs X window manager (without X toolkit)")
-     (propagated-inputs
-      `(("emacs-no-x-toolkit-xelb" ,emacs-no-x-toolkit-xelb)))
-     (arguments
-      (substitute-keyword-arguments (package-arguments emacs-exwm)
-        ((#:emacs emacs) `,emacs-no-x-toolkit)))))
-
 (define-public %ambrevar/packages
   (cons* nss-certs          ; for HTTPS access
          ;; gvfs            ; TODO: For user mounts?
          ntfs-3g
          ;; exfat-utils     ; TODO: Needed for macOS drives?  Does not seem to work.
          fuse-exfat
-         emacs-no-x-toolkit-exwm   ; Still needs emacs-exwm / emacs-no-x-toolkit-exwm installed in a user profile.
+         emacs-exwm-no-x-toolkit   ; Still needs emacs-exwm / emacs-exwm-no-x-toolkit installed in a user profile.
          vhba-module        ; For CDEmu.
          (fold (lambda (package l) (delete package l))
                %base-packages