config/guix/system/default: Replace emacs-lucid by emacs-no-x-toolkit.
parent
a96bf0f4db
commit
b2737fee16
|
@ -2,9 +2,9 @@
|
||||||
;; guix size $(guix system -L ~/.config/guix/system build ~/.config/guix/system/default.scm)
|
;; guix size $(guix system -L ~/.config/guix/system build ~/.config/guix/system/default.scm)
|
||||||
(define-module (default)
|
(define-module (default)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (guix packages) ; For emacs-lucid
|
#:use-module (guix packages) ; For emacs-no-x-toolkit
|
||||||
#:use-module (guix build-system gnu) ; For emacs-lucid
|
#:use-module (guix build-system gnu) ; For emacs-no-x-toolkit
|
||||||
#:use-module (guix utils) ; For emacs-lucid
|
#:use-module (guix utils) ; For emacs-no-x-toolkit
|
||||||
#:use-module (gnu)
|
#:use-module (gnu)
|
||||||
#:use-module (gnu system nss)
|
#:use-module (gnu system nss)
|
||||||
#:use-module (gnu system mapped-devices))
|
#:use-module (gnu system mapped-devices))
|
||||||
|
@ -19,9 +19,9 @@
|
||||||
linux ; ntfs-3g
|
linux ; ntfs-3g
|
||||||
mtools ; exfat
|
mtools ; exfat
|
||||||
nano ; To remove nano.
|
nano ; To remove nano.
|
||||||
emacs ; For emacs-lucid
|
emacs ; For emacs-no-x-toolkit
|
||||||
emacs-xyz ; EXWM
|
emacs-xyz ; EXWM
|
||||||
xorg ; For emacs-lucid
|
xorg ; For emacs-no-x-toolkit
|
||||||
;; To remove zile:
|
;; To remove zile:
|
||||||
zile)
|
zile)
|
||||||
|
|
||||||
|
@ -86,42 +86,24 @@ StrictNodes 1")
|
||||||
(list ;; %nitrokey-udev-rule
|
(list ;; %nitrokey-udev-rule
|
||||||
%ambrevar/cdemu-vhba-udev-rule))))))))
|
%ambrevar/cdemu-vhba-udev-rule))))))))
|
||||||
|
|
||||||
(define-public emacs-lucid
|
(define-public emacs-no-x-toolkit-xelb
|
||||||
(package
|
|
||||||
(inherit emacs)
|
|
||||||
(name "emacs-lucid")
|
|
||||||
(synopsis "The Emacs text editor with Lucid support")
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments (package-arguments emacs)
|
|
||||||
((#:configure-flags flags ''())
|
|
||||||
`(cons "--with-x-toolkit=lucid" ,flags))
|
|
||||||
((#:phases phases)
|
|
||||||
`(modify-phases ,phases
|
|
||||||
(delete 'restore-emacs-pdmp)
|
|
||||||
(delete 'strip-double-wrap)))))
|
|
||||||
(inputs
|
|
||||||
`(("libxaw" ,libxaw)
|
|
||||||
,@(alist-delete "gtk+" (package-inputs emacs))))))
|
|
||||||
|
|
||||||
(define-public emacs-lucid-xelb
|
|
||||||
(package
|
(package
|
||||||
(inherit emacs-xelb)
|
(inherit emacs-xelb)
|
||||||
(name "emacs-lucid-xelb")
|
(name "emacs-no-x-toolkit-xelb")
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments emacs-xelb)
|
(substitute-keyword-arguments (package-arguments emacs-xelb)
|
||||||
((#:emacs emacs) `,emacs-lucid)))))
|
((#:emacs emacs) `,emacs-no-x-toolkit)))))
|
||||||
|
|
||||||
(define-public emacs-lucid-exwm ; No GTK, but the Slim service drags GTK+ anyways.
|
(define-public emacs-no-x-toolkit-exwm ; No GTK, but the Slim service drags GTK+ anyways.
|
||||||
(package
|
(package
|
||||||
(inherit emacs-exwm)
|
(inherit emacs-exwm)
|
||||||
(name "emacs-lucid-exwm")
|
(name "emacs-no-x-toolkit-exwm")
|
||||||
(synopsis "Emacs X window manager (using Lucid toolkit)")
|
(synopsis "Emacs X window manager (without X toolkit)")
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("emacs-lucid-xelb" ,emacs-lucid-xelb)))
|
`(("emacs-no-x-toolkit-xelb" ,emacs-no-x-toolkit-xelb)))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments emacs-exwm)
|
(substitute-keyword-arguments (package-arguments emacs-exwm)
|
||||||
((#:emacs emacs) `,emacs-lucid)))))
|
((#:emacs emacs) `,emacs-no-x-toolkit)))))
|
||||||
|
|
||||||
(define-public %ambrevar/packages
|
(define-public %ambrevar/packages
|
||||||
(cons* nss-certs ; for HTTPS access
|
(cons* nss-certs ; for HTTPS access
|
||||||
|
@ -129,7 +111,7 @@ StrictNodes 1")
|
||||||
ntfs-3g
|
ntfs-3g
|
||||||
;; exfat-utils ; TODO: Needed for macOS drives? Does not seem to work.
|
;; exfat-utils ; TODO: Needed for macOS drives? Does not seem to work.
|
||||||
fuse-exfat
|
fuse-exfat
|
||||||
emacs-lucid-exwm ; Still needs emacs-exwm / emacs-lucid-exwm installed in a user profile.
|
emacs-no-x-toolkit-exwm ; Still needs emacs-exwm / emacs-no-x-toolkit-exwm installed in a user profile.
|
||||||
vhba-module ; For CDEmu.
|
vhba-module ; For CDEmu.
|
||||||
(fold (lambda (package l) (delete package l))
|
(fold (lambda (package l) (delete package l))
|
||||||
%base-packages
|
%base-packages
|
||||||
|
|
Loading…
Reference in New Issue