From e9e3899c9ecf07ed57dcc87cc8889ff6d0193527 Mon Sep 17 00:00:00 2001 From: SqrtMinusOne Date: Fri, 2 Dec 2022 15:21:07 +0300 Subject: [PATCH] feat(qs): sqrt-data v3 --- .config/cron/sync.guile | 1 + .config/guix/manifests/desktop.scm | 1 - .config/guix/manifests/music.scm | 1 - .config/shepherd/init.scm | 18 +++++------------- Desktop.org | 25 +++++-------------------- 5 files changed, 11 insertions(+), 35 deletions(-) create mode 100644 .config/cron/sync.guile diff --git a/.config/cron/sync.guile b/.config/cron/sync.guile new file mode 100644 index 0000000..018daaf --- /dev/null +++ b/.config/cron/sync.guile @@ -0,0 +1 @@ +(job "0 * * * * " "sqrt_data_agent_sync") diff --git a/.config/guix/manifests/desktop.scm b/.config/guix/manifests/desktop.scm index 8365a80..a2c2800 100644 --- a/.config/guix/manifests/desktop.scm +++ b/.config/guix/manifests/desktop.scm @@ -1,6 +1,5 @@ (specifications->manifest '( - "megacmd-1.4" "activitywatch-bin" "xdg-desktop-portal" "flatpak" diff --git a/.config/guix/manifests/music.scm b/.config/guix/manifests/music.scm index 92dd529..d734ddd 100644 --- a/.config/guix/manifests/music.scm +++ b/.config/guix/manifests/music.scm @@ -4,7 +4,6 @@ "cuetools" "shntool" "mpd-mpc" - "mpd-watcher" "picard" "ncmpcpp" "mpd")) diff --git a/.config/shepherd/init.scm b/.config/shepherd/init.scm index 0efef9b..5db89bd 100644 --- a/.config/shepherd/init.scm +++ b/.config/shepherd/init.scm @@ -5,11 +5,11 @@ #:start (make-forkexec-constructor '("mpd" "--no-daemon")) #:stop (make-kill-destructor))) -(define mpd-watcher +(define sqrt-data-agent-mpd (make - #:provides '(mpd-watcher) + #:provides '(sqrt-data-agent-mpd) #:respawn? #t - #:start (make-forkexec-constructor '("mpd_watcher")) + #:start (make-forkexec-constructor '("sqrt_data_agent_mpd")) #:stop (make-kill-destructor) #:requires '(mpd))) @@ -97,16 +97,9 @@ #:start (make-forkexec-constructor '("/home/pavel/bin/davmail")) #:stop (make-kill-destructor))) -(define sqrt-data - (make - #:provides '(sqrt-data) - #:respawn? #t - #:start (make-forkexec-constructor '("sqrt_data" "cron" "run-client-cron")) - #:stop (make-kill-destructor))) - (register-services mpd - mpd-watcher + sqrt-data-agent-mpd mcron aw-server aw-watcher-afk @@ -118,8 +111,7 @@ vpn davmail xmodmap - nm-applet - sqrt-data) + nm-applet) (action 'shepherd 'daemonize) diff --git a/Desktop.org b/Desktop.org index d4e1770..dd46e47 100644 --- a/Desktop.org +++ b/Desktop.org @@ -3490,7 +3490,6 @@ I previously used supervisor, but shepherd also seems pretty capable. | music | mpd | | music | ncmpcpp | | music | picard | -| music | mpd-watcher | | music | mpd-mpc | | music | shntool | | music | cuetools | @@ -3508,11 +3507,11 @@ Music player daemon MPD watcher #+begin_src scheme -(define mpd-watcher +(define sqrt-data-agent-mpd (make - #:provides '(mpd-watcher) + #:provides '(sqrt-data-agent-mpd) #:respawn? #t - #:start (make-forkexec-constructor '("mpd_watcher")) + #:start (make-forkexec-constructor '("sqrt_data_agent_mpd")) #:stop (make-kill-destructor) #:requires '(mpd))) #+end_src @@ -3650,21 +3649,12 @@ Run my [[file:Guix.org::*VPN][OpenVPN setup]]. Not lauching this automatially, a #:start (make-forkexec-constructor '("/home/pavel/bin/davmail")) #:stop (make-kill-destructor))) #+end_src -** sqrt-data -#+begin_src scheme -(define sqrt-data - (make - #:provides '(sqrt-data) - #:respawn? #t - #:start (make-forkexec-constructor '("sqrt_data" "cron" "run-client-cron")) - #:stop (make-kill-destructor))) -#+end_src ** Shepherd config Register services #+begin_src scheme (register-services mpd - mpd-watcher + sqrt-data-agent-mpd mcron aw-server aw-watcher-afk @@ -3676,8 +3666,7 @@ Register services vpn davmail xmodmap - nm-applet - sqrt-data) + nm-applet) #+end_src Daemonize shepherd @@ -3702,10 +3691,6 @@ Run services nm-applet sqrt-data)) #+end_src -** Sync -| Guix dependency | -|-----------------| -| megacmd-1.4 | * Guix settings Other desktop programs I use are listed below.