diff options
| author | Marek Paśnikowski <marekpasnikowski@protonmail.com> | 2023-01-10 01:04:13 +0100 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2023-01-10 01:04:13 +0100 |
| commit | 538954718d04d6867d573a24437a5dde020ef68e (patch) | |
| tree | 6ec3d668b7661c506f6a56f4bb40a1f2ae0e8c95 | |
| parent | 0baf98b595641e77f720fd981b7d57b97896a9c7 (diff) | |
Refactor sway-service-type to sway-packages
| -rw-r--r-- | aisaka.org | 25 | ||||
| -rw-r--r-- | home-configuration.scm | 2 | ||||
| -rw-r--r-- | services/sway.scm | 23 |
3 files changed, 26 insertions, 24 deletions
@@ -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 |