Compare commits

...

2 Commits

Author SHA1 Message Date
Hilton Chain
f1f47b6e2d
services: shellutils: Avoid dynamic extensions.
This would create different service type objects.

* modules/rosenthal/services/shellutils.scm (%home-atuin-fish)
(home-atuin-service-type, %home-direnv-fish, home-direnv-service-type)
(%home-zoxide-fish, home-zoxide-service-type): Avoid dynamically extensions.
2025-06-27 10:47:42 +08:00
Hilton Chain
10251b17f0
services: misskey: Adjust serializer usage.
* modules/rosenthal/services/web.scm (misskey-oci-containers): Adjust
serializer usage.
2025-06-27 10:45:28 +08:00
2 changed files with 22 additions and 30 deletions

View File

@ -45,21 +45,19 @@
(define %home-atuin-fish
(match-record-lambda <home-atuin-configuration>
(atuin shells)
(if (member 'fish shells)
(home-fish-extension
(config
(home-fish-extension
(config
(if (member 'fish shells)
(list (mixed-text-file "atuin.fish"
atuin "/bin/atuin init fish | source\n")))))))
atuin "/bin/atuin init fish | source\n"))
'())))))
(define home-atuin-service-type
(service-type
(name 'atuin)
(extensions
`(,@(if %home-atuin-fish
(list (service-extension home-fish-service-type
%home-atuin-fish))
'())))
(list (service-extension home-fish-service-type
%home-atuin-fish)))
(description "")))
@ -78,21 +76,19 @@
(define %home-direnv-fish
(match-record-lambda <home-direnv-configuration>
(direnv shells)
(if (member 'fish shells)
(home-fish-extension
(config
(home-fish-extension
(config
(if (member 'fish shells)
(list (mixed-text-file "direnv.fish"
direnv "/bin/direnv hook fish | source\n")))))))
direnv "/bin/direnv hook fish | source\n"))
'())))))
(define home-direnv-service-type
(service-type
(name 'direnv)
(extensions
`(,@(if %home-direnv-fish
(list (service-extension home-fish-service-type
%home-direnv-fish))
'())))
(list (service-extension home-fish-service-type
%home-direnv-fish)))
(description "")))
@ -111,19 +107,17 @@
(define %home-zoxide-fish
(match-record-lambda <home-zoxide-configuration>
(zoxide shells)
(if (member 'fish shells)
(home-fish-extension
(config
(home-fish-extension
(config
(if (member 'fish shells)
(list (mixed-text-file "zoxide.fish"
zoxide "/bin/zoxide init --cmd cd fish | source\n")))))))
zoxide "/bin/zoxide init --cmd cd fish | source\n"))
'())))))
(define home-zoxide-service-type
(service-type
(name 'zoxide)
(extensions
`(,@(if %home-zoxide-fish
(list (service-extension home-fish-service-type
%home-zoxide-fish))
'())))
(list (service-extension home-fish-service-type
%home-zoxide-fish)))
(description "")))

View File

@ -409,9 +409,7 @@
(match-record-lambda <misskey-configuration>
(image config data-directory log-file )
(let ((config-file
(mixed-text-file
"misskey.yaml"
#~(string-append #$@(yaml-serialize config) "\n"))))
(mixed-text-file "misskey.yaml" (yaml-serialize config))))
(list (oci-container-configuration
(user "misskey")
(group "docker")