;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 3 of the License, or (at ;;; your option) any later version. ;;; ;;; GNU Guix is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;;; GNU General Public License for more details. ;;; ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . (define-module (gnu system keyboard) #:use-module (guix gexp) #:use-module ((gnu packages xorg) #:select (xkeyboard-config console-setup)) #:use-module (srfi srfi-9 gnu) #:use-module (ice-9 match) #:export (keyboard-layout? keyboard-layout keyboard-layout-name keyboard-layout-variant keyboard-layout-model keyboard-layout-options keyboard-layout->console-keymap)) ;;; Commentary: ;;; ;;; This module provides a data structure to represent keyboard layouts ;;; according to the XKB naming and classification (see the 'xkeyboard-config' ;;; package). ;;; ;;; Code: (define-immutable-record-type (%keyboard-layout name variant model options) keyboard-layout? (name keyboard-layout-name) ;string (variant keyboard-layout-variant) ;#f | string (model keyboard-layout-model) ;#f | string (options keyboard-layout-options)) ;list of strings (define* (keyboard-layout name #:optional variant #:key model (options '())) "Return a new keyboard layout with the given NAME and VARIANT. NAME must be a string such as \"fr\"; VARIANT must be a string such as \"bepo\" or \"nodeadkeys\". See the 'xkeyboard-config' package for valid options." (%keyboard-layout name variant model options)) (define* (keyboard-layout->console-keymap layout #:key (xkeyboard-config xkeyboard-config)) "Return a Linux console keymap file for LAYOUT, a record. Layout information is taken from the XKEYBOARD-CONFIG package." (define build (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils) (ice-9 popen) (ice-9 match)) (define pipe (open-pipe* OPEN_READ #+(file-append console-setup "/bin/ckbcomp") (string-append "-I" #+(file-append xkeyboard-config "/share/X11/xkb")) "-rules" "base" #$@(match (keyboard-layout-model layout) (#f '()) (model `("-model" ,model))) #$(keyboard-layout-name layout) #$(or (keyboard-layout-variant layout) "") #$(string-join (keyboard-layout-options layout) ","))) (call-with-output-file #$output (lambda (output) (dump-port pipe output))) ;; Note: ckbcomp errors out when the layout name is unknown, but ;; merely emits a warning when the variant is unknown. (unless (zero? (close-pipe pipe)) (error "failed to create console keymap for keyboard layout" #$(keyboard-layout-name layout)))))) (computed-file (string-append "console-keymap." (string-map (match-lambda (#\, #\-) (chr chr)) (keyboard-layout-name layout))) build)) * doc/guix.texi: Adjust doc. * gnu/build/activation.scm (boot-time-system): Adjust accordingly. * gnu/build/hurd-boot.scm (boot-hurd-system): Likewise. * gnu/packages/commencement.scm (%final-inputs-riscv64): Adjust comment. Maxim Cournoyer 2021-07-29services: setuid: More configurable setuid support....New record <setuid-program> with fields for setting the specific user and group, as well as specifically selecting the setuid and setgid bits, for a program within the setuid-program-service. * gnu/services.scm (setuid-program-file-like-deprecated): New function. (setuid-program-service-type): Make use of setuid-program->activation-gexp. Adjust the extend property to handle <setuid-program>. * gnu/build/activation.scm (activate-setuid-programs): Update to expect a <setuid-record> list for each program entry. * gnu/system.scm: (operating-system-setuid-programs): Renamed to %operating-system-setuid-programs and replace it with new procedure. (operating-system-default-essential-services, hurd-default-essential-services): Replace operating-system-setuid-programs with %operating-system-setuid-programs. * gnu/system/setuid.scm: New file. * doc/guix.texi (Setuid Programs): Document <setuid-program>. Co-authored-by: Brice Waegeneire <brice@waegenei.re> Chris Lemmer-Webber