From de3de823fcf95285ea96d3bd7415e3ca393cb2bd Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Fri, 26 Jul 2024 16:25:25 +0200 Subject: feat!(system): implement default supplementary groups --- machines/portable-bios.scm | 6 ++++++ systems/mcdowell.scm | 9 ++++++++- users/marekpasnikowski.scm | 4 +++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/machines/portable-bios.scm b/machines/portable-bios.scm index 416960d..bbbe1f1 100644 --- a/machines/portable-bios.scm +++ b/machines/portable-bios.scm @@ -31,6 +31,12 @@ (define-public firmware* (list linux-firmware)) +;; (string) +(define-public hardware-groups + (list "audio" + "netdev" + "video")) + ;; record package (define-public initrd* microcode-initrd) diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm index 323e2ec..be0408f 100644 --- a/systems/mcdowell.scm +++ b/systems/mcdowell.scm @@ -5,6 +5,7 @@ #:use-module (machines portable-bios) ; bootloader-configuration* ; file-systems* ; firmware* + ; hardware-groups ; initrd* ; kernel* #:use-module (suweren system) ; %suweren-operating-system @@ -19,7 +20,13 @@ ;; (record user-account) (define users* - (list marekpasnikowski-account)) + (let* ((system-groups (list "wheel")) + + (supplementary-groups* (append hardware-groups + system-groups)) + + (marekpasnikowski (marekpasnikowski-account supplementary-groups*))) + (list marekpasnikowski))) ;; record operating-system (define operating-system* diff --git a/users/marekpasnikowski.scm b/users/marekpasnikowski.scm index 5974dd6..7c2d4ac 100644 --- a/users/marekpasnikowski.scm +++ b/users/marekpasnikowski.scm @@ -37,11 +37,13 @@ (home-environment (inherit %home-environment) (services marekpasnikowski-services)))) +;; (string) -> ;; record user-account -(define-public marekpasnikowski-account +(define-public (marekpasnikowski-account supplementary-groups*) (let ((fish (file-append fish "/bin/fish"))) (user-account (name marekpasnikowski-username) (group "users") + (supplementary-groups supplementary-groups*) (shell fish)))) ;; record home-environment -- cgit v1.2.3