diff options
| -rw-r--r-- | machines/thinkpad-x200.scm | 21 | ||||
| -rw-r--r-- | systems/akashi.scm | 33 |
2 files changed, 16 insertions, 38 deletions
diff --git a/machines/thinkpad-x200.scm b/machines/thinkpad-x200.scm index 3e32fc0..b9bcbc7 100644 --- a/machines/thinkpad-x200.scm +++ b/machines/thinkpad-x200.scm @@ -7,14 +7,7 @@ ;; file-system ;; swap-space - #:use-module (gnu system file-systems) - - ;; linux - ;; linux-firmware - #:use-module (nongnu packages linux) - - ;; microcode-initrd - #:use-module (nongnu system linux-initrd)) + #:use-module (gnu system file-systems)) ;; bootloader-configuration (define-public (bootloader-configuration* keyboard-layout*) @@ -25,18 +18,6 @@ (targets bootloader-targets) (keyboard-layout keyboard-layout*)))) -;; (list record* package) -(define-public firmware* - (list linux-firmware)) - -;; record* package -(define-public initrd* - microcode-initrd) - -;; record* package -(define-public kernel* - linux) - ;; string -> ;; (list record* swap-space) (define-public (swap-devices* host-name*) diff --git a/systems/akashi.scm b/systems/akashi.scm index 0084d7f..69a4c6c 100644 --- a/systems/akashi.scm +++ b/systems/akashi.scm @@ -1,5 +1,13 @@ (define-module (systems akashi) - #:use-module (users id1000)) + #:use-module ((gnu packages linux) + #:prefix gnu:packages:linux:) + #:use-module ((gnu services guix) + #:prefix gnu:services:guix:) + #:use-module ((machines thinkpad-x200) + #:prefix machines:thinkpad-x200:) + #:use-module ((suweren commons sudoers) + #:prefix suweren:commons:sudoers:) + #:use-module (users id1000)) (define root-partition ((@ (gnu system file-systems) file-system) @@ -26,7 +34,7 @@ (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*)))) (guix-home ((@ (gnu services) service) - guix-home-service-type + gnu:services:guix:guix-home-service-type home-environments))) (append %suweren-services (list guix-home @@ -39,30 +47,19 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define (operating-system*) - (use-modules (gnu packages linux) - (gnu services guix) - (machines thinkpad-x200) - (nongnu packages linux) - (suweren commons sudoers) - (suweren system)) +(define-public operating-system* (let* ((patter-placeholder #f) (timezone* "Europe/Warsaw")) ((@ (gnu system) operating-system) - (kernel linux-libre) - (bootloader (bootloader-configuration* keyboard-layout*)) + (kernel gnu:packages:linux:linux-libre) + (bootloader (machines:thinkpad-x200:bootloader-configuration* keyboard-layout*)) (keyboard-layout keyboard-layout*) (host-name host-name*) (file-systems (file-systems)) - (swap-devices (swap-devices* host-name*)) + (swap-devices (machines:thinkpad-x200:swap-devices* host-name*)) (users users) (timezone timezone*) (locale polish-locale-string) (locale-definitions %suweren-locale-definitions) (services (services)) - (sudoers-file %sudoers-specification*)))) - -(define-public operating-system* - (operating-system*)) - -operating-system* + (sudoers-file suweren:commons:sudoers:%sudoers-specification*)))) |