X-Loop: help-debbugs@HIDDEN
Subject: [bug#58585] [PATCH 0/2] gnu: home: Add home-mako-service-type.
Resent-From: "(" <paren@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 17 Oct 2022 16:39:02 +0000
Resent-Message-ID: <handler.58585.B.166602470021861 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 58585
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 58585 <at> debbugs.gnu.org
Cc: "\(" <paren@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.166602470021861
(code B ref -1); Mon, 17 Oct 2022 16:39:02 +0000
Received: (at submit) by debbugs.gnu.org; 17 Oct 2022 16:38:20 +0000
Received: from localhost ([127.0.0.1]:49749 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1okT88-0005gX-9L
for submit <at> debbugs.gnu.org; Mon, 17 Oct 2022 12:38:20 -0400
Received: from lists.gnu.org ([209.51.188.17]:49364)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1okT86-0005gP-J6
for submit <at> debbugs.gnu.org; Mon, 17 Oct 2022 12:38:18 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:52990)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <paren@HIDDEN>) id 1okT86-0006ET-Cf
for guix-patches@HIDDEN; Mon, 17 Oct 2022 12:38:18 -0400
Received: from knopi.disroot.org ([178.21.23.139]:33416)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <paren@HIDDEN>) id 1okT84-00014T-9g
for guix-patches@HIDDEN; Mon, 17 Oct 2022 12:38:18 -0400
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id C45834DB9C;
Mon, 17 Oct 2022 18:38:12 +0200 (CEST)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with UTF8SMTP id 0ZzGZCtiXm9v; Mon, 17 Oct 2022 18:38:11 +0200 (CEST)
From: "(" <paren@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1666024112; bh=4cnCJZvobNk5nGoeDMYjyOOz4+Ut1xay2IHtosyJdT4=;
h=From:To:Cc:Subject:Date;
b=XiUE55WuqejgBrOmmdvU2WXV3H259TrpqBDlf2tC+ibHrPqcS3TyCrvWMtQBQF8nB
wDM4AvCKovWz3DYlHNGjGvnp/EAA1e45MZw/sovIXRD4tzQbom5XgiYUJkhg1n1JEd
twoRMgcBvPkNtQ5L6UlribwiwWqAg/PgKCx2apj97dfCt3bD0HWyMsQfk+yEYEotDS
mvDg45lomGXI1XMm7kkVpk2ROleweazh6zmKuLmcyjbba7plApq/qpJGAPXp85QxUb
s2YfKB2Bc4gk8SgXyVoSe6FWVaLiYQigrymqWki5uwVx4A8SVgeekXoKO1GUgjecBD
Wo+PX6vMgQQDQ==
Date: Mon, 17 Oct 2022 17:28:28 +0100
Message-Id: <20221017162828.14482-1-paren@HIDDEN>
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@HIDDEN;
helo=knopi.disroot.org
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Heya,
This patchset adds a home service for configuring the Mako notification
daemon.
( (2):
gnu: mako: Patch makoctl to refer directly to binaries.
gnu: home: Add home-mako-service-type.
gnu/home/services/desktop.scm | 338 +++++++++++++++++++++++++++++++++-
gnu/packages/wm.scm | 36 +++-
2 files changed, 362 insertions(+), 12 deletions(-)
--
2.38.0
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: "(" <paren@HIDDEN>
Subject: bug#58585: Acknowledgement ([PATCH 0/2] gnu: home: Add
home-mako-service-type.)
Message-ID: <handler.58585.B.166602470021861.ack <at> debbugs.gnu.org>
References: <20221017162828.14482-1-paren@HIDDEN>
X-Gnu-PR-Message: ack 58585
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 58585 <at> debbugs.gnu.org
Date: Mon, 17 Oct 2022 16:39:02 +0000
Thank you for filing a new bug report with debbugs.gnu.org.
This is an automatically generated reply to let you know your message
has been received.
Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.
Your message has been sent to the package maintainer(s):
guix-patches@HIDDEN
If you wish to submit further information on this problem, please
send it to 58585 <at> debbugs.gnu.org.
Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.
--=20
58585: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D58585
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#58585] [PATCH 1/2] gnu: mako: Patch makoctl to refer directly to binaries.
References: <20221017162828.14482-1-paren@HIDDEN>
In-Reply-To: <20221017162828.14482-1-paren@HIDDEN>
Resent-From: "(" <paren@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 17 Oct 2022 16:52:02 +0000
Resent-Message-ID: <handler.58585.B58585.166602551223420 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 58585
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 58585 <at> debbugs.gnu.org
Cc: "\(" <paren@HIDDEN>
Received: via spool by 58585-submit <at> debbugs.gnu.org id=B58585.166602551223420
(code B ref 58585); Mon, 17 Oct 2022 16:52:02 +0000
Received: (at 58585) by debbugs.gnu.org; 17 Oct 2022 16:51:52 +0000
Received: from localhost ([127.0.0.1]:49785 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1okTLE-00065a-2N
for submit <at> debbugs.gnu.org; Mon, 17 Oct 2022 12:51:52 -0400
Received: from knopi.disroot.org ([178.21.23.139]:52508)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1okTLB-00065R-WB
for 58585 <at> debbugs.gnu.org; Mon, 17 Oct 2022 12:51:50 -0400
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 564394DAF5;
Mon, 17 Oct 2022 18:51:49 +0200 (CEST)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with UTF8SMTP id 3laPJ0DBw5hN; Mon, 17 Oct 2022 18:51:47 +0200 (CEST)
From: "(" <paren@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1666025227; bh=oTO0DeyhhChxq1EHkAKDFe6VXwx/dKma0ayueRkxFRI=;
h=From:To:Cc:Subject:Date;
b=hmmr40wX7aRTwWzWRRr4oQACJ0S6Ql2MeONpsPQOQS7hK9IbPErrVayPksQ1Y5Otn
aJsu8QmTA9NiCqqV/g4NioBWZt78w6NWSFJubLKNDck4nAZBaw1MVC38qhNLcRiUYe
FqaTTs3cCq6X6EiWro7CWwsfImgLFDtSFRBXG5+GOhKch6h56SSfW2hqqfkLneoll+
Yyht82wzHBgGxc0FVNStYf5WIZbP+yvx9mcD12Hc1COxkcbJuamvQy6+lLtdFCmes4
Q+dulyOEzzhNskxCWjo7DhAm0Ds3HmfBHBnEY9jYhoy0m7zfT31QMy9nXirKU45zaj
BYH7UN91gKaDg==
Date: Mon, 17 Oct 2022 17:47:02 +0100
Message-Id: <20221017164703.14949-1-paren@HIDDEN>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/wm.scm
(mako)[arguments]<#:phases>{'patch-makoctl}:
New phase. [inputs]: Add jq. --- gnu/packages/wm.scm | 36
++++++++++++++++++++++++++
1 file changed, 26 insertions(+), 10 d [...]
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
1.3 FROM_ONE_CHAR Bogus FROM name
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.3 (/)
* gnu/packages/wm.scm (mako)[arguments]<#:phases>{'patch-makoctl}:
New phase.
[inputs]: Add jq.
---
gnu/packages/wm.scm | 36 ++++++++++++++++++++++++++----------
1 file changed, 26 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index af406ed2ed..d96846a21c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -58,6 +58,7 @@
;;; Copyright © 2022 Elais Player <elais@HIDDEN>
;;; Copyright © 2022 Trevor Richards <trev@HIDDEN>
;;; Copyright © 2022 Fredrik Salomonsson <plattfot@HIDDEN>
+;;; Copyright © 2022 ( <paren@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1807,17 +1808,32 @@ (define-public mako
(package
(name "mako")
(version "1.7.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/emersion/mako")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz"))))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/emersion/mako")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz"))))
(build-system meson-build-system)
- (inputs (list basu cairo gdk-pixbuf pango wayland))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-makoctl
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "makoctl"
+ (("^BUSCTL=.*$")
+ (string-append
+ "BUSCTL="
+ (search-input-file inputs "bin/basuctl")
+ "\n"))
+ (("jq ")
+ (string-append
+ (search-input-file inputs "bin/jq")
+ " "))))))))
+ (inputs (list basu cairo gdk-pixbuf jq pango wayland))
(native-inputs (list pkg-config scdoc wayland-protocols))
(home-page "https://wayland.emersion.fr/mako")
(synopsis "Lightweight Wayland notification daemon")
--
2.38.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#58585] [PATCH 2/2] gnu: home: Add home-mako-service-type.
Resent-From: "(" <paren@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 17 Oct 2022 16:53:02 +0000
Resent-Message-ID: <handler.58585.B58585.166602552923472 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 58585
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 58585 <at> debbugs.gnu.org
Cc: "\(" <paren@HIDDEN>
Received: via spool by 58585-submit <at> debbugs.gnu.org id=B58585.166602552923472
(code B ref 58585); Mon, 17 Oct 2022 16:53:02 +0000
Received: (at 58585) by debbugs.gnu.org; 17 Oct 2022 16:52:09 +0000
Received: from localhost ([127.0.0.1]:49787 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1okTLH-00065s-Ld
for submit <at> debbugs.gnu.org; Mon, 17 Oct 2022 12:52:09 -0400
Received: from knopi.disroot.org ([178.21.23.139]:52806)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1okTLD-00065Y-Bz
for 58585 <at> debbugs.gnu.org; Mon, 17 Oct 2022 12:51:52 -0400
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id BFA4B4DAF5;
Mon, 17 Oct 2022 18:51:50 +0200 (CEST)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with UTF8SMTP id MNTjBjz0AhBl; Mon, 17 Oct 2022 18:51:49 +0200 (CEST)
From: "(" <paren@HIDDEN>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1666025228; bh=T+VTlJyztDSbdljieBgc+AZErc0RFT7GoIJ79AEcs0o=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=jg/8kzDJ8NsR995/qFVAFA95toPMBhHQVbeiVgF3IZq15lKV+N9TK8JP8iIA3T7HI
r4i8brDVO7eU+jm9uPQOH65W3wSY+Qb1pXttLAonApEtH6+cIndUUcRWYy5a8+g0Kz
/vw+fHiDOLiFpqgJ0GXoS4D/YBr0XskU2ly0pS+i1P9I8ITMnyCpfTVr/CsADu/Or/
n0ppH4WKhI53Pewvcg2n4thfK0ffT5mBu5LMS26CCCXnGwpiCwuBKpNb9rdJ+mDOQl
yTe2BlP49gZMGVlfrawfSSIUgrskbP/WUqmQCtT6kKSKhXWnzpJ4T1INOVvh3F4SxK
16kYfqFaVuKSg==
Date: Mon, 17 Oct 2022 17:47:03 +0100
Message-Id: <20221017164703.14949-2-paren@HIDDEN>
In-Reply-To: <20221017164703.14949-1-paren@HIDDEN>
References: <20221017164703.14949-1-paren@HIDDEN>
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/home/services/desktop.scm (home-mako-section,
home-mako-configuration):
New record types. (%home-mako-default-section,
%home-mako-default-grouped-section,
home-mako-service-type): New variables.
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
1.3 FROM_ONE_CHAR Bogus FROM name
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.3 (/)
* gnu/home/services/desktop.scm (home-mako-section,
home-mako-configuration): New record types.
(%home-mako-default-section, %home-mako-default-grouped-section,
home-mako-service-type): New variables.
Unfortunately, there is no way to actually use this service to
run the daemon itself, as Mako tries to connect to Wayland, which
is impossible as WAYLAND_DISPLAY is almost never set in session
Shepherd's environment. So, this service simply writes the
configuration file to $XDG_CONFIG_HOME/mako/config, and leave the
actual execution of ``mako'' to the user.
---
gnu/home/services/desktop.scm | 338 +++++++++++++++++++++++++++++++++-
1 file changed, 336 insertions(+), 2 deletions(-)
diff --git a/gnu/home/services/desktop.scm b/gnu/home/services/desktop.scm
index a2ab2b4d07..a929a7533a 100644
--- a/gnu/home/services/desktop.scm
+++ b/gnu/home/services/desktop.scm
@@ -22,17 +22,26 @@ (define-module (gnu home services desktop)
#:use-module (gnu home services shepherd)
#:use-module (gnu services configuration)
#:autoload (gnu packages glib) (dbus)
+ #:autoload (gnu packages wm) (mako)
#:autoload (gnu packages xdisorg) (redshift)
- #:use-module (guix records)
#:use-module (guix gexp)
+ #:use-module (guix records)
#:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-26)
+ #:use-module (ice-9 format)
#:use-module (ice-9 match)
#:export (home-redshift-configuration
home-redshift-configuration?
home-redshift-service-type
home-dbus-configuration
- home-dbus-service-type))
+ home-dbus-service-type
+
+ home-mako-section
+ %home-mako-default-section
+ %home-mako-default-grouped-section
+ home-mako-configuration
+ home-mako-service-type))
;;;
@@ -224,3 +233,328 @@ (define home-dbus-service-type
(default-value (home-dbus-configuration))
(description
"Run the session-specific D-Bus inter-process message bus.")))
+
+
+;;;
+;;; Mako.
+;;;
+
+(define-record-type* <home-mako-section>
+ home-mako-section make-home-mako-section
+ home-mako-section?
+
+ (if-app-name home-mako-if-app-name ;string | #f
+ (default #f))
+ (if-app-icon home-mako-if-app-icon ;string | #f
+ (default #f))
+ (if-summary home-mako-if-summary ;string | #f
+ (default #f))
+ (if-summary-regex? home-mako-if-summary-regex? ;boolean
+ (default #f))
+ (if-body home-mako-if-body ;string | #f
+ (default #f))
+ (if-body-regex? home-mako-if-body-regex? ;boolean
+ (default #f))
+ (if-urgency home-mako-if-urgency ;'low | 'normal | 'critical | #f
+ (default #f))
+ (if-category home-mako-if-category ;string | #f
+ (default #f))
+ (if-desktop-entry home-mako-if-desktop-entry ;string | #f
+ (default #f))
+ (if-actionable? home-mako-if-actionable? ;boolean | '()
+ (default '()))
+ (if-expiring? home-mako-if-expiring? ;boolean | '()
+ (default '()))
+ (if-mode home-mako-if-mode ;string | #f
+ (default #f))
+ (if-grouped? home-mako-if-grouped? ;boolean | '()
+ (default '()))
+ (if-group-index home-mako-if-group-index ;integer | #f
+ (default #f))
+ (if-hidden? home-mako-if-hidden? ;boolean | '()
+ (default '()))
+ (if-output home-mako-if-output ;string | #f
+ (default #f))
+ (if-anchor home-mako-if-anchor ;'top-right | 'top-center | 'top-left | 'bottom-right | 'bottom-center | 'bottom-left | 'center-right | 'center-left | 'center | #f
+ (default #f))
+
+ (on-button-left home-mako-on-button-left ;#f | 'default | 'dismiss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
+ (default 'default))
+ (on-button-middle home-mako-on-button-middle ;#f | 'default | 'dismiss | 'dismiss-all | 'dismiss-group | string | list of (file-like | string)
+ (default #f))
+ (on-button-right home-mako-on-button-right ;#f | 'default | 'dismiss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
+ (default 'dismiss))
+ (on-touch home-mako-on-touch ;#f | 'default | 'dismiss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
+ (default 'dismiss))
+ (on-notify home-mako-on-notify ;#f | 'default | 'dismiss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
+ (default #f))
+
+ (font home-mako-font ;string
+ (default "monospace"))
+ (font-size home-mako-font-size ;number
+ (default 10))
+
+ (background-color home-mako-background-color ;string
+ (default "285577FF"))
+ (text-color home-mako-text-color ;string
+ (default "FFFFFFFF"))
+
+ (width home-mako-width ;integer
+ (default 300))
+ (height home-mako-height ;integer
+ (default 100))
+ (outer-margin home-mako-outer-margin ;list of integer
+ (default '(0)))
+ (margin home-mako-margin ;list of integer
+ (default '(10)))
+ (padding home-mako-padding ;list of integer
+ (default '(5)))
+
+ (border-size home-mako-border-size ;integer
+ (default 2))
+ (border-color home-mako-border-color ;string
+ (default "4C7899FF"))
+ (border-radius home-mako-border-radius ;integer
+ (default 0))
+
+ (progress-color home-mako-progress-color ;string
+ (default "5588AAFF"))
+ (progress-style home-mako-progress-style ;'over | 'source
+ (default 'over))
+
+ (icons? home-mako-icons? ;boolean
+ (default #t))
+ (max-icon-size home-mako-max-icon-size ;integer
+ (default 64))
+ (icon-path home-mako-icon-path ;list of string
+ (default '()))
+ (icon-location home-mako-icon-location ;'left | 'right | 'top | 'bottom
+ (default 'left))
+
+ (markup? home-mako-markup? ;boolean
+ (default #t))
+ (actions? home-mako-actions? ;boolean
+ (default #t))
+ (history? home-mako-history? ;boolean
+ (default #t))
+ (invisible? home-mako-invisible? ;boolean
+ (default #f))
+
+ (format home-mako-format
+ (default "<b>%s</b>\\n%b"))
+ (text-alignment home-mako-text-alignment ;'left | 'center | 'right
+ (default 'left))
+
+ (default-timeout home-mako-default-timeout ;integer
+ (default 0))
+ (ignore-timeout? home-mako-ignore-timeout? ;boolean
+ (default #f))
+
+ (group-by home-mako-group-by ;list of string
+ (default #f))
+ (max-visible home-mako-max-visible ;integer
+ (default #f))
+
+ (output home-mako-output ;string
+ (default #f))
+ (layer home-mako-layer ;'background | 'bottom | 'top | 'overlay
+ (default 'top))
+ (anchor home-mako-anchor ;'top-right | 'top-center | 'top-left | 'bottom-right | 'bottom-center | 'bottom-left | 'center-right | 'center-left | 'center
+ (default #f)))
+
+(define (home-mako-configuration-header-attributes section)
+ (define (boolean-clause name field)
+ (let ((value (field section)))
+ (cond ((null? value) '())
+ (value (list "!" name " "))
+ (else (list name)))))
+
+ (define (string-clause name field)
+ (let ((value (field section)))
+ (if value
+ (list name "=\"" value "\" ")
+ '())))
+
+ (define (symbol-clause name field)
+ (if (field section)
+ (string-clause name (compose symbol->string field))
+ '()))
+
+ (define (number-clause name field)
+ (if (field section)
+ (string-clause name (compose number->string field))
+ '()))
+
+ (append (string-clause "app-name" home-mako-if-app-name)
+ (string-clause "app-icon" home-mako-if-app-icon)
+ (string-clause (if (home-mako-if-summary-regex? section)
+ "summary~"
+ "summary")
+ home-mako-if-summary)
+ (string-clause (if (home-mako-if-body-regex? section)
+ "body~"
+ "body")
+ home-mako-if-body)
+ (symbol-clause "urgency" home-mako-if-urgency)
+ (string-clause "category" home-mako-if-category)
+ (string-clause "desktop-entry" home-mako-if-desktop-entry)
+ (boolean-clause "actionable" home-mako-if-actionable?)
+ (boolean-clause "expiring" home-mako-if-expiring?)
+ (string-clause "mode" home-mako-if-mode)
+ (boolean-clause "grouped" home-mako-if-grouped?)
+ (number-clause "group-index" home-mako-if-group-index)
+ (boolean-clause "hidden" home-mako-if-hidden?)
+ (string-clause "output" home-mako-if-output)
+ (symbol-clause "anchor" home-mako-if-anchor)))
+
+(define (home-mako-configuration-header section)
+ (match (home-mako-configuration-header-attributes section)
+ (() '())
+ ((attributes ...)
+ (append (list "\n[ ") attributes (list "]\n")))))
+
+(define (home-mako-configuration-body section)
+ (define (string-clause name field)
+ (let ((value (field section)))
+ (if value
+ (list name "=" (field section) "\n")
+ '())))
+
+ (define (boolean-clause name field)
+ (list name "=" (if (field section) "1" "0") "\n"))
+
+ (define (number-clause name field)
+ (if (field section)
+ (string-clause name (compose number->string field))
+ '()))
+
+ (define (symbol-clause name field)
+ (if (field section)
+ (string-clause name (compose symbol->string field))
+ '()))
+
+ (define (colour-clause name field)
+ (string-clause name (compose (cute string-append "#" <>)
+ field)))
+
+ (define (directional-clause name field)
+ (if (field section)
+ (string-clause name (compose (cute string-join <> ",")
+ (cute map number->string <>)
+ field))
+ '()))
+
+ (define (event-clause name field)
+ (append (list name "=")
+ (match (field section)
+ ('default (list "invoke-default-action"))
+ ('dismiss (list "dismiss"))
+ ('dismiss-all (list "dismiss-all"))
+ ('dismiss-group (list "dismiss-group"))
+ ((args ...)
+ (append (list "exec")
+ (append-map (cute list " \"" <> "\"")
+ args)))
+ (#f (list "none")))
+ (list "\n")))
+
+ (append (event-clause "on-button-left" home-mako-on-button-left)
+ (event-clause "on-button-middle" home-mako-on-button-middle)
+ (event-clause "on-button-right" home-mako-on-button-right)
+ (event-clause "on-touch" home-mako-on-touch)
+ (event-clause "on-notify" home-mako-on-notify)
+ (list "font=" (home-mako-font section) " "
+ (number->string (home-mako-font-size section)) "\n")
+ (colour-clause "background-color" home-mako-background-color)
+ (colour-clause "text-color" home-mako-text-color)
+ (number-clause "width" home-mako-width)
+ (number-clause "height" home-mako-height)
+ (directional-clause "outer-margin" home-mako-outer-margin)
+ (directional-clause "margin" home-mako-margin)
+ (directional-clause "padding" home-mako-padding)
+ (number-clause "border-size" home-mako-border-size)
+ (colour-clause "border-color" home-mako-border-color)
+ (number-clause "border-radius" home-mako-border-radius)
+ (list "progress-color="
+ (symbol->string (home-mako-progress-style section))
+ " #" (home-mako-progress-color section) "\n")
+ (boolean-clause "icons" home-mako-icons?)
+ (number-clause "max-icon-size" home-mako-max-icon-size)
+ (string-clause "icon-path"
+ (compose (cute string-join <> ":")
+ home-mako-icon-path))
+ (symbol-clause "icon-location" home-mako-icon-location)
+ (boolean-clause "markup" home-mako-markup?)
+ (boolean-clause "actions" home-mako-actions?)
+ (boolean-clause "history" home-mako-history?)
+ (boolean-clause "invisible" home-mako-invisible?)
+ (string-clause "format" home-mako-format)
+ (symbol-clause "text-alignment" home-mako-text-alignment)
+ (number-clause "default-timeout" home-mako-default-timeout)
+ (boolean-clause "ignore-timeout" home-mako-ignore-timeout?)
+ (boolean-clause "ignore-timeout" home-mako-ignore-timeout?)
+ (if (home-mako-group-by section)
+ (string-clause "group-by"
+ (compose (cute string-join <> ",")
+ home-mako-group-by))
+ '())
+ (number-clause "max-visible" home-mako-max-visible)
+ (string-clause "output" home-mako-output)
+ (symbol-clause "layer" home-mako-layer)
+ (symbol-clause "anchor" home-mako-anchor)))
+
+(define (home-mako-configuration-section section)
+ (append (home-mako-configuration-header section)
+ (home-mako-configuration-body section)))
+
+(define %home-mako-default-section (home-mako-section))
+
+(define %home-mako-default-grouped-section
+ (home-mako-section
+ (if-grouped? #t)
+ (format "(%g) <b>%s</b>\\n%b")))
+
+(define-record-type* <home-mako-configuration>
+ home-mako-configuration make-home-mako-configuration
+ home-mako-configuration?
+
+ (mako home-mako-configuration-mako ;file-like
+ (default mako))
+ (sections home-mako-configuration-sections ;list of <home-mako-section>
+ (default (list %home-mako-default-section
+ %home-mako-default-grouped-section)))
+
+ (max-history home-mako-configuration-max-history ;integer
+ (default 5))
+ (sort home-mako-configuration-sort ;'time | 'priority
+ (default 'time))
+ (sort-order home-mako-configuration-sort-order ;'ascending | 'descending
+ (default 'descending)))
+
+(define (home-mako-configuration-file config)
+ (apply mixed-text-file "mako-config"
+ (append (list "max-history="
+ (number->string
+ (home-mako-configuration-max-history config))
+ "\n"
+ "sort="
+ (match (home-mako-configuration-sort-order config)
+ ('ascending "+")
+ ('descending "-"))
+ (symbol->string (home-mako-configuration-sort config))
+ "\n")
+ (append-map home-mako-configuration-section
+ (home-mako-configuration-sections config)))))
+
+(define (home-mako-xdg-configuration-files config)
+ `(("mako/config" ,(home-mako-configuration-file config))))
+
+(define home-mako-service-type
+ (service-type
+ (name 'home-mako)
+ (extensions
+ (list (service-extension home-xdg-configuration-files-service-type
+ home-mako-xdg-configuration-files)))
+ (default-value (home-mako-configuration))
+ (description
+ "Install and configure the @code{mako} notification daemon.")))
--
2.38.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#58585] [PATCH 1/2] gnu: mako: Patch makoctl to refer directly to binaries.
Resent-From: Andrew Tropin <andrew@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 10 Nov 2022 13:01:02 +0000
Resent-Message-ID: <handler.58585.B.16680852156606 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 58585
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 58585 <at> debbugs.gnu.org
Cc: "\(" <paren@HIDDEN>, Nicolas Graves <ngraves@HIDDEN>
X-Debbugs-Original-To: "( via Guix-patches via" <guix-patches@HIDDEN>, 58585 <at> debbugs.gnu.org
Received: via spool by submit <at> debbugs.gnu.org id=B.16680852156606
(code B ref -1); Thu, 10 Nov 2022 13:01:02 +0000
Received: (at submit) by debbugs.gnu.org; 10 Nov 2022 13:00:15 +0000
Received: from localhost ([127.0.0.1]:42248 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ot7AF-0001iU-0T
for submit <at> debbugs.gnu.org; Thu, 10 Nov 2022 08:00:15 -0500
Received: from lists.gnu.org ([209.51.188.17]:50914)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1ot7AC-0001iI-Ia
for submit <at> debbugs.gnu.org; Thu, 10 Nov 2022 08:00:14 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <andrew@HIDDEN>) id 1ot7A8-0000uX-Fj
for guix-patches@HIDDEN; Thu, 10 Nov 2022 08:00:12 -0500
Received: from relay6-d.mail.gandi.net ([2001:4b98:dc4:8::226])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <andrew@HIDDEN>) id 1ot7A5-0004eC-1Q
for guix-patches@HIDDEN; Thu, 10 Nov 2022 08:00:07 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id E2B7BC0008;
Thu, 10 Nov 2022 12:59:57 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1668085199;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=CDHAcSE2DVYc94dliMeYB+HhCEEVeUL0o0F0VQJFBWQ=;
b=bkmHLnG2L0k9dKtjiFVe7MKF53wqTzABZRLEccm/ozn+Bje8LCvaxYbtjBWm4x4T0BZ4yE
kAjH/RA3HumZKPtZD0JeZxVZcDkjv8pY0gHC3OxsPTrHHWOb/w1lj4uySAg5WFfBnEx/C/
IL2yHEGmbAK0ajl+RZ/yGAYSpbUoyO/kxVtAsmatNkAumJpK71aSHj/m+4JzeBsMJcp7z9
jJUA8232fumAC13PwsEojYgzmKb7GPgLEmOZTovkIdjVf+dGaORau4g2e3UmdlZKLi0AOr
/M091fLgA25JfgTni3KZw4vkdWVE59zWgOtKHIXbEJ5ju2HwgoclvaI/q/PBAA==
From: Andrew Tropin <andrew@HIDDEN>
In-Reply-To: <20221017164703.14949-1-paren@HIDDEN>
References: <20221017162828.14482-1-paren@HIDDEN>
<20221017164703.14949-1-paren@HIDDEN>
Date: Thu, 10 Nov 2022 16:59:53 +0400
Message-ID: <87v8nnufqu.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
Received-SPF: pass client-ip=2001:4b98:dc4:8::226; envelope-from=andrew@HIDDEN;
helo=relay6-d.mail.gandi.net
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.6 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.6 (--)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
On 2022-10-17 17:47, guix-patches@HIDDEN wrote:
> * gnu/packages/wm.scm (mako)[arguments]<#:phases>{'patch-makoctl}:
> New phase.
> [inputs]: Add jq.
> ---
> gnu/packages/wm.scm | 36 ++++++++++++++++++++++++++----------
> 1 file changed, 26 insertions(+), 10 deletions(-)
>
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index af406ed2ed..d96846a21c 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -58,6 +58,7 @@
> ;;; Copyright =C2=A9 2022 Elais Player <elais@HIDDEN>
> ;;; Copyright =C2=A9 2022 Trevor Richards <trev@HIDDEN>
> ;;; Copyright =C2=A9 2022 Fredrik Salomonsson <plattfot@HIDDEN>
> +;;; Copyright =C2=A9 2022 ( <paren@HIDDEN>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -1807,17 +1808,32 @@ (define-public mako
> (package
> (name "mako")
> (version "1.7.1")
> - (source
> - (origin
> - (method git-fetch)
> - (uri (git-reference
> - (url "https://github.com/emersion/mako")
> - (commit (string-append "v" version))))
> - (file-name (git-file-name name version))
> - (sha256
> - (base32 "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz"))=
))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/emersion/mako")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz"))=
))
> (build-system meson-build-system)
> - (inputs (list basu cairo gdk-pixbuf pango wayland))
> + (arguments
> + (list #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'patch-makoctl
> + (lambda* (#:key inputs #:allow-other-keys)
> + (substitute* "makoctl"
> + (("^BUSCTL=3D.*$")
> + (string-append
> + "BUSCTL=3D"
> + (search-input-file inputs "bin/basuctl")
> + "\n"))
> + (("jq ")
> + (string-append
> + (search-input-file inputs "bin/jq")
> + " "))))))))
> + (inputs (list basu cairo gdk-pixbuf jq pango wayland))
> (native-inputs (list pkg-config scdoc wayland-protocols))
> (home-page "https://wayland.emersion.fr/mako")
> (synopsis "Lightweight Wayland notification daemon")
Applied this patch and pushed, thank you.
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmNs9ckACgkQIgjSCVjB
3rC1Dw//Vhsmw81iZO2aVn9GiFgyLgIPw3O/5/iMY/uvWUKo5DTS+Mq1WcVE2UkS
1D7lVJ8FgQpXpCZuT5xDph0ke87X3uAe+zMWmxX8yUTOCecqfAaaZzyMtyIEU7SJ
HBHG5CSSnRF5cDpAtwMRlKtb0W5SY47scieZhRTgSc1sa8bnggTo3q+/AR1KjLlC
2MMz1a5GwoseC9fKgm/fhhYg2QLXFuQDq8AZeve/Kvp9aBqIpyqfh6O40S01HYTR
df6evKPoTOJtHd910m5UIiklEYrbat97b8VSN0quy35p/bYXT6r8vSOdDESkTsXm
Z0+qy5cWUEqCvdb/Pc+sUWKG9bSZPcNn7dx3dA4c09nRvxnc2ykra0KL7N0mkXp6
/wunIX7NbURF0Cqww57IpH7XB/I0PvgAYxDtzwdz4q0FyL1WPcgCcX++sMVVUdJz
tuSRRUxCLzQYgECb8dmYGa5bcfJFWnAMJPB6QvMrEAjacERHHUfGch1AzC9LM35b
VJRF7oVtHzXWutOHcOFmaGodVWfH9moIYQkD5c7F1YkGRdKQrzWj+nXqEzcQvZkb
1AltRCwkbt9/JBKOW94L6U8/BLQ/XfgcquOVuCL5rnJcKPOyG38m9id3Eu5On9Ka
6POWWAmF9NXe7Q22V0BqqmRb4e+pdTRxA0Emshl9sMuzxpz1WZI=
=zH07
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#58585] [PATCH 1/2] gnu: mako: Patch makoctl to refer directly to binaries.
Resent-From: Andrew Tropin <andrew@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 10 Nov 2022 13:01:02 +0000
Resent-Message-ID: <handler.58585.B58585.16680852126587 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 58585
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 58585 <at> debbugs.gnu.org
Cc: "\(" <paren@HIDDEN>, Nicolas Graves <ngraves@HIDDEN>
X-Debbugs-Original-To: "( via Guix-patches via" <guix-patches@HIDDEN>, 58585 <at> debbugs.gnu.org
Received: via spool by 58585-submit <at> debbugs.gnu.org id=B58585.16680852126587
(code B ref 58585); Thu, 10 Nov 2022 13:01:02 +0000
Received: (at 58585) by debbugs.gnu.org; 10 Nov 2022 13:00:12 +0000
Received: from localhost ([127.0.0.1]:42244 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ot7AB-0001i8-DI
for submit <at> debbugs.gnu.org; Thu, 10 Nov 2022 08:00:11 -0500
Received: from relay6-d.mail.gandi.net ([217.70.183.198]:51385)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1ot7A5-0001fa-4s
for 58585 <at> debbugs.gnu.org; Thu, 10 Nov 2022 08:00:10 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id E2B7BC0008;
Thu, 10 Nov 2022 12:59:57 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1668085199;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=CDHAcSE2DVYc94dliMeYB+HhCEEVeUL0o0F0VQJFBWQ=;
b=bkmHLnG2L0k9dKtjiFVe7MKF53wqTzABZRLEccm/ozn+Bje8LCvaxYbtjBWm4x4T0BZ4yE
kAjH/RA3HumZKPtZD0JeZxVZcDkjv8pY0gHC3OxsPTrHHWOb/w1lj4uySAg5WFfBnEx/C/
IL2yHEGmbAK0ajl+RZ/yGAYSpbUoyO/kxVtAsmatNkAumJpK71aSHj/m+4JzeBsMJcp7z9
jJUA8232fumAC13PwsEojYgzmKb7GPgLEmOZTovkIdjVf+dGaORau4g2e3UmdlZKLi0AOr
/M091fLgA25JfgTni3KZw4vkdWVE59zWgOtKHIXbEJ5ju2HwgoclvaI/q/PBAA==
From: Andrew Tropin <andrew@HIDDEN>
In-Reply-To: <20221017164703.14949-1-paren@HIDDEN>
References: <20221017162828.14482-1-paren@HIDDEN>
<20221017164703.14949-1-paren@HIDDEN>
Date: Thu, 10 Nov 2022 16:59:53 +0400
Message-ID: <87v8nnufqu.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
On 2022-10-17 17:47, guix-patches@HIDDEN wrote:
> * gnu/packages/wm.scm (mako)[arguments]<#:phases>{'patch-makoctl}:
> New phase.
> [inputs]: Add jq.
> ---
> gnu/packages/wm.scm | 36 ++++++++++++++++++++++++++----------
> 1 file changed, 26 insertions(+), 10 deletions(-)
>
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index af406ed2ed..d96846a21c 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -58,6 +58,7 @@
> ;;; Copyright =C2=A9 2022 Elais Player <elais@HIDDEN>
> ;;; Copyright =C2=A9 2022 Trevor Richards <trev@HIDDEN>
> ;;; Copyright =C2=A9 2022 Fredrik Salomonsson <plattfot@HIDDEN>
> +;;; Copyright =C2=A9 2022 ( <paren@HIDDEN>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -1807,17 +1808,32 @@ (define-public mako
> (package
> (name "mako")
> (version "1.7.1")
> - (source
> - (origin
> - (method git-fetch)
> - (uri (git-reference
> - (url "https://github.com/emersion/mako")
> - (commit (string-append "v" version))))
> - (file-name (git-file-name name version))
> - (sha256
> - (base32 "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz"))=
))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/emersion/mako")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz"))=
))
> (build-system meson-build-system)
> - (inputs (list basu cairo gdk-pixbuf pango wayland))
> + (arguments
> + (list #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'patch-makoctl
> + (lambda* (#:key inputs #:allow-other-keys)
> + (substitute* "makoctl"
> + (("^BUSCTL=3D.*$")
> + (string-append
> + "BUSCTL=3D"
> + (search-input-file inputs "bin/basuctl")
> + "\n"))
> + (("jq ")
> + (string-append
> + (search-input-file inputs "bin/jq")
> + " "))))))))
> + (inputs (list basu cairo gdk-pixbuf jq pango wayland))
> (native-inputs (list pkg-config scdoc wayland-protocols))
> (home-page "https://wayland.emersion.fr/mako")
> (synopsis "Lightweight Wayland notification daemon")
Applied this patch and pushed, thank you.
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmNs9ckACgkQIgjSCVjB
3rC1Dw//Vhsmw81iZO2aVn9GiFgyLgIPw3O/5/iMY/uvWUKo5DTS+Mq1WcVE2UkS
1D7lVJ8FgQpXpCZuT5xDph0ke87X3uAe+zMWmxX8yUTOCecqfAaaZzyMtyIEU7SJ
HBHG5CSSnRF5cDpAtwMRlKtb0W5SY47scieZhRTgSc1sa8bnggTo3q+/AR1KjLlC
2MMz1a5GwoseC9fKgm/fhhYg2QLXFuQDq8AZeve/Kvp9aBqIpyqfh6O40S01HYTR
df6evKPoTOJtHd910m5UIiklEYrbat97b8VSN0quy35p/bYXT6r8vSOdDESkTsXm
Z0+qy5cWUEqCvdb/Pc+sUWKG9bSZPcNn7dx3dA4c09nRvxnc2ykra0KL7N0mkXp6
/wunIX7NbURF0Cqww57IpH7XB/I0PvgAYxDtzwdz4q0FyL1WPcgCcX++sMVVUdJz
tuSRRUxCLzQYgECb8dmYGa5bcfJFWnAMJPB6QvMrEAjacERHHUfGch1AzC9LM35b
VJRF7oVtHzXWutOHcOFmaGodVWfH9moIYQkD5c7F1YkGRdKQrzWj+nXqEzcQvZkb
1AltRCwkbt9/JBKOW94L6U8/BLQ/XfgcquOVuCL5rnJcKPOyG38m9id3Eu5On9Ka
6POWWAmF9NXe7Q22V0BqqmRb4e+pdTRxA0Emshl9sMuzxpz1WZI=
=zH07
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#58585] [PATCH 2/2] gnu: home: Add home-mako-service-type.
Resent-From: Andrew Tropin <andrew@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 10 Nov 2022 13:18:01 +0000
Resent-Message-ID: <handler.58585.B.16680862338082 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 58585
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 58585 <at> debbugs.gnu.org
Cc: "\(" <paren@HIDDEN>, Nicolas Graves <ngraves@HIDDEN>
X-Debbugs-Original-To: "( via Guix-patches via" <guix-patches@HIDDEN>, 58585 <at> debbugs.gnu.org
Received: via spool by submit <at> debbugs.gnu.org id=B.16680862338082
(code B ref -1); Thu, 10 Nov 2022 13:18:01 +0000
Received: (at submit) by debbugs.gnu.org; 10 Nov 2022 13:17:13 +0000
Received: from localhost ([127.0.0.1]:42257 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ot7Qe-00026G-Dw
for submit <at> debbugs.gnu.org; Thu, 10 Nov 2022 08:17:13 -0500
Received: from lists.gnu.org ([209.51.188.17]:49576)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1ot7Qc-000268-2Q
for submit <at> debbugs.gnu.org; Thu, 10 Nov 2022 08:17:11 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <andrew@HIDDEN>) id 1ot7QY-0000hK-Ph
for guix-patches@HIDDEN; Thu, 10 Nov 2022 08:17:07 -0500
Received: from relay6-d.mail.gandi.net ([217.70.183.198])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <andrew@HIDDEN>) id 1ot7QM-0000LL-Gc
for guix-patches@HIDDEN; Thu, 10 Nov 2022 08:16:59 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id 2CFE6C0009;
Thu, 10 Nov 2022 13:16:49 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1668086211;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=MfiZ5P48QEZvEWL7wvgC+mY9mjbSPv0Kh9bWJO+hyBw=;
b=d1lzdgKN+Ru72RdXZ5VSd0k/U4HRHfMqrsEEw8JnD8t2SnKBA+wetsDgVWubEGw/OtZlIw
f1DMfqy+beqn2WcJTWt1sibXzJX7SmpHiXwLeABQPNAldPcB/zyCFM/U6z4NCXrfMq8OFi
5DKJdCrOdZuzdO9b/FtQyw32R9LiTWAI82ncRd9a+Ro2VP51WcQKcFTMty/brM0ufloxbD
NGXRCf4syn8fjg+JwFVHvlKuhkf8vW5w6LV8vDvmeoWS5t3Yea2qWik9Enl2/o/Dv6mofu
1YIMgc0xnqeop85MP51hr7dyzM+tEvKITw0ZWXfZIRkWOaUFj5PHxP6RHhXfsg==
From: Andrew Tropin <andrew@HIDDEN>
In-Reply-To: <20221017164703.14949-2-paren@HIDDEN>
References: <20221017164703.14949-1-paren@HIDDEN>
<20221017164703.14949-2-paren@HIDDEN>
Date: Thu, 10 Nov 2022 17:16:46 +0400
Message-ID: <87r0ybueyp.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
Received-SPF: pass client-ip=217.70.183.198; envelope-from=andrew@HIDDEN;
helo=relay6-d.mail.gandi.net
X-Spam_score_int: -23
X-Spam_score: -2.4
X-Spam_bar: --
X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1,
DKIM_SIGNED=0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.6 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.6 (--)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2022-10-17 17:47, "\( via Guix-patches" via wrote:
> * gnu/home/services/desktop.scm (home-mako-section,
> home-mako-configuration): New record types.
> (%home-mako-default-section, %home-mako-default-grouped-section,
> home-mako-service-type): New variables.
>
> Unfortunately, there is no way to actually use this service to
> run the daemon itself, as Mako tries to connect to Wayland, which
> is impossible as WAYLAND_DISPLAY is almost never set in session
> Shepherd's environment. So, this service simply writes the
> configuration file to $XDG_CONFIG_HOME/mako/config, and leave the
> actual execution of ``mako'' to the user.
After recent updates to shepherd service
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D70d58d1556
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D6cdde65bb5
it's now possible to start shepherd manually.
In rde we start shepherd by sway, so it inherits all wayland related
variables.
https://git.sr.ht/~abcdw/rde/tree/101313a691/rde/features/wm.scm#L137
It's not a perfect solution, but good enough.
> ---
> gnu/home/services/desktop.scm | 338 +++++++++++++++++++++++++++++++++-
> 1 file changed, 336 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/home/services/desktop.scm b/gnu/home/services/desktop.scm
> index a2ab2b4d07..a929a7533a 100644
> --- a/gnu/home/services/desktop.scm
> +++ b/gnu/home/services/desktop.scm
> @@ -22,17 +22,26 @@ (define-module (gnu home services desktop)
> #:use-module (gnu home services shepherd)
> #:use-module (gnu services configuration)
> #:autoload (gnu packages glib) (dbus)
> + #:autoload (gnu packages wm) (mako)
> #:autoload (gnu packages xdisorg) (redshift)
> - #:use-module (guix records)
> #:use-module (guix gexp)
> + #:use-module (guix records)
> #:use-module (srfi srfi-1)
> + #:use-module (srfi srfi-26)
> + #:use-module (ice-9 format)
> #:use-module (ice-9 match)
> #:export (home-redshift-configuration
> home-redshift-configuration?
> home-redshift-service-type
>=20=20
> home-dbus-configuration
> - home-dbus-service-type))
> + home-dbus-service-type
> +
> + home-mako-section
> + %home-mako-default-section
> + %home-mako-default-grouped-section
> + home-mako-configuration
> + home-mako-service-type))
>=20=20
>
> ;;;
> @@ -224,3 +233,328 @@ (define home-dbus-service-type
> (default-value (home-dbus-configuration))
> (description
> "Run the session-specific D-Bus inter-process message bus.")))
> +
> +
> +;;;
> +;;; Mako.
> +;;;
> +
> +(define-record-type* <home-mako-section>
> + home-mako-section make-home-mako-section
> + home-mako-section?
> +
> + (if-app-name home-mako-if-app-name ;string | #f
> + (default #f))
> + (if-app-icon home-mako-if-app-icon ;string | #f
> + (default #f))
> + (if-summary home-mako-if-summary ;string | #f
> + (default #f))
> + (if-summary-regex? home-mako-if-summary-regex? ;boolean
> + (default #f))
> + (if-body home-mako-if-body ;string | #f
> + (default #f))
> + (if-body-regex? home-mako-if-body-regex? ;boolean
> + (default #f))
> + (if-urgency home-mako-if-urgency ;'low | 'normal | 'crit=
ical | #f
> + (default #f))
> + (if-category home-mako-if-category ;string | #f
> + (default #f))
> + (if-desktop-entry home-mako-if-desktop-entry ;string | #f
> + (default #f))
> + (if-actionable? home-mako-if-actionable? ;boolean | '()
> + (default '()))
> + (if-expiring? home-mako-if-expiring? ;boolean | '()
> + (default '()))
> + (if-mode home-mako-if-mode ;string | #f
> + (default #f))
> + (if-grouped? home-mako-if-grouped? ;boolean | '()
> + (default '()))
> + (if-group-index home-mako-if-group-index ;integer | #f
> + (default #f))
> + (if-hidden? home-mako-if-hidden? ;boolean | '()
> + (default '()))
> + (if-output home-mako-if-output ;string | #f
> + (default #f))
> + (if-anchor home-mako-if-anchor ;'top-right | 'top-cent=
er | 'top-left | 'bottom-right | 'bottom-center | 'bottom-left | 'center-ri=
ght | 'center-left | 'center | #f
> + (default #f))
> +
> + (on-button-left home-mako-on-button-left ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
> + (default 'default))
> + (on-button-middle home-mako-on-button-middle ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | string | list of (file-like | string)
> + (default #f))
> + (on-button-right home-mako-on-button-right ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
> + (default 'dismiss))
> + (on-touch home-mako-on-touch ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
> + (default 'dismiss))
> + (on-notify home-mako-on-notify ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
> + (default #f))
> +
> + (font home-mako-font ;string
> + (default "monospace"))
> + (font-size home-mako-font-size ;number
> + (default 10))
> +
> + (background-color home-mako-background-color ;string
> + (default "285577FF"))
> + (text-color home-mako-text-color ;string
> + (default "FFFFFFFF"))
> +
> + (width home-mako-width ;integer
> + (default 300))
> + (height home-mako-height ;integer
> + (default 100))
> + (outer-margin home-mako-outer-margin ;list of integer
> + (default '(0)))
> + (margin home-mako-margin ;list of integer
> + (default '(10)))
> + (padding home-mako-padding ;list of integer
> + (default '(5)))
> +
> + (border-size home-mako-border-size ;integer
> + (default 2))
> + (border-color home-mako-border-color ;string
> + (default "4C7899FF"))
> + (border-radius home-mako-border-radius ;integer
> + (default 0))
> +
> + (progress-color home-mako-progress-color ;string
> + (default "5588AAFF"))
> + (progress-style home-mako-progress-style ;'over | 'source
> + (default 'over))
> +
> + (icons? home-mako-icons? ;boolean
> + (default #t))
> + (max-icon-size home-mako-max-icon-size ;integer
> + (default 64))
> + (icon-path home-mako-icon-path ;list of string
> + (default '()))
> + (icon-location home-mako-icon-location ;'left | 'right | 'top =
| 'bottom
> + (default 'left))
> +
> + (markup? home-mako-markup? ;boolean
> + (default #t))
> + (actions? home-mako-actions? ;boolean
> + (default #t))
> + (history? home-mako-history? ;boolean
> + (default #t))
> + (invisible? home-mako-invisible? ;boolean
> + (default #f))
> +
> + (format home-mako-format
> + (default "<b>%s</b>\\n%b"))
> + (text-alignment home-mako-text-alignment ;'left | 'center | 'rig=
ht
> + (default 'left))
> +
> + (default-timeout home-mako-default-timeout ;integer
> + (default 0))
> + (ignore-timeout? home-mako-ignore-timeout? ;boolean
> + (default #f))
> +
> + (group-by home-mako-group-by ;list of string
> + (default #f))
> + (max-visible home-mako-max-visible ;integer
> + (default #f))
> +
> + (output home-mako-output ;string
> + (default #f))
> + (layer home-mako-layer ;'background | 'bottom =
| 'top | 'overlay
> + (default 'top))
> + (anchor home-mako-anchor ;'top-right | 'top-cent=
er | 'top-left | 'bottom-right | 'bottom-center | 'bottom-left | 'center-ri=
ght | 'center-left | 'center
> + (default #f)))
> +
> +(define (home-mako-configuration-header-attributes section)
> + (define (boolean-clause name field)
> + (let ((value (field section)))
> + (cond ((null? value) '())
> + (value (list "!" name " "))
> + (else (list name)))))
> +
> + (define (string-clause name field)
> + (let ((value (field section)))
> + (if value
> + (list name "=3D\"" value "\" ")
> + '())))
> +
> + (define (symbol-clause name field)
> + (if (field section)
> + (string-clause name (compose symbol->string field))
> + '()))
> +
> + (define (number-clause name field)
> + (if (field section)
> + (string-clause name (compose number->string field))
> + '()))
> +
> + (append (string-clause "app-name" home-mako-if-app-name)
> + (string-clause "app-icon" home-mako-if-app-icon)
> + (string-clause (if (home-mako-if-summary-regex? section)
> + "summary~"
> + "summary")
> + home-mako-if-summary)
> + (string-clause (if (home-mako-if-body-regex? section)
> + "body~"
> + "body")
> + home-mako-if-body)
> + (symbol-clause "urgency" home-mako-if-urgency)
> + (string-clause "category" home-mako-if-category)
> + (string-clause "desktop-entry" home-mako-if-desktop-entry)
> + (boolean-clause "actionable" home-mako-if-actionable?)
> + (boolean-clause "expiring" home-mako-if-expiring?)
> + (string-clause "mode" home-mako-if-mode)
> + (boolean-clause "grouped" home-mako-if-grouped?)
> + (number-clause "group-index" home-mako-if-group-index)
> + (boolean-clause "hidden" home-mako-if-hidden?)
> + (string-clause "output" home-mako-if-output)
> + (symbol-clause "anchor" home-mako-if-anchor)))
> +
> +(define (home-mako-configuration-header section)
> + (match (home-mako-configuration-header-attributes section)
> + (() '())
> + ((attributes ...)
> + (append (list "\n[ ") attributes (list "]\n")))))
> +
> +(define (home-mako-configuration-body section)
> + (define (string-clause name field)
> + (let ((value (field section)))
> + (if value
> + (list name "=3D" (field section) "\n")
> + '())))
> +
> + (define (boolean-clause name field)
> + (list name "=3D" (if (field section) "1" "0") "\n"))
> +
> + (define (number-clause name field)
> + (if (field section)
> + (string-clause name (compose number->string field))
> + '()))
> +
> + (define (symbol-clause name field)
> + (if (field section)
> + (string-clause name (compose symbol->string field))
> + '()))
> +
> + (define (colour-clause name field)
> + (string-clause name (compose (cute string-append "#" <>)
> + field)))
> +
> + (define (directional-clause name field)
> + (if (field section)
> + (string-clause name (compose (cute string-join <> ",")
> + (cute map number->string <>)
> + field))
> + '()))
> +
> + (define (event-clause name field)
> + (append (list name "=3D")
> + (match (field section)
> + ('default (list "invoke-default-action"))
> + ('dismiss (list "dismiss"))
> + ('dismiss-all (list "dismiss-all"))
> + ('dismiss-group (list "dismiss-group"))
> + ((args ...)
> + (append (list "exec")
> + (append-map (cute list " \"" <> "\"")
> + args)))
> + (#f (list "none")))
> + (list "\n")))
> +
> + (append (event-clause "on-button-left" home-mako-on-button-left)
> + (event-clause "on-button-middle" home-mako-on-button-middle)
> + (event-clause "on-button-right" home-mako-on-button-right)
> + (event-clause "on-touch" home-mako-on-touch)
> + (event-clause "on-notify" home-mako-on-notify)
> + (list "font=3D" (home-mako-font section) " "
> + (number->string (home-mako-font-size section)) "\n")
> + (colour-clause "background-color" home-mako-background-color)
> + (colour-clause "text-color" home-mako-text-color)
> + (number-clause "width" home-mako-width)
> + (number-clause "height" home-mako-height)
> + (directional-clause "outer-margin" home-mako-outer-margin)
> + (directional-clause "margin" home-mako-margin)
> + (directional-clause "padding" home-mako-padding)
> + (number-clause "border-size" home-mako-border-size)
> + (colour-clause "border-color" home-mako-border-color)
> + (number-clause "border-radius" home-mako-border-radius)
> + (list "progress-color=3D"
> + (symbol->string (home-mako-progress-style section))
> + " #" (home-mako-progress-color section) "\n")
> + (boolean-clause "icons" home-mako-icons?)
> + (number-clause "max-icon-size" home-mako-max-icon-size)
> + (string-clause "icon-path"
> + (compose (cute string-join <> ":")
> + home-mako-icon-path))
> + (symbol-clause "icon-location" home-mako-icon-location)
> + (boolean-clause "markup" home-mako-markup?)
> + (boolean-clause "actions" home-mako-actions?)
> + (boolean-clause "history" home-mako-history?)
> + (boolean-clause "invisible" home-mako-invisible?)
> + (string-clause "format" home-mako-format)
> + (symbol-clause "text-alignment" home-mako-text-alignment)
> + (number-clause "default-timeout" home-mako-default-timeout)
> + (boolean-clause "ignore-timeout" home-mako-ignore-timeout?)
> + (boolean-clause "ignore-timeout" home-mako-ignore-timeout?)
> + (if (home-mako-group-by section)
> + (string-clause "group-by"
> + (compose (cute string-join <> ",")
> + home-mako-group-by))
> + '())
> + (number-clause "max-visible" home-mako-max-visible)
> + (string-clause "output" home-mako-output)
> + (symbol-clause "layer" home-mako-layer)
> + (symbol-clause "anchor" home-mako-anchor)))
> +
> +(define (home-mako-configuration-section section)
> + (append (home-mako-configuration-header section)
> + (home-mako-configuration-body section)))
> +
> +(define %home-mako-default-section (home-mako-section))
> +
> +(define %home-mako-default-grouped-section
> + (home-mako-section
> + (if-grouped? #t)
> + (format "(%g) <b>%s</b>\\n%b")))
> +
> +(define-record-type* <home-mako-configuration>
> + home-mako-configuration make-home-mako-configuration
> + home-mako-configuration?
> +
> + (mako home-mako-configuration-mako ;file-like
> + (default mako))
> + (sections home-mako-configuration-sections ;list of <home-mako-sec=
tion>
> + (default (list %home-mako-default-section
> + %home-mako-default-grouped-section)))
> +
> + (max-history home-mako-configuration-max-history ;integer
> + (default 5))
> + (sort home-mako-configuration-sort ;'time | 'priority
> + (default 'time))
> + (sort-order home-mako-configuration-sort-order ;'ascending | 'descendi=
ng
> + (default 'descending)))
> +
> +(define (home-mako-configuration-file config)
> + (apply mixed-text-file "mako-config"
> + (append (list "max-history=3D"
> + (number->string
> + (home-mako-configuration-max-history config))
> + "\n"
> + "sort=3D"
> + (match (home-mako-configuration-sort-order config)
> + ('ascending "+")
> + ('descending "-"))
> + (symbol->string (home-mako-configuration-sort con=
fig))
> + "\n")
> + (append-map home-mako-configuration-section
> + (home-mako-configuration-sections config)))=
))
> +
> +(define (home-mako-xdg-configuration-files config)
> + `(("mako/config" ,(home-mako-configuration-file config))))
> +
> +(define home-mako-service-type
> + (service-type
> + (name 'home-mako)
> + (extensions
> + (list (service-extension home-xdg-configuration-files-service-type
> + home-mako-xdg-configuration-files)))
> + (default-value (home-mako-configuration))
> + (description
> + "Install and configure the @code{mako} notification daemon.")))
In the coming days, I won't have time to try and check all the options
provided here, sorry, maybe someone else would jump in and review this
service in the meantime.
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmNs+b4ACgkQIgjSCVjB
3rD10RAAjKu7Fl2DaAgTVqs6GEZC9Lj+whiH8CBOXMHzSHJBf8hCGhS2zIufQhF1
IpqXiH5vNdD68FAQ6Qv73cTL9dzHvP4ISujy74t7hq/u7kny0B4xqtk/2v/8f7Bt
TgxS+YckxLxo6JG9HLXCOz76SDAI1EhsA8mr+FSp9OoFu+aFnjYceFsXH3RIWHk/
nOusJSpvcdx8NFI2RFo/5oRF7Z9qrAfGtpXkM53y1Qq/KHvU7qux4VVMclw7IXFD
u0W0OzGVC1ezJpPsF9n8xsZiBUW1WlIkrYeN4RqNCpQmY2njpxxbCxPHJiNP8wsU
zwtEx9jMIbR77FoV52/ePz9rKnpnZmOXNgljOAs82/eYiMalkT9aNdbYvaQMrwpC
mluDwm1Rb0KOOS4uQa9bLrVOAmm7Yx2KF8ahNnaNIwfD+idmVosLTg4CeSPlRCim
I9Sylck+yfqecbsjapPC9C6vLzMNPXn56b05V5sHTAsMmS0s9Y9CMbEEZ6iiU3D8
6gxwhpPdTgsMk3dS5HYiqvbXrOUsku+Jx5rIepJOh1jIcqnId3OsjU8v6Ovgj0BA
xe93vkqC+RphdhRfLwebkny5Id2PDm/962Z82veNbmHGl3IZeAZGd5eKgt7+F0C4
TT3GN312RZVKQKPqAcl5EmY4pnpanzqvNxOit/Dfzmrh/hvloRs=
=7Dig
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#58585] [PATCH 2/2] gnu: home: Add home-mako-service-type.
Resent-From: Andrew Tropin <andrew@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 10 Nov 2022 13:18:02 +0000
Resent-Message-ID: <handler.58585.B58585.16680862268062 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 58585
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 58585 <at> debbugs.gnu.org
Cc: "\(" <paren@HIDDEN>, Nicolas Graves <ngraves@HIDDEN>
X-Debbugs-Original-To: "( via Guix-patches via" <guix-patches@HIDDEN>, 58585 <at> debbugs.gnu.org
Received: via spool by 58585-submit <at> debbugs.gnu.org id=B58585.16680862268062
(code B ref 58585); Thu, 10 Nov 2022 13:18:02 +0000
Received: (at 58585) by debbugs.gnu.org; 10 Nov 2022 13:17:06 +0000
Received: from localhost ([127.0.0.1]:42254 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ot7QU-00025u-SL
for submit <at> debbugs.gnu.org; Thu, 10 Nov 2022 08:17:06 -0500
Received: from relay6-d.mail.gandi.net ([217.70.183.198]:48731)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <andrew@HIDDEN>) id 1ot7QP-00025I-It
for 58585 <at> debbugs.gnu.org; Thu, 10 Nov 2022 08:17:01 -0500
Received: (Authenticated sender: andrew@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id 2CFE6C0009;
Thu, 10 Nov 2022 13:16:49 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1;
t=1668086211;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=MfiZ5P48QEZvEWL7wvgC+mY9mjbSPv0Kh9bWJO+hyBw=;
b=d1lzdgKN+Ru72RdXZ5VSd0k/U4HRHfMqrsEEw8JnD8t2SnKBA+wetsDgVWubEGw/OtZlIw
f1DMfqy+beqn2WcJTWt1sibXzJX7SmpHiXwLeABQPNAldPcB/zyCFM/U6z4NCXrfMq8OFi
5DKJdCrOdZuzdO9b/FtQyw32R9LiTWAI82ncRd9a+Ro2VP51WcQKcFTMty/brM0ufloxbD
NGXRCf4syn8fjg+JwFVHvlKuhkf8vW5w6LV8vDvmeoWS5t3Yea2qWik9Enl2/o/Dv6mofu
1YIMgc0xnqeop85MP51hr7dyzM+tEvKITw0ZWXfZIRkWOaUFj5PHxP6RHhXfsg==
From: Andrew Tropin <andrew@HIDDEN>
In-Reply-To: <20221017164703.14949-2-paren@HIDDEN>
References: <20221017164703.14949-1-paren@HIDDEN>
<20221017164703.14949-2-paren@HIDDEN>
Date: Thu, 10 Nov 2022 17:16:46 +0400
Message-ID: <87r0ybueyp.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2022-10-17 17:47, "\( via Guix-patches" via wrote:
> * gnu/home/services/desktop.scm (home-mako-section,
> home-mako-configuration): New record types.
> (%home-mako-default-section, %home-mako-default-grouped-section,
> home-mako-service-type): New variables.
>
> Unfortunately, there is no way to actually use this service to
> run the daemon itself, as Mako tries to connect to Wayland, which
> is impossible as WAYLAND_DISPLAY is almost never set in session
> Shepherd's environment. So, this service simply writes the
> configuration file to $XDG_CONFIG_HOME/mako/config, and leave the
> actual execution of ``mako'' to the user.
After recent updates to shepherd service
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D70d58d1556
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D6cdde65bb5
it's now possible to start shepherd manually.
In rde we start shepherd by sway, so it inherits all wayland related
variables.
https://git.sr.ht/~abcdw/rde/tree/101313a691/rde/features/wm.scm#L137
It's not a perfect solution, but good enough.
> ---
> gnu/home/services/desktop.scm | 338 +++++++++++++++++++++++++++++++++-
> 1 file changed, 336 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/home/services/desktop.scm b/gnu/home/services/desktop.scm
> index a2ab2b4d07..a929a7533a 100644
> --- a/gnu/home/services/desktop.scm
> +++ b/gnu/home/services/desktop.scm
> @@ -22,17 +22,26 @@ (define-module (gnu home services desktop)
> #:use-module (gnu home services shepherd)
> #:use-module (gnu services configuration)
> #:autoload (gnu packages glib) (dbus)
> + #:autoload (gnu packages wm) (mako)
> #:autoload (gnu packages xdisorg) (redshift)
> - #:use-module (guix records)
> #:use-module (guix gexp)
> + #:use-module (guix records)
> #:use-module (srfi srfi-1)
> + #:use-module (srfi srfi-26)
> + #:use-module (ice-9 format)
> #:use-module (ice-9 match)
> #:export (home-redshift-configuration
> home-redshift-configuration?
> home-redshift-service-type
>=20=20
> home-dbus-configuration
> - home-dbus-service-type))
> + home-dbus-service-type
> +
> + home-mako-section
> + %home-mako-default-section
> + %home-mako-default-grouped-section
> + home-mako-configuration
> + home-mako-service-type))
>=20=20
>
> ;;;
> @@ -224,3 +233,328 @@ (define home-dbus-service-type
> (default-value (home-dbus-configuration))
> (description
> "Run the session-specific D-Bus inter-process message bus.")))
> +
> +
> +;;;
> +;;; Mako.
> +;;;
> +
> +(define-record-type* <home-mako-section>
> + home-mako-section make-home-mako-section
> + home-mako-section?
> +
> + (if-app-name home-mako-if-app-name ;string | #f
> + (default #f))
> + (if-app-icon home-mako-if-app-icon ;string | #f
> + (default #f))
> + (if-summary home-mako-if-summary ;string | #f
> + (default #f))
> + (if-summary-regex? home-mako-if-summary-regex? ;boolean
> + (default #f))
> + (if-body home-mako-if-body ;string | #f
> + (default #f))
> + (if-body-regex? home-mako-if-body-regex? ;boolean
> + (default #f))
> + (if-urgency home-mako-if-urgency ;'low | 'normal | 'crit=
ical | #f
> + (default #f))
> + (if-category home-mako-if-category ;string | #f
> + (default #f))
> + (if-desktop-entry home-mako-if-desktop-entry ;string | #f
> + (default #f))
> + (if-actionable? home-mako-if-actionable? ;boolean | '()
> + (default '()))
> + (if-expiring? home-mako-if-expiring? ;boolean | '()
> + (default '()))
> + (if-mode home-mako-if-mode ;string | #f
> + (default #f))
> + (if-grouped? home-mako-if-grouped? ;boolean | '()
> + (default '()))
> + (if-group-index home-mako-if-group-index ;integer | #f
> + (default #f))
> + (if-hidden? home-mako-if-hidden? ;boolean | '()
> + (default '()))
> + (if-output home-mako-if-output ;string | #f
> + (default #f))
> + (if-anchor home-mako-if-anchor ;'top-right | 'top-cent=
er | 'top-left | 'bottom-right | 'bottom-center | 'bottom-left | 'center-ri=
ght | 'center-left | 'center | #f
> + (default #f))
> +
> + (on-button-left home-mako-on-button-left ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
> + (default 'default))
> + (on-button-middle home-mako-on-button-middle ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | string | list of (file-like | string)
> + (default #f))
> + (on-button-right home-mako-on-button-right ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
> + (default 'dismiss))
> + (on-touch home-mako-on-touch ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
> + (default 'dismiss))
> + (on-notify home-mako-on-notify ;#f | 'default | 'dismi=
ss | 'dismiss-all | 'dismiss-group | list of (file-like | string)
> + (default #f))
> +
> + (font home-mako-font ;string
> + (default "monospace"))
> + (font-size home-mako-font-size ;number
> + (default 10))
> +
> + (background-color home-mako-background-color ;string
> + (default "285577FF"))
> + (text-color home-mako-text-color ;string
> + (default "FFFFFFFF"))
> +
> + (width home-mako-width ;integer
> + (default 300))
> + (height home-mako-height ;integer
> + (default 100))
> + (outer-margin home-mako-outer-margin ;list of integer
> + (default '(0)))
> + (margin home-mako-margin ;list of integer
> + (default '(10)))
> + (padding home-mako-padding ;list of integer
> + (default '(5)))
> +
> + (border-size home-mako-border-size ;integer
> + (default 2))
> + (border-color home-mako-border-color ;string
> + (default "4C7899FF"))
> + (border-radius home-mako-border-radius ;integer
> + (default 0))
> +
> + (progress-color home-mako-progress-color ;string
> + (default "5588AAFF"))
> + (progress-style home-mako-progress-style ;'over | 'source
> + (default 'over))
> +
> + (icons? home-mako-icons? ;boolean
> + (default #t))
> + (max-icon-size home-mako-max-icon-size ;integer
> + (default 64))
> + (icon-path home-mako-icon-path ;list of string
> + (default '()))
> + (icon-location home-mako-icon-location ;'left | 'right | 'top =
| 'bottom
> + (default 'left))
> +
> + (markup? home-mako-markup? ;boolean
> + (default #t))
> + (actions? home-mako-actions? ;boolean
> + (default #t))
> + (history? home-mako-history? ;boolean
> + (default #t))
> + (invisible? home-mako-invisible? ;boolean
> + (default #f))
> +
> + (format home-mako-format
> + (default "<b>%s</b>\\n%b"))
> + (text-alignment home-mako-text-alignment ;'left | 'center | 'rig=
ht
> + (default 'left))
> +
> + (default-timeout home-mako-default-timeout ;integer
> + (default 0))
> + (ignore-timeout? home-mako-ignore-timeout? ;boolean
> + (default #f))
> +
> + (group-by home-mako-group-by ;list of string
> + (default #f))
> + (max-visible home-mako-max-visible ;integer
> + (default #f))
> +
> + (output home-mako-output ;string
> + (default #f))
> + (layer home-mako-layer ;'background | 'bottom =
| 'top | 'overlay
> + (default 'top))
> + (anchor home-mako-anchor ;'top-right | 'top-cent=
er | 'top-left | 'bottom-right | 'bottom-center | 'bottom-left | 'center-ri=
ght | 'center-left | 'center
> + (default #f)))
> +
> +(define (home-mako-configuration-header-attributes section)
> + (define (boolean-clause name field)
> + (let ((value (field section)))
> + (cond ((null? value) '())
> + (value (list "!" name " "))
> + (else (list name)))))
> +
> + (define (string-clause name field)
> + (let ((value (field section)))
> + (if value
> + (list name "=3D\"" value "\" ")
> + '())))
> +
> + (define (symbol-clause name field)
> + (if (field section)
> + (string-clause name (compose symbol->string field))
> + '()))
> +
> + (define (number-clause name field)
> + (if (field section)
> + (string-clause name (compose number->string field))
> + '()))
> +
> + (append (string-clause "app-name" home-mako-if-app-name)
> + (string-clause "app-icon" home-mako-if-app-icon)
> + (string-clause (if (home-mako-if-summary-regex? section)
> + "summary~"
> + "summary")
> + home-mako-if-summary)
> + (string-clause (if (home-mako-if-body-regex? section)
> + "body~"
> + "body")
> + home-mako-if-body)
> + (symbol-clause "urgency" home-mako-if-urgency)
> + (string-clause "category" home-mako-if-category)
> + (string-clause "desktop-entry" home-mako-if-desktop-entry)
> + (boolean-clause "actionable" home-mako-if-actionable?)
> + (boolean-clause "expiring" home-mako-if-expiring?)
> + (string-clause "mode" home-mako-if-mode)
> + (boolean-clause "grouped" home-mako-if-grouped?)
> + (number-clause "group-index" home-mako-if-group-index)
> + (boolean-clause "hidden" home-mako-if-hidden?)
> + (string-clause "output" home-mako-if-output)
> + (symbol-clause "anchor" home-mako-if-anchor)))
> +
> +(define (home-mako-configuration-header section)
> + (match (home-mako-configuration-header-attributes section)
> + (() '())
> + ((attributes ...)
> + (append (list "\n[ ") attributes (list "]\n")))))
> +
> +(define (home-mako-configuration-body section)
> + (define (string-clause name field)
> + (let ((value (field section)))
> + (if value
> + (list name "=3D" (field section) "\n")
> + '())))
> +
> + (define (boolean-clause name field)
> + (list name "=3D" (if (field section) "1" "0") "\n"))
> +
> + (define (number-clause name field)
> + (if (field section)
> + (string-clause name (compose number->string field))
> + '()))
> +
> + (define (symbol-clause name field)
> + (if (field section)
> + (string-clause name (compose symbol->string field))
> + '()))
> +
> + (define (colour-clause name field)
> + (string-clause name (compose (cute string-append "#" <>)
> + field)))
> +
> + (define (directional-clause name field)
> + (if (field section)
> + (string-clause name (compose (cute string-join <> ",")
> + (cute map number->string <>)
> + field))
> + '()))
> +
> + (define (event-clause name field)
> + (append (list name "=3D")
> + (match (field section)
> + ('default (list "invoke-default-action"))
> + ('dismiss (list "dismiss"))
> + ('dismiss-all (list "dismiss-all"))
> + ('dismiss-group (list "dismiss-group"))
> + ((args ...)
> + (append (list "exec")
> + (append-map (cute list " \"" <> "\"")
> + args)))
> + (#f (list "none")))
> + (list "\n")))
> +
> + (append (event-clause "on-button-left" home-mako-on-button-left)
> + (event-clause "on-button-middle" home-mako-on-button-middle)
> + (event-clause "on-button-right" home-mako-on-button-right)
> + (event-clause "on-touch" home-mako-on-touch)
> + (event-clause "on-notify" home-mako-on-notify)
> + (list "font=3D" (home-mako-font section) " "
> + (number->string (home-mako-font-size section)) "\n")
> + (colour-clause "background-color" home-mako-background-color)
> + (colour-clause "text-color" home-mako-text-color)
> + (number-clause "width" home-mako-width)
> + (number-clause "height" home-mako-height)
> + (directional-clause "outer-margin" home-mako-outer-margin)
> + (directional-clause "margin" home-mako-margin)
> + (directional-clause "padding" home-mako-padding)
> + (number-clause "border-size" home-mako-border-size)
> + (colour-clause "border-color" home-mako-border-color)
> + (number-clause "border-radius" home-mako-border-radius)
> + (list "progress-color=3D"
> + (symbol->string (home-mako-progress-style section))
> + " #" (home-mako-progress-color section) "\n")
> + (boolean-clause "icons" home-mako-icons?)
> + (number-clause "max-icon-size" home-mako-max-icon-size)
> + (string-clause "icon-path"
> + (compose (cute string-join <> ":")
> + home-mako-icon-path))
> + (symbol-clause "icon-location" home-mako-icon-location)
> + (boolean-clause "markup" home-mako-markup?)
> + (boolean-clause "actions" home-mako-actions?)
> + (boolean-clause "history" home-mako-history?)
> + (boolean-clause "invisible" home-mako-invisible?)
> + (string-clause "format" home-mako-format)
> + (symbol-clause "text-alignment" home-mako-text-alignment)
> + (number-clause "default-timeout" home-mako-default-timeout)
> + (boolean-clause "ignore-timeout" home-mako-ignore-timeout?)
> + (boolean-clause "ignore-timeout" home-mako-ignore-timeout?)
> + (if (home-mako-group-by section)
> + (string-clause "group-by"
> + (compose (cute string-join <> ",")
> + home-mako-group-by))
> + '())
> + (number-clause "max-visible" home-mako-max-visible)
> + (string-clause "output" home-mako-output)
> + (symbol-clause "layer" home-mako-layer)
> + (symbol-clause "anchor" home-mako-anchor)))
> +
> +(define (home-mako-configuration-section section)
> + (append (home-mako-configuration-header section)
> + (home-mako-configuration-body section)))
> +
> +(define %home-mako-default-section (home-mako-section))
> +
> +(define %home-mako-default-grouped-section
> + (home-mako-section
> + (if-grouped? #t)
> + (format "(%g) <b>%s</b>\\n%b")))
> +
> +(define-record-type* <home-mako-configuration>
> + home-mako-configuration make-home-mako-configuration
> + home-mako-configuration?
> +
> + (mako home-mako-configuration-mako ;file-like
> + (default mako))
> + (sections home-mako-configuration-sections ;list of <home-mako-sec=
tion>
> + (default (list %home-mako-default-section
> + %home-mako-default-grouped-section)))
> +
> + (max-history home-mako-configuration-max-history ;integer
> + (default 5))
> + (sort home-mako-configuration-sort ;'time | 'priority
> + (default 'time))
> + (sort-order home-mako-configuration-sort-order ;'ascending | 'descendi=
ng
> + (default 'descending)))
> +
> +(define (home-mako-configuration-file config)
> + (apply mixed-text-file "mako-config"
> + (append (list "max-history=3D"
> + (number->string
> + (home-mako-configuration-max-history config))
> + "\n"
> + "sort=3D"
> + (match (home-mako-configuration-sort-order config)
> + ('ascending "+")
> + ('descending "-"))
> + (symbol->string (home-mako-configuration-sort con=
fig))
> + "\n")
> + (append-map home-mako-configuration-section
> + (home-mako-configuration-sections config)))=
))
> +
> +(define (home-mako-xdg-configuration-files config)
> + `(("mako/config" ,(home-mako-configuration-file config))))
> +
> +(define home-mako-service-type
> + (service-type
> + (name 'home-mako)
> + (extensions
> + (list (service-extension home-xdg-configuration-files-service-type
> + home-mako-xdg-configuration-files)))
> + (default-value (home-mako-configuration))
> + (description
> + "Install and configure the @code{mako} notification daemon.")))
In the coming days, I won't have time to try and check all the options
provided here, sorry, maybe someone else would jump in and review this
service in the meantime.
=2D-=20
Best regards,
Andrew Tropin
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmNs+b4ACgkQIgjSCVjB
3rD10RAAjKu7Fl2DaAgTVqs6GEZC9Lj+whiH8CBOXMHzSHJBf8hCGhS2zIufQhF1
IpqXiH5vNdD68FAQ6Qv73cTL9dzHvP4ISujy74t7hq/u7kny0B4xqtk/2v/8f7Bt
TgxS+YckxLxo6JG9HLXCOz76SDAI1EhsA8mr+FSp9OoFu+aFnjYceFsXH3RIWHk/
nOusJSpvcdx8NFI2RFo/5oRF7Z9qrAfGtpXkM53y1Qq/KHvU7qux4VVMclw7IXFD
u0W0OzGVC1ezJpPsF9n8xsZiBUW1WlIkrYeN4RqNCpQmY2njpxxbCxPHJiNP8wsU
zwtEx9jMIbR77FoV52/ePz9rKnpnZmOXNgljOAs82/eYiMalkT9aNdbYvaQMrwpC
mluDwm1Rb0KOOS4uQa9bLrVOAmm7Yx2KF8ahNnaNIwfD+idmVosLTg4CeSPlRCim
I9Sylck+yfqecbsjapPC9C6vLzMNPXn56b05V5sHTAsMmS0s9Y9CMbEEZ6iiU3D8
6gxwhpPdTgsMk3dS5HYiqvbXrOUsku+Jx5rIepJOh1jIcqnId3OsjU8v6Ovgj0BA
xe93vkqC+RphdhRfLwebkny5Id2PDm/962Z82veNbmHGl3IZeAZGd5eKgt7+F0C4
TT3GN312RZVKQKPqAcl5EmY4pnpanzqvNxOit/Dfzmrh/hvloRs=
=7Dig
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#58585] [PATCH 2/2] gnu: home: Add home-mako-service-type.
Resent-From: "(" <paren@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 10 Nov 2022 15:38:01 +0000
Resent-Message-ID: <handler.58585.B.166809463031577 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 58585
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: andrew@HIDDEN, 58585 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves@HIDDEN>
X-Debbugs-Original-To: "Andrew Tropin" <andrew@HIDDEN>, "( via Guix-patches via" <guix-patches@HIDDEN>, <58585 <at> debbugs.gnu.org>
Received: via spool by submit <at> debbugs.gnu.org id=B.166809463031577
(code B ref -1); Thu, 10 Nov 2022 15:38:01 +0000
Received: (at submit) by debbugs.gnu.org; 10 Nov 2022 15:37:10 +0000
Received: from localhost ([127.0.0.1]:44019 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ot9c6-0008DE-5G
for submit <at> debbugs.gnu.org; Thu, 10 Nov 2022 10:37:10 -0500
Received: from lists.gnu.org ([209.51.188.17]:48060)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1ot9c4-0008D6-OT
for submit <at> debbugs.gnu.org; Thu, 10 Nov 2022 10:37:08 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <paren@HIDDEN>) id 1ot9c4-0003Vn-Ht
for guix-patches@HIDDEN; Thu, 10 Nov 2022 10:37:08 -0500
Received: from knopi.disroot.org ([178.21.23.139])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <paren@HIDDEN>) id 1ot9c1-0008BE-ES
for guix-patches@HIDDEN; Thu, 10 Nov 2022 10:37:08 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id D496F403CA;
Thu, 10 Nov 2022 16:37:01 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 07xhki0MKhjA; Thu, 10 Nov 2022 16:37:00 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1668094620; bh=A3zDZXerTa58rhgdng3/zJ9GOLn3v7Dl2xTBz1rso6s=;
h=Date:Cc:Subject:From:To:References:In-Reply-To:From;
b=YX/+yEkwQxXWz5nYOqlc41/th+WQmnFDATpGGOcS3mXv1ur79rAM+S6Gn7B0DU6et
GMdKExQ5MDT2TR7NdMpi0sHJlTApmmJPc+TI67zSLClWOAeBIPqT16AOVG69oP3HHY
yaEUILWO0e44iTxTKMS9E2rgVD/Ygq0ikF6ZJ3lRZlTFx49nT0ZaH7jnnCWMOk9T0M
Kn8d1025pRkhODJHTwKXve4BStXUY3GDxEb9qautpOc5lNhRzMaC9MQ+0swckFr0Kl
OiGgiN5yN0F4jw7//9ICpWHuXXFb6B60a/4cVOJBgdkTskKg5TiIarIZeoypXgGg0O
5WBXbtRCT72VQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2022 15:36:58 +0000
Message-Id: <CO8Q6WJBI8UD.345WHYKV75CN6@guix-framework>
From: "(" <paren@HIDDEN>
References: <20221017164703.14949-1-paren@HIDDEN>
<20221017164703.14949-2-paren@HIDDEN> <87r0ybueyp.fsf@HIDDEN>
In-Reply-To: <87r0ybueyp.fsf@HIDDEN>
Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@HIDDEN;
helo=knopi.disroot.org
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Heya,
On Thu Nov 10, 2022 at 1:16 PM GMT, Andrew Tropin wrote:
> It's not a perfect solution, but good enough.
Actually, I recently realised there's a better way: modify HOME-DBUS-SERVIC=
E-TYPE
to support D-Bus services, like the system DBUS-SERVICE-TYPE does. I'll try=
to do
that at some point in the future.
-- (
X-Loop: help-debbugs@HIDDEN
Subject: [bug#58585] [PATCH 2/2] gnu: home: Add home-mako-service-type.
Resent-From: "(" <paren@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 10 Nov 2022 15:38:02 +0000
Resent-Message-ID: <handler.58585.B58585.166809462831561 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 58585
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: andrew@HIDDEN, 58585 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves@HIDDEN>
X-Debbugs-Original-To: "Andrew Tropin" <andrew@HIDDEN>, "( via Guix-patches via" <guix-patches@HIDDEN>, <58585 <at> debbugs.gnu.org>
Received: via spool by 58585-submit <at> debbugs.gnu.org id=B58585.166809462831561
(code B ref 58585); Thu, 10 Nov 2022 15:38:02 +0000
Received: (at 58585) by debbugs.gnu.org; 10 Nov 2022 15:37:08 +0000
Received: from localhost ([127.0.0.1]:44016 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ot9c3-0008Cz-Tf
for submit <at> debbugs.gnu.org; Thu, 10 Nov 2022 10:37:08 -0500
Received: from knopi.disroot.org ([178.21.23.139]:42532)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <paren@HIDDEN>) id 1ot9bz-0008Cn-FG
for 58585 <at> debbugs.gnu.org; Thu, 10 Nov 2022 10:37:06 -0500
Received: from localhost (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id D496F403CA;
Thu, 10 Nov 2022 16:37:01 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 07xhki0MKhjA; Thu, 10 Nov 2022 16:37:00 +0100 (CET)
Mime-Version: 1.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1668094620; bh=A3zDZXerTa58rhgdng3/zJ9GOLn3v7Dl2xTBz1rso6s=;
h=Date:Cc:Subject:From:To:References:In-Reply-To:From;
b=YX/+yEkwQxXWz5nYOqlc41/th+WQmnFDATpGGOcS3mXv1ur79rAM+S6Gn7B0DU6et
GMdKExQ5MDT2TR7NdMpi0sHJlTApmmJPc+TI67zSLClWOAeBIPqT16AOVG69oP3HHY
yaEUILWO0e44iTxTKMS9E2rgVD/Ygq0ikF6ZJ3lRZlTFx49nT0ZaH7jnnCWMOk9T0M
Kn8d1025pRkhODJHTwKXve4BStXUY3GDxEb9qautpOc5lNhRzMaC9MQ+0swckFr0Kl
OiGgiN5yN0F4jw7//9ICpWHuXXFb6B60a/4cVOJBgdkTskKg5TiIarIZeoypXgGg0O
5WBXbtRCT72VQ==
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Thu, 10 Nov 2022 15:36:58 +0000
Message-Id: <CO8Q6WJBI8UD.345WHYKV75CN6@guix-framework>
From: "(" <paren@HIDDEN>
References: <20221017164703.14949-1-paren@HIDDEN>
<20221017164703.14949-2-paren@HIDDEN> <87r0ybueyp.fsf@HIDDEN>
In-Reply-To: <87r0ybueyp.fsf@HIDDEN>
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Heya, On Thu Nov 10, 2022 at 1:16 PM GMT,
Andrew Tropin wrote:
> It's not a perfect solution, but good enough. Actually, I recently realised
there's a better way: modify HOME-DBUS-SERVICE-TYPE to support D-Bus services,
like the system DBUS-SERVICE-TYPE does. I'll try to do that at some point
in the future.
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
1.3 FROM_ONE_CHAR Bogus FROM name
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.3 (/)
Heya,
On Thu Nov 10, 2022 at 1:16 PM GMT, Andrew Tropin wrote:
> It's not a perfect solution, but good enough.
Actually, I recently realised there's a better way: modify HOME-DBUS-SERVIC=
E-TYPE
to support D-Bus services, like the system DBUS-SERVICE-TYPE does. I'll try=
to do
that at some point in the future.
-- (
Received: (at control) by debbugs.gnu.org; 23 Nov 2022 09:13:26 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 23 04:13:26 2022 Received: from localhost ([127.0.0.1]:53627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1oxlos-0000Bm-09 for submit <at> debbugs.gnu.org; Wed, 23 Nov 2022 04:13:26 -0500 Received: from mira.cbaines.net ([212.71.252.8]:41952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1oxloq-0000Bc-6O for control <at> debbugs.gnu.org; Wed, 23 Nov 2022 04:13:24 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id A9D4A27BBE9 for <control <at> debbugs.gnu.org>; Wed, 23 Nov 2022 09:13:23 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 2957672c for <control <at> debbugs.gnu.org>; Wed, 23 Nov 2022 09:13:23 +0000 (UTC) From: Christopher Baines <mail@HIDDEN> To: control <at> debbugs.gnu.org Subject: tag 58585 moreinfo Date: Wed, 23 Nov 2022 09:13:23 +0000 Message-ID: <87mt8ijaoc.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) tags 58585 + moreinfo quit
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.