summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deployment/systems/akashi.scm21
1 files changed, 20 insertions, 1 deletions
diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm
index dc0545f..b0976be 100644
--- a/deployment/systems/akashi.scm
+++ b/deployment/systems/akashi.scm
@@ -3,9 +3,12 @@
(define-module (deployment systems akashi)
#:use-module ((gnu packages linux) #:prefix gnu:packages:linux:)
+ #:use-module ((gnu services) #:prefix gnu:services:)
+ #:use-module ((gnu services base) #:prefix gnu:services:base:)
#:use-module ((gnu services guix) #:prefix gnu:services:guix:)
#:use-module ((gnu system) #:prefix gnu:system:)
#:use-module ((machines thinkpad-x200) #:prefix machines:thinkpad-x200:)
+ #:use-module ((sovereign channels) #:prefix sovereign:channels:)
#:use-module ((sovereign systems) #:prefix sovereign:systems:)
#:use-module (users id1000))
@@ -29,13 +32,27 @@
((@ (gnu system keyboard) keyboard-layout)
"pl"))
+(define (guix-configuration record)
+ (gnu:services:base:guix-configuration
+ (inherit record)
+ (channels (list sovereign:channels:default-guix-channel
+ sovereign:channels:deployment-channel-staging
+ sovereign:channels:distribution-channel
+ sovereign:channels:nonguix-channel
+ sovereign:channels:sovereign-channel))))
+
+(define %sovereign-services*
+ (gnu:services:modify-services sovereign:systems:%sovereign-services
+ (gnu:services:base:guix-service-type
+ record => (guix-configuration record))))
+
(define (services)
(use-modules (suweren system))
(let* ((home-environments `((,uid1000-name ,uid1000-home-environment)))
(guix-home ((@ (gnu services) service)
gnu:services:guix:guix-home-service-type
home-environments)))
- (append sovereign:systems:%sovereign-services
+ (append %sovereign-services*
(list guix-home
((@ (gnu services base) udev-rules-service)
'adb-udev
@@ -51,6 +68,8 @@
(timezone* "Europe/Warsaw"))
(gnu:system:operating-system
(kernel gnu:packages:linux:linux-libre)
+ (kernel-arguments (cons* "thinkpad_acpi.fan_control=1"
+ gnu:system:%default-kernel-arguments))
(bootloader (machines:thinkpad-x200:bootloader-configuration* keyboard-layout*))
(label (sovereign:systems:operating-system-label* host-name*
(gnu:system:operating-system-default-label gnu:system:this-operating-system)))