diff options
| -rw-r--r-- | machines/portable-bios.scm | 11 | ||||
| -rw-r--r-- | systems/mcdowell.scm | 18 | ||||
| -rw-r--r-- | users/marekpasnikowski.scm | 6 |
3 files changed, 24 insertions, 11 deletions
diff --git a/machines/portable-bios.scm b/machines/portable-bios.scm index 3cc9c79..f531a16 100644 --- a/machines/portable-bios.scm +++ b/machines/portable-bios.scm @@ -2,11 +2,10 @@ #:use-module (gnu bootloader) ; bootloader-configuration #:use-module (gnu bootloader grub) ; grub-bootloader #:use-module (gnu system file-systems) ; file-system - #:use-module (suweren system) ; %suweren-operating-system ) ;; bootloader-configuration -(define bootloader-configuration* +(define-public bootloader-configuration* (let ((bootloader* grub-bootloader) (bootloader-targets (list "/dev/sdb")) ; TODO: generalize the target ) @@ -14,7 +13,7 @@ (targets bootloader-targets)))) ;; string -> (file-system) -(define (file-systems* host-name*) +(define-public (file-systems* host-name*) (let* ((root-device-string (string-append host-name* "-root")) (root-device (file-system-label root-device-string)) @@ -23,9 +22,3 @@ (mount-point "/") (device root-device)))) (list file-system-root))) - -;; string -> record operating-system -(define-public (operating-system* host-name*) - (%suweren-operating-system bootloader-configuration* - host-name* - (file-systems* host-name*))) diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm index 4e97866..55fb530 100644 --- a/systems/mcdowell.scm +++ b/systems/mcdowell.scm @@ -1,9 +1,23 @@ (define-module (systems mcdowell) - #:use-module (machines portable-bios) ; portable-operating-system + #:use-module (machines portable-bios) ; bootloader-configuration* + ; file-systems* + #:use-module (suweren system) ; %suweren-operating-system + #:use-module (users marekpasnikowski) ; marekpasnikowski-account ) ;; string (define host-name* "mcdowell") -(operating-system* host-name*) +;; (record user-account) +(define users* + (list marekpasnikowski-account)) + +;; record operating-system +(define operating-system* + (%suweren-operating-system bootloader-configuration* + host-name* + (file-systems* host-name*) + users*)) + +operating-system* diff --git a/users/marekpasnikowski.scm b/users/marekpasnikowski.scm index 0573f2f..6513d88 100644 --- a/users/marekpasnikowski.scm +++ b/users/marekpasnikowski.scm @@ -5,6 +5,7 @@ #:use-module (gnu packages emacs-xyz) ; emacs-org-roam emacs-paredit #:use-module (gnu packages librewolf) ; librewolf #:use-module (gnu services) ; simple-service + #:use-module (gnu system shadow) ; user-account #:use-module (suweren home) ; %home-environment %suweren-home-services ) @@ -25,3 +26,8 @@ marekpasnikowski-services))) (home-environment (inherit %home-environment) (services marekpasnikowski-services)))) + +;; record user-account +(define-public marekpasnikowski-account + (user-account (name "marek") + (group "users"))) |