From patchwork Sun Oct 11 13:33:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 24559 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E847527BBEB; Sun, 11 Oct 2020 14:34:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A67A927BBEA for ; Sun, 11 Oct 2020 14:34:09 +0100 (BST) Received: from localhost ([::1]:49932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRbUG-0007Vh-N1 for patchwork@mira.cbaines.net; Sun, 11 Oct 2020 09:34:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRbUA-0007UH-Fk for guix-patches@gnu.org; Sun, 11 Oct 2020 09:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRbUA-0007mM-6S for guix-patches@gnu.org; Sun, 11 Oct 2020 09:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kRbUA-00065s-1P for guix-patches@gnu.org; Sun, 11 Oct 2020 09:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43922] [PATCH] installer: Add Emacs EXWM desktop environment. [WAS Re: Call for 1.2 installer testing.] Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Oct 2020 13:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43922 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: othacehe@gnu.org, 43922@debbugs.gnu.org Cc: guix-devel@gnu.org X-Debbugs-Original-To: Mathieu Othacehe , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160242322523400 (code B ref -1); Sun, 11 Oct 2020 13:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Oct 2020 13:33:45 +0000 Received: from localhost ([127.0.0.1]:39333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRbTt-00065K-9j for submit@debbugs.gnu.org; Sun, 11 Oct 2020 09:33:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:38078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kRbTq-00065A-7H for submit@debbugs.gnu.org; Sun, 11 Oct 2020 09:33:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRbTp-0007EY-Qm; Sun, 11 Oct 2020 09:33:41 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52243) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRbTp-0007iI-Gk; Sun, 11 Oct 2020 09:33:41 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=51448 helo=dundal.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kRbTo-0000vr-85; Sun, 11 Oct 2020 09:33:40 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <87h7r3k1qc.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 11 Oct 2020 15:33:38 +0200 In-Reply-To: <87h7r3k1qc.fsf@gnu.org> (Mathieu Othacehe's message of "Fri, 09 Oct 2020 14:44:43 +0200") Message-ID: <87blh8anv1.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Mathieu Othacehe writes: Hi, > The 1.2 release is on its way. So here's the traditional call for > installer testing. This time, the CI is building latest installer > images, which should ease testing. It works for me; I found Emacs EXWM missing however. After zenny also asked about that this morning, I decided to create a patch. Greetings, Janneke From 130480c4e76d7133f32a83cb1fa30aa171944383 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 11 Oct 2020 12:45:00 +0200 Subject: [PATCH] installer: Add Emacs EXWM desktop environment. Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Suggested by zenny via IRC. * gnu/installer/services.scm (%system-services): Add emacs, emacs-exwm, emacs-desktop-environment. * etc/release-manifest.scm (%system-packages): Likewise. * gnu/system/examples/lightweight-desktop.tmpl: Likewise. * gnu/installer/newt/services.scm (run-desktop-environments-cbt-page): Make one entry taller. --- etc/release-manifest.scm | 2 ++ gnu/installer/newt/services.scm | 3 ++- gnu/installer/services.scm | 6 ++++++ gnu/system/examples/lightweight-desktop.tmpl | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index caa200c673..7f54fe8768 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ludovic Courtès +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ TARGET." (append (map specification->package '("xorg-server" "xfce" "gnome" "mate" "enlightenment" "openbox" "awesome" "i3-wm" "ratpoison" + "emacs" "emacs-exwm" "emacs-desktop-environment" "xlockmore" "slock" "libreoffice" "connman" "network-manager" "network-manager-applet" "openssh" "ntp" "tor" diff --git a/gnu/installer/newt/services.scm b/gnu/installer/newt/services.scm index 4f32d9077b..6d431cb4bb 100644 --- a/gnu/installer/newt/services.scm +++ b/gnu/installer/newt/services.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +41,7 @@ choose the one to use on the log-in screen.") #:items items #:selection (map system-service-recommended? items) #:item->text system-service-name ;no i18n for DE names - #:checkbox-tree-height 8 + #:checkbox-tree-height 9 #:exit-button-callback-procedure (lambda () (raise diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index dbac79196d..ec5ea30594 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,11 @@ (name "ratpoison") (packages '((specification->package "ratpoison") (specification->package "xterm")))) + (desktop-environment + (name "Emacs EXWM") + (packages '((specification->package "emacs") + (specification->package "emacs-exwm") + (specification->package "emacs-desktop-environment")))) ;; Networking. (system-service diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl index b4037d4f79..8e38095a03 100644 --- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl @@ -4,7 +4,7 @@ (use-modules (gnu) (gnu system nss)) (use-service-modules desktop) -(use-package-modules bootloaders certs ratpoison suckless wm xorg) +(use-package-modules bootloaders certs emacs-xyz ratpoison suckless wm xorg) (operating-system (host-name "antelope") @@ -43,6 +43,7 @@ (packages (append (list ;; window managers ratpoison i3-wm i3status dmenu + emacs-exwm emacs-desktop-environment ;; terminal emulator xterm ;; for HTTPS access -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com