rde: features: Move bare-bone-os to a separate module v1 APPLIED

Kirill Yermak: 1
 rde: features: Move bare-bone-os to a separate module

 2 files changed, 22 insertions(+), 16 deletions(-)

[PATCH] rde: features: Move bare-bone-os to a separate module Export this patch

---
 src/rde/features.scm         | 18 ++----------------
 src/rde/system/bare-bone.scm | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 src/rde/system/bare-bone.scm

diff --git a/src/rde/features.scm b/src/rde/features.scm
index 470e203a..d9754599 100644
--- a/src/rde/features.scm
+++ b/src/rde/features.scm
@@ -29,6 +29,7 @@
   #:use-module (gnu system shadow)
   #:use-module (gnu system nss)
   #:use-module (gnu services guix)
+  #:use-module (rde system bare-bone)
   #:use-module (rde system services accounts)
   #:use-module (rde system services admin)
 
@@ -69,9 +70,7 @@
             service-type->rde-value
 
             ensure-pred
-            throw-message
-
-            bare-bone-os))
+            throw-message))
 
 (define (alist? lst)
   (every pair? lst))
@@ -309,19 +308,6 @@ can be later used to extend original service with additional configuration."
 (define (get-home-environment-packages config)
   (home-environment-packages (get-home-environment config)))
 
-(define bare-bone-os
-  (operating-system
-   (host-name "antelope")
-   (timezone  "Etc/UTC")
-   (locale    "en_US.utf8")
-   (bootloader (bootloader-configuration
-                (bootloader grub-efi-bootloader)
-                (targets '("/boot/efi"))))
-   (issue "This is RDE.  Welcome.\n")
-   (services '())
-   (sudoers-file #f)
-   (file-systems %base-file-systems)))
-
 (define (get-operating-system config)
   (let* ((initial-os (rde-config-initial-os config))
 
diff --git a/src/rde/system/bare-bone.scm b/src/rde/system/bare-bone.scm
new file mode 100644
index 00000000..a7b29626
--- /dev/null
+++ b/src/rde/system/bare-bone.scm
@@ -0,0 +1,20 @@
+(define-module (rde system bare-bone)
+  #:use-module (gnu system)
+  #:use-module (gnu system file-systems)
+  #:use-module (gnu bootloader)
+  #:use-module (gnu bootloader grub)
+
+  #:export (bare-bone-os))
+
+(define bare-bone-os
+  (operating-system
+   (host-name "antelope")
+   (timezone  "Etc/UTC")
+   (locale    "en_US.utf8")
+   (bootloader (bootloader-configuration
+                (bootloader grub-efi-bootloader)
+                (targets '("/boot/efi"))))
+   (issue "This is RDE.  Welcome.\n")
+   (services '())
+   (sudoers-file #f)
+   (file-systems %base-file-systems)))

Andrew Tropin <andrew@trop.in>

2 months ago

Applied, pushed.  Thank you!

-- 
2.47.0