summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marek@marekpasnikowski.pl>2025-07-22 19:30:08 +0200
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2025-07-22 19:30:08 +0200
commitf159699fce681b0f01d6b3dec0b38002f4bf38f5 (patch)
tree3f34fac4597c01e6c601fae6c3e42734338c13ab
parentd40cdf18da29ae6fd8f3b9e13655eb2c317a0058 (diff)
Revert "[0] akashi: use the staging branch of Deployment channel"
This reverts commit 82a3d8b78629c66ebe2c0ace462d32532ac30e9f.
-rw-r--r--deployment/systems/akashi.scm19
1 files changed, 1 insertions, 18 deletions
diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm
index fba424b..a7d48d2 100644
--- a/deployment/systems/akashi.scm
+++ b/deployment/systems/akashi.scm
@@ -3,12 +3,9 @@
(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))
@@ -32,27 +29,13 @@
((@ (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-services*
+ (append sovereign:systems:%sovereign-services
(list guix-home
((@ (gnu services base) udev-rules-service)
'adb-udev