From 1eec92abfd1413427205e40ac2a6d7629f108d2d Mon Sep 17 00:00:00 2001 From: anemofilia Date: Mon, 2 Oct 2023 09:26:03 -0300 Subject: [PATCH] refactor: use service instead of simple-service whenever possible --- radio.scm | 159 +++++++++++++++++++++++++++--------------------------- 1 file changed, 78 insertions(+), 81 deletions(-) diff --git a/radio.scm b/radio.scm index 6907f5b..582afcc 100644 --- a/radio.scm +++ b/radio.scm @@ -94,91 +94,88 @@ (cache-home "$HOME/.cache") (config-home "$HOME/.config") (data-home "$HOME/.local/share") - (runtime-dir "/run/user/1000") (log-home "$HOME/.local/var/log") - (state-home "$HOME/.local/state"))) + (state-home "$HOME/.local/state") + (runtime-dir "/run/user/1000"))) - (simple-service 'xdg-user-directories-service - home-xdg-user-directories-service-type - (home-xdg-user-directories-configuration - (desktop "$HOME/area") - (documents "$HOME/documents") - (download "$HOME/.local/share/downloads") - (music "$HOME/media/music") - (pictures "$HOME/media/pictures") - (videos "$HOME/media/videos") - (publicshare "") - (templates ""))) + (service home-xdg-user-directories-service-type + (home-xdg-user-directories-configuration + (desktop "$HOME/area") + (documents "$HOME/documents") + (download "$HOME/.local/share/downloads") + (music "$HOME/media/music") + (pictures "$HOME/media/pictures") + (videos "$HOME/media/videos") + (publicshare "") + (templates ""))) - (simple-service 'xdg-mime-applications-service - home-xdg-mime-applications-service-type - (home-xdg-mime-applications-configuration - (default (associate-right - ('icecat.desktop - `("text/html" - "application/xhtml+xml" - "application/x-extension-htm" - "application/x-extension-xhtml" - "application/x-extension-xht" - "x-scheme-handler/http" - "x-scheme-handler/https")) - ('kak.desktop - `("text/plain" - "text/troff" - "text/xml" - "text/x-c" - "text/x-c++" - "text/x-diff" - "text/x-lisp" - "text/x-scheme" - "text/x-shellscript" - "text/x-tex")) - ('lf.desktop - `("inode/directory" - "x-scheme-handler/ftp" - "x-scheme-handler/nfs" - "x-scheme-handler/smb" - "x-scheme-handler/ssh" - "application/x-directory")) - ('mpv.desktop - `("image/gif" - "audio/mpeg" - "audio/ogg" - "audio/opus" - "audio/x-opus+ogg" - "video/mp4" - "video/x-matroska" - "video/webm")) - ('imv.desktop - `("image/avif" - "image/bmp" - "image/jpeg" - "image/png" - "image/svg+xml" - "image/webp")) - ('org.pwmt.zathura.desktop - `("image/vnd.djvu" - "application/pdf" - "application/epub+zip")))))) + (service home-xdg-mime-applications-service-type + (home-xdg-mime-applications-configuration + (default (associate-right + ('icecat.desktop + `("text/html" + "application/xhtml+xml" + "application/x-extension-htm" + "application/x-extension-xhtml" + "application/x-extension-xht" + "x-scheme-handler/http" + "x-scheme-handler/https")) + ('kak.desktop + `("text/plain" + "text/troff" + "text/xml" + "text/x-c" + "text/x-c++" + "text/x-diff" + "text/x-lisp" + "text/x-scheme" + "text/x-shellscript" + "text/x-tex")) + ('lf.desktop + `("inode/directory" + "x-scheme-handler/ftp" + "x-scheme-handler/nfs" + "x-scheme-handler/smb" + "x-scheme-handler/ssh" + "application/x-directory")) + ('mpv.desktop + `("image/gif" + "audio/mpeg" + "audio/ogg" + "audio/opus" + "audio/x-opus+ogg" + "video/mp4" + "video/x-matroska" + "video/webm")) + ('imv.desktop + `("image/avif" + "image/bmp" + "image/jpeg" + "image/png" + "image/svg+xml" + "image/webp")) + ('org.pwmt.zathura.desktop + `("image/vnd.djvu" + "application/pdf" + "application/epub+zip")))))) - (simple-service 'xdg-configuration-files-service - home-xdg-configuration-files-service-type - `(("awesome/rc.lua" ,file:awesome-config) - ("awesome/themes/current.lua" ,file:awesome-theme) - ("emacs/init.el" ,file:emacs-init) - ("emacs/theme.el" ,file:emacs-theme) - ("fish/fish_variables" ,file:fish-variables) - ("fish/functions/fish_greeting.fish" ,file:fish-greeting) - ("fish/functions/fish_prompt.fish" ,file:fish-prompt) - ("git/config" ,file:git-config) - ("infokeys" ,file:info-keys) - ("kak/kakrc" ,file:kak-config) - ("kak/autoload/colorscheme.kak" ,file:kak-colorscheme) - ("lf/lfrc" ,file:lf-config) - ("mpv/mpv.conf" ,file:mpv-config) - ("mpv/input.conf" ,file:mpv-input) - ("newsraft/config" ,file:newsraft-config) - ("zathura/zathurarc" ,file:zathura-config))) + (service home-xdg-configuration-files-service-type + `(("awesome/rc.lua" ,file:awesome-config) + ("awesome/themes/current.lua" ,file:awesome-theme) + ("emacs/init.el" ,file:emacs-init) + ("emacs/theme.el" ,file:emacs-theme) + ("fish/fish_variables" ,file:fish-variables) + ("fish/functions/fish_greeting.fish" ,file:fish-greeting) + ("fish/functions/fish_prompt.fish" ,file:fish-prompt) + ("git/config" ,file:git-config) + ("infokeys" ,file:info-keys) + ("kak/kakrc" ,file:kak-config) + ("kak/autoload/colorscheme.kak" ,file:kak-colorscheme) + ("lf/lfrc" ,file:lf-config) + ("mpv/mpv.conf" ,file:mpv-config) + ("mpv/input.conf" ,file:mpv-input) + ("newsraft/config" ,file:newsraft-config) + ("zathura/zathurarc" ,file:zathura-config))) #|Guix service|# (simple-service 'channels-service