From 68b8bf062a8cd08136849fb588a67ef83c03b52f Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Thu, 25 Jul 2024 16:25:51 +0200 Subject: feat!(system): implement home services --- systems/mcdowell.scm | 25 ++++++++++++++++++------- users/marekpasnikowski.scm | 10 +++++++++- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm index ed1eaaa..7994ac8 100644 --- a/systems/mcdowell.scm +++ b/systems/mcdowell.scm @@ -1,4 +1,6 @@ (define-module (systems mcdowell) + #:use-module (gnu services) ; service + #:use-module (gnu services guix) ; guix-home-service-type #:use-module (machines portable-bios) ; bootloader-configuration* ; file-systems* ; firmware* @@ -6,6 +8,8 @@ ; kernel* #:use-module (suweren system) ; %suweren-operating-system #:use-module (users marekpasnikowski) ; marekpasnikowski-account + ; marekpasnikowski-home-environment + ; marekpasnikowski-username ) ;; string @@ -18,12 +22,19 @@ ;; record operating-system (define operating-system* - (%suweren-operating-system kernel* - bootloader-configuration* - initrd* - firmware* - host-name* - (file-systems* host-name*) - users*)) + (let* ((home-environments `((,marekpasnikowski-username ,marekpasnikowski-home-environment))) + + (guix-home (service guix-home-service-type + home-environments)) + + (services* (list guix-home))) + (%suweren-operating-system kernel* + bootloader-configuration* + initrd* + firmware* + host-name* + (file-systems* host-name*) + users* + services*))) operating-system* diff --git a/users/marekpasnikowski.scm b/users/marekpasnikowski.scm index 6513d88..d6922d1 100644 --- a/users/marekpasnikowski.scm +++ b/users/marekpasnikowski.scm @@ -21,6 +21,10 @@ (append %suweren-home-services profile))) +;; string +(define-public marekpasnikowski-username + "marek") + (define-public home (let ((services (append %suweren-home-services marekpasnikowski-services))) @@ -29,5 +33,9 @@ ;; record user-account (define-public marekpasnikowski-account - (user-account (name "marek") + (user-account (name marekpasnikowski-username) (group "users"))) + +;; record home-environment +(define-public marekpasnikowski-home-environment + (home-environment)) -- cgit v1.2.3