| Message ID | 20221027173809.25625-1-paren@disroot.org |
|---|---|
| State | New |
| Headers | show |
| Series | gnu: home: greetd-service-type: Add gexp compilers for sessions. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/comparison | success | View comparision |
| cbaines/git-branch | success | View Git branch |
| cbaines/applying patch | success | |
| cbaines/issue | success | View issue |
On 2022-10-27 18:38, "\( via Guix-patches" via wrote: > * gnu/home/services/base.scm (make-greetd-agreety-session-command, It should be gnu/services/base.scm, whithout home. > greetd-wlgreet-sway-session-command, > make-greetd-default-session-command): Remove variables. > (greetd-agreety-session-compiler, > greetd-wlgreet-sway-session-compiler): New gexp compilers. > (greetd-terminal-configuration)[default-session-command]<sanitize>: > Remove it. > --- > gnu/services/base.scm | 65 ++++++++++++++++++++----------------------- > 1 file changed, 30 insertions(+), 35 deletions(-) > > diff --git a/gnu/services/base.scm b/gnu/services/base.scm > index d3e3335030..3bf924b8f1 100644 > --- a/gnu/services/base.scm > +++ b/gnu/services/base.scm > @@ -2900,11 +2900,18 @@ (define greetd-agreety-tty-xdg-session-command > (quote (#$@extra-env))) > (apply execl #$command #$command (list #$@args))))))) > > -(define (make-greetd-agreety-session-command config command) > - (let ((agreety (file-append (greetd-agreety config) "/bin/agreety"))) > - (program-file > - "agreety-command" > - #~(execl #$agreety #$agreety "-c" #$command)))) > +(define-gexp-compiler (greetd-agreety-session-compiler > + (session <greetd-agreety-session>) > + system target) > + (let ((agreety (file-append (greetd-agreety session) > + "/bin/agreety")) > + (command ((if (greetd-agreety-xdg-env? session) > + greetd-agreety-tty-xdg-session-command > + greetd-agreety-tty-session-command) > + session))) > + (lower-object > + (program-file "agreety-command" > + #~(execl #$agreety #$agreety "-c" #$command))))) > > (define-record-type* <greetd-wlgreet-session> > greetd-wlgreet-session make-greetd-wlgreet-session > @@ -2991,37 +2998,26 @@ (define (make-wlgreet-sway-configuration-file session) > "exec \"" wlgreet " --config " wlgreet-config "; " > swaymsg " exit\"\n"))) > > -(define (greetd-wlgreet-sway-session-command session) > +(define-gexp-compiler (greetd-wlgreet-sway-session-compiler > + (session <greetd-wlgreet-sway-session>) > + system target) > (let ((sway (file-append (greetd-wlgreet-sway-session-sway session) > "/bin/sway")) > (config (make-wlgreet-sway-configuration-file session))) > - (program-file "wlgreet-sway-session-command" > - #~(let* ((log-file (open-output-file > - (string-append "/tmp/sway-greeter." > - (number->string (getpid)) > - ".log"))) > - (username (getenv "USER")) > - (useruid (number->string (passwd:uid (getpwuid username))))) > - ;; redirect stdout/err to log-file > - (dup2 (fileno log-file) 1) > - (dup2 1 2) > - (sleep 1) ;give seatd/logind some time to start up > - (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid)) > - (execl #$sway #$sway "-d" "-c" #$config))))) > - > -(define (make-greetd-default-session-command config-or-command) > - (cond ((greetd-agreety-session? config-or-command) > - (cond ((greetd-agreety-xdg-env? config-or-command) > - (make-greetd-agreety-session-command > - config-or-command > - (greetd-agreety-tty-xdg-session-command config-or-command))) > - (#t > - (make-greetd-agreety-session-command > - config-or-command > - (greetd-agreety-tty-session-command config-or-command))))) > - ((greetd-wlgreet-sway-session? config-or-command) > - (greetd-wlgreet-sway-session-command config-or-command)) > - (#t config-or-command))) > + (lower-object > + (program-file "wlgreet-sway-session-command" > + #~(let* ((log-file (open-output-file > + (string-append "/tmp/sway-greeter." > + (number->string (getpid)) > + ".log"))) > + (username (getenv "USER")) > + (useruid (number->string (passwd:uid (getpwuid username))))) > + ;; redirect stdout/err to log-file > + (dup2 (fileno log-file) 1) > + (dup2 1 2) > + (sleep 1) ;give seatd/logind some time to start up > + (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid)) > + (execl #$sway #$sway "-d" "-c" #$config)))))) > > (define-record-type* <greetd-terminal-configuration> > greetd-terminal-configuration make-greetd-terminal-configuration > @@ -3035,8 +3031,7 @@ (define-record-type* <greetd-terminal-configuration> > (terminal-switch greetd-terminal-switch (default #f)) > (default-session-user greetd-default-session-user (default "greeter")) > (default-session-command greetd-default-session-command > - (default (greetd-agreety-session)) > - (sanitize make-greetd-default-session-command))) > + (default (greetd-agreety-session)))) > > (define (default-config-file-name config) > (string-join (list "config-" (greetd-terminal-vt config) ".toml") "")) I didn't test it, but this change looks good. Also CCed muradm. I can take a deeper look and try it out later this week if nobody else will do it earlier.
On Wed Nov 2, 2022 at 2:00 PM GMT, Andrew Tropin wrote:
> It should be gnu/services/base.scm, whithout home.
Oops! :)
-- (
On 2022-10-27 18:38, guix-patches@gnu.org wrote: > * gnu/home/services/base.scm (make-greetd-agreety-session-command, > greetd-wlgreet-sway-session-command, > make-greetd-default-session-command): Remove variables. > (greetd-agreety-session-compiler, > greetd-wlgreet-sway-session-compiler): New gexp compilers. > (greetd-terminal-configuration)[default-session-command]<sanitize>: > Remove it. > --- > gnu/services/base.scm | 65 ++++++++++++++++++++----------------------- > 1 file changed, 30 insertions(+), 35 deletions(-) > > diff --git a/gnu/services/base.scm b/gnu/services/base.scm > index d3e3335030..3bf924b8f1 100644 > --- a/gnu/services/base.scm > +++ b/gnu/services/base.scm > @@ -2900,11 +2900,18 @@ (define greetd-agreety-tty-xdg-session-command > (quote (#$@extra-env))) > (apply execl #$command #$command (list #$@args))))))) > > -(define (make-greetd-agreety-session-command config command) > - (let ((agreety (file-append (greetd-agreety config) "/bin/agreety"))) > - (program-file > - "agreety-command" > - #~(execl #$agreety #$agreety "-c" #$command)))) > +(define-gexp-compiler (greetd-agreety-session-compiler > + (session <greetd-agreety-session>) > + system target) > + (let ((agreety (file-append (greetd-agreety session) > + "/bin/agreety")) > + (command ((if (greetd-agreety-xdg-env? session) > + greetd-agreety-tty-xdg-session-command > + greetd-agreety-tty-session-command) > + session))) > + (lower-object > + (program-file "agreety-command" > + #~(execl #$agreety #$agreety "-c" #$command))))) > > (define-record-type* <greetd-wlgreet-session> > greetd-wlgreet-session make-greetd-wlgreet-session > @@ -2991,37 +2998,26 @@ (define (make-wlgreet-sway-configuration-file session) > "exec \"" wlgreet " --config " wlgreet-config "; " > swaymsg " exit\"\n"))) > > -(define (greetd-wlgreet-sway-session-command session) > +(define-gexp-compiler (greetd-wlgreet-sway-session-compiler > + (session <greetd-wlgreet-sway-session>) > + system target) > (let ((sway (file-append (greetd-wlgreet-sway-session-sway session) > "/bin/sway")) > (config (make-wlgreet-sway-configuration-file session))) > - (program-file "wlgreet-sway-session-command" > - #~(let* ((log-file (open-output-file > - (string-append "/tmp/sway-greeter." > - (number->string (getpid)) > - ".log"))) > - (username (getenv "USER")) > - (useruid (number->string (passwd:uid (getpwuid username))))) > - ;; redirect stdout/err to log-file > - (dup2 (fileno log-file) 1) > - (dup2 1 2) > - (sleep 1) ;give seatd/logind some time to start up > - (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid)) > - (execl #$sway #$sway "-d" "-c" #$config))))) > - > -(define (make-greetd-default-session-command config-or-command) > - (cond ((greetd-agreety-session? config-or-command) > - (cond ((greetd-agreety-xdg-env? config-or-command) > - (make-greetd-agreety-session-command > - config-or-command > - (greetd-agreety-tty-xdg-session-command config-or-command))) > - (#t > - (make-greetd-agreety-session-command > - config-or-command > - (greetd-agreety-tty-session-command config-or-command))))) > - ((greetd-wlgreet-sway-session? config-or-command) > - (greetd-wlgreet-sway-session-command config-or-command)) > - (#t config-or-command))) > + (lower-object > + (program-file "wlgreet-sway-session-command" > + #~(let* ((log-file (open-output-file > + (string-append "/tmp/sway-greeter." > + (number->string (getpid)) > + ".log"))) > + (username (getenv "USER")) > + (useruid (number->string (passwd:uid (getpwuid username))))) > + ;; redirect stdout/err to log-file > + (dup2 (fileno log-file) 1) > + (dup2 1 2) > + (sleep 1) ;give seatd/logind some time to start up > + (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid)) > + (execl #$sway #$sway "-d" "-c" #$config)))))) > > (define-record-type* <greetd-terminal-configuration> > greetd-terminal-configuration make-greetd-terminal-configuration > @@ -3035,8 +3031,7 @@ (define-record-type* <greetd-terminal-configuration> > (terminal-switch greetd-terminal-switch (default #f)) > (default-session-user greetd-default-session-user (default "greeter")) > (default-session-command greetd-default-session-command > - (default (greetd-agreety-session)) > - (sanitize make-greetd-default-session-command))) > + (default (greetd-agreety-session)))) > > (define (default-config-file-name config) > (string-join (list "config-" (greetd-terminal-vt config) ".toml") "")) Applied, tested agreety session, adjusted commit message, pushed as fdc9e1b27edfb3df51d391364bcbc50e9cd1de40. Thank you!
On Wed Nov 9, 2022 at 7:33 AM GMT, Andrew Tropin wrote:
> Thank you!
Thanks!
-- (
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index d3e3335030..3bf924b8f1 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2900,11 +2900,18 @@ (define greetd-agreety-tty-xdg-session-command (quote (#$@extra-env))) (apply execl #$command #$command (list #$@args))))))) -(define (make-greetd-agreety-session-command config command) - (let ((agreety (file-append (greetd-agreety config) "/bin/agreety"))) - (program-file - "agreety-command" - #~(execl #$agreety #$agreety "-c" #$command)))) +(define-gexp-compiler (greetd-agreety-session-compiler + (session <greetd-agreety-session>) + system target) + (let ((agreety (file-append (greetd-agreety session) + "/bin/agreety")) + (command ((if (greetd-agreety-xdg-env? session) + greetd-agreety-tty-xdg-session-command + greetd-agreety-tty-session-command) + session))) + (lower-object + (program-file "agreety-command" + #~(execl #$agreety #$agreety "-c" #$command))))) (define-record-type* <greetd-wlgreet-session> greetd-wlgreet-session make-greetd-wlgreet-session @@ -2991,37 +2998,26 @@ (define (make-wlgreet-sway-configuration-file session) "exec \"" wlgreet " --config " wlgreet-config "; " swaymsg " exit\"\n"))) -(define (greetd-wlgreet-sway-session-command session) +(define-gexp-compiler (greetd-wlgreet-sway-session-compiler + (session <greetd-wlgreet-sway-session>) + system target) (let ((sway (file-append (greetd-wlgreet-sway-session-sway session) "/bin/sway")) (config (make-wlgreet-sway-configuration-file session))) - (program-file "wlgreet-sway-session-command" - #~(let* ((log-file (open-output-file - (string-append "/tmp/sway-greeter." - (number->string (getpid)) - ".log"))) - (username (getenv "USER")) - (useruid (number->string (passwd:uid (getpwuid username))))) - ;; redirect stdout/err to log-file - (dup2 (fileno log-file) 1) - (dup2 1 2) - (sleep 1) ;give seatd/logind some time to start up - (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid)) - (execl #$sway #$sway "-d" "-c" #$config))))) - -(define (make-greetd-default-session-command config-or-command) - (cond ((greetd-agreety-session? config-or-command) - (cond ((greetd-agreety-xdg-env? config-or-command) - (make-greetd-agreety-session-command - config-or-command - (greetd-agreety-tty-xdg-session-command config-or-command))) - (#t - (make-greetd-agreety-session-command - config-or-command - (greetd-agreety-tty-session-command config-or-command))))) - ((greetd-wlgreet-sway-session? config-or-command) - (greetd-wlgreet-sway-session-command config-or-command)) - (#t config-or-command))) + (lower-object + (program-file "wlgreet-sway-session-command" + #~(let* ((log-file (open-output-file + (string-append "/tmp/sway-greeter." + (number->string (getpid)) + ".log"))) + (username (getenv "USER")) + (useruid (number->string (passwd:uid (getpwuid username))))) + ;; redirect stdout/err to log-file + (dup2 (fileno log-file) 1) + (dup2 1 2) + (sleep 1) ;give seatd/logind some time to start up + (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid)) + (execl #$sway #$sway "-d" "-c" #$config)))))) (define-record-type* <greetd-terminal-configuration> greetd-terminal-configuration make-greetd-terminal-configuration @@ -3035,8 +3031,7 @@ (define-record-type* <greetd-terminal-configuration> (terminal-switch greetd-terminal-switch (default #f)) (default-session-user greetd-default-session-user (default "greeter")) (default-session-command greetd-default-session-command - (default (greetd-agreety-session)) - (sanitize make-greetd-default-session-command))) + (default (greetd-agreety-session)))) (define (default-config-file-name config) (string-join (list "config-" (greetd-terminal-vt config) ".toml") ""))