seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2025-07-09 09:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: seasharp:1f7b63ae66d101856ef7011c8080705c60d496a4
Branches Tags
seasharp:trunk
seasharp:keyring
..
compare: seasharp:f1f47b6e2d9caaa58102b39ab457c388eb260707
Branches Tags
seasharp:trunk
seasharp:keyring

2 Commits
1f7b63ae66 ... f1f47b6e2d

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
Show Stats Expand all files Collapse all files

48
modules/rosenthal/services/shellutils.scm
View File

@ -45,21 +45,19 @@
(define %home-atuin-fish (define %home-atuin-fish
(match-record-lambda <home-atuin-configuration> (match-record-lambda <home-atuin-configuration>
(atuin shells) (atuin shells)
(if (member 'fish shells) (home-fish-extension
(home-fish-extension (config
(config (if (member 'fish shells)
(list (mixed-text-file "atuin.fish" (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 (define home-atuin-service-type
(service-type (service-type
(name 'atuin) (name 'atuin)
(extensions (extensions
`(,@(if %home-atuin-fish (list (service-extension home-fish-service-type
(list (service-extension home-fish-service-type %home-atuin-fish)))
%home-atuin-fish))
'())))
(description ""))) (description "")))
@ -78,21 +76,19 @@
(define %home-direnv-fish (define %home-direnv-fish
(match-record-lambda <home-direnv-configuration> (match-record-lambda <home-direnv-configuration>
(direnv shells) (direnv shells)
(if (member 'fish shells) (home-fish-extension
(home-fish-extension (config
(config (if (member 'fish shells)
(list (mixed-text-file "direnv.fish" (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 (define home-direnv-service-type
(service-type (service-type
(name 'direnv) (name 'direnv)
(extensions (extensions
`(,@(if %home-direnv-fish (list (service-extension home-fish-service-type
(list (service-extension home-fish-service-type %home-direnv-fish)))
%home-direnv-fish))
'())))
(description ""))) (description "")))
@ -111,19 +107,17 @@
(define %home-zoxide-fish (define %home-zoxide-fish
(match-record-lambda <home-zoxide-configuration> (match-record-lambda <home-zoxide-configuration>
(zoxide shells) (zoxide shells)
(if (member 'fish shells) (home-fish-extension
(home-fish-extension (config
(config (if (member 'fish shells)
(list (mixed-text-file "zoxide.fish" (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 (define home-zoxide-service-type
(service-type (service-type
(name 'zoxide) (name 'zoxide)
(extensions (extensions
`(,@(if %home-zoxide-fish (list (service-extension home-fish-service-type
(list (service-extension home-fish-service-type %home-zoxide-fish)))
%home-zoxide-fish))
'())))
(description ""))) (description "")))

4
modules/rosenthal/services/web.scm
View File

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