Refactor sway-service-type to sway-packages

3 files changed, 26 insertions, 24 deletions

diff --git a/aisaka.org b/aisaka.org
index 620ba27..25d9b0c 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -100,17 +100,18 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
 
 #+name: sway-packages
 #+begin_src scheme
-  (define-public sway-service-type
-    (service-type
-     (name 'sway)
-     (extensions
-      `(,(service-extension home-profile-service-type
-			  (lambda (_)
-			    (map specification->package
-				 '("sway"
-				   "waybar"))))))
-     (description "Sway Window Manager installation.")
-     (default-value #f)))
+  (define-public sway-packages
+    (service
+     (service-type
+      (name 'sway-packages)
+      (extensions
+       `(,(service-extension home-profile-service-type
+			     (lambda (_)
+			       (map specification->package
+				    '("sway"
+				      "waybar"))))))
+      (description "Sway Window Manager installation.")
+      (default-value #f))))
 #+end_src
 
 *** TODO Sway configuration
@@ -326,6 +327,7 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
    (services
     `(,ssh-configuration
       ,sway-configuration
+      ,sway-packages
       ,(service flashrom-service-type)
       ,(service home-bash-service-type
 		(home-bash-configuration
@@ -346,7 +348,6 @@ The Sway Window Manager consists of Sway packages and relevant configurations.
 			    ("system-update-" . ,system-update-)))
 		 (bash-profile `(,(local-file "bash_profile")))
 		 (bashrc `(,(local-file "bashrc")))))
-      ,(service sway-service-type)
       ,(simple-service 'configuration-files
 		       home-files-service-type
 		       `((".config/git/config" ,(local-file "git.config"))
diff --git a/home-configuration.scm b/home-configuration.scm
index 7f4b395..fb2fbd6 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -114,6 +114,7 @@
  (services
   `(,ssh-configuration
     ,sway-configuration
+    ,sway-packages
     ,(service flashrom-service-type)
     ,(service home-bash-service-type
 	      (home-bash-configuration
@@ -134,7 +135,6 @@
 			  ("system-update-" . ,system-update-)))
 	       (bash-profile `(,(local-file "bash_profile")))
 	       (bashrc `(,(local-file "bashrc")))))
-    ,(service sway-service-type)
     ,(simple-service 'configuration-files
 		     home-files-service-type
 		     `((".config/git/config" ,(local-file "git.config"))
diff --git a/services/sway.scm b/services/sway.scm
index 018144f..3e11867 100644
--- a/services/sway.scm
+++ b/services/sway.scm
@@ -6,17 +6,18 @@
   #:use-module (gnu home services)
   #:use-module (gnu home services shells))
 
-(define-public sway-service-type
-  (service-type
-   (name 'sway)
-   (extensions
-    `(,(service-extension home-profile-service-type
-			(lambda (_)
-			  (map specification->package
-			       '("sway"
-				 "waybar"))))))
-   (description "Sway Window Manager installation.")
-   (default-value #f)))
+(define-public sway-packages
+  (service
+   (service-type
+    (name 'sway-packages)
+    (extensions
+     `(,(service-extension home-profile-service-type
+			   (lambda (_)
+			     (map specification->package
+				  '("sway"
+				    "waybar"))))))
+    (description "Sway Window Manager installation.")
+    (default-value #f))))
 
 (define-public sway-configuration
   (simple-service 'configuration-files home-files-service-type