From a5b914156eda876000ecab29ebe855080f8d8ff6 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 13 Dec 2022 19:35:59 +0100 Subject: [PATCH] services: greetd: Add 'source-profile?' configuration field. * gnu/services/base.scm ()[source-profile?]: New field. (make-greetd-terminal-configuration-file): Serialize new field to configuration file. * doc/guix.texi (Base Services): Document it. --- doc/guix.texi | 4 ++++ gnu/services/base.scm | 3 +++ 2 files changed, 7 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index c07ec89b2f..9bcaf8ff78 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18908,6 +18908,10 @@ is recommended. @item @code{terminal-switch} (default: @code{#f}) Make this terminal active on start of @code{greetd}. +@item @code{source-profile?} (default: @code{#t}) +Whether to source @file{/etc/profile} and @file{~/.profile}, when they +exist. + @item @code{default-session-user} (default: @samp{"greeter"}) The user to use for running the greeter. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 08eea46dc6..9e799445d2 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -3050,6 +3050,7 @@ (define-record-type* (default (default-log-file-name this-record))) (terminal-vt greetd-terminal-vt (default "7")) (terminal-switch greetd-terminal-switch (default #f)) + (source-profile? greetd-source-profile? (default #t)) (default-session-user greetd-default-session-user (default "greeter")) (default-session-command greetd-default-session-command (default (greetd-agreety-session)))) @@ -3063,12 +3064,14 @@ (define (default-log-file-name config) (define (make-greetd-terminal-configuration-file config) (let* ((config-file-name (greetd-config-file-name config)) + (source-profile? (greetd-source-profile? config)) (terminal-vt (greetd-terminal-vt config)) (terminal-switch (greetd-terminal-switch config)) (default-session-user (greetd-default-session-user config)) (default-session-command (greetd-default-session-command config))) (mixed-text-file config-file-name + "source_profile = " (if source-profile? "true" "false") "\n" "[terminal]\n" "vt = " terminal-vt "\n" "switch = " (if terminal-switch "true" "false") "\n"