From 084423d5977cd059df1069515f6cc9f12bf14cb6 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marekpasnikowski@protonmail.com>
Date: Tue, 10 Jan 2023 01:22:18 +0100
Subject: Refactor flashrom-service-type to flashrom-package

---
 aisaka.org             | 28 +++++++++++++++-------------
 home-configuration.scm |  4 ++--
 services/flashrom.scm  | 21 +++++++++++----------
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/aisaka.org b/aisaka.org
index 25d9b0c..00fb62b 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -1,5 +1,5 @@
 #+TITLE: Configuration of the Aisaka computer -*- mode: org -*-
-#+STARTUP: content
+#+STARTUP: overview
 
 * TODO LIBREBOOT
 
@@ -28,19 +28,21 @@ This service installs flashrom.
 
 #+name: flashrom-package
 #+begin_src scheme
-  (define-public flashrom-service-type
-    (service-type
-     (name 'flashrom)
-     (extensions
-      `(,(service-extension home-profile-service-type
-			    (lambda (_)
-			      (map specification->package
-				   '("flashrom"))))))
-     (description "Flashrom installation.")
-     (default-value #f)))
+  (define-public flashrom-package
+    (service
+     (service-type
+      (name 'flashrom-package)
+      (extensions
+       `(,(service-extension home-profile-service-type
+			     (lambda (_)
+			       (map specification->package
+				    '("flashrom"))))))
+      (description "Flashrom installation.")
+      (default-value #f))))
 #+end_src
 
 * TODO System Servers
+
 ** TODO Secure Shell
 
 #+name: ssh-server
@@ -325,10 +327,10 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
 		    "unzip"
 		    "zip")))
    (services
-    `(,ssh-configuration
+    `(,flashrom-package
+      ,ssh-configuration
       ,sway-configuration
       ,sway-packages
-      ,(service flashrom-service-type)
       ,(service home-bash-service-type
 		(home-bash-configuration
 		 (environment-variables '(("EDITOR" . "emacs -nw")
diff --git a/home-configuration.scm b/home-configuration.scm
index fb2fbd6..e9018c7 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -112,10 +112,10 @@
 		  "unzip"
 		  "zip")))
  (services
-  `(,ssh-configuration
+  `(,flashrom-package
+    ,ssh-configuration
     ,sway-configuration
     ,sway-packages
-    ,(service flashrom-service-type)
     ,(service home-bash-service-type
 	      (home-bash-configuration
 	       (environment-variables '(("EDITOR" . "emacs -nw")
diff --git a/services/flashrom.scm b/services/flashrom.scm
index 1e04373..97a5d17 100644
--- a/services/flashrom.scm
+++ b/services/flashrom.scm
@@ -4,13 +4,14 @@
   #:use-module (gnu home services)
   #:use-module (gnu home services shells))
 
-(define-public flashrom-service-type
-  (service-type
-   (name 'flashrom)
-   (extensions
-    `(,(service-extension home-profile-service-type
-			  (lambda (_)
-			    (map specification->package
-				 '("flashrom"))))))
-   (description "Flashrom installation.")
-   (default-value #f)))
+(define-public flashrom-package
+  (service
+   (service-type
+    (name 'flashrom-package)
+    (extensions
+     `(,(service-extension home-profile-service-type
+			   (lambda (_)
+			     (map specification->package
+				  '("flashrom"))))))
+    (description "Flashrom installation.")
+    (default-value #f))))
-- 
cgit v1.2.3