runit: be smarter about how to setup daemons

config.yaml

@@ -56,6 +56,10 @@ variables:
 
 ###############################################################
 profiles:
+###############################################################
+
+###############################################################
+# Accents
 ###############################################################
 
     dark:
@@ -163,10 +167,8 @@ profiles:
 
 
 ###############################################################
-# Os profiles
-###############################################################
-
     common:
+###############################################################
         variables:
             # gtk_theme:      "Mint-Y{{@@ '-Dark' if color.type == 'dark' else '' @@}}-{{@@ accent_color_name.capitalize() @@}}"
             gtk_theme:      "Orchis-{{@@ accent_color_name.lower() @@}}-{{@@ 'dark' if color.type == 'dark' else 'light' @@}}"
@@ -231,33 +233,18 @@ profiles:
             - xdpw
             - zathura
 
+###############################################################
+# Os profiles
+###############################################################
+
     voidlinux:
         include:
             - "common"
         variables:
+            user_svdir: $HOME/.config/runit
             supervisor: runit
-            runit_enable:
-                - gammastep
-                - kanshi
-                - kdeconnect-indicator
-                - kdeconnectd
-                - libinput-gestures
-                - mako
-                - mpDris2
-                - mpd
-                - notify-mail
-                - pipewire
-                - pipewire-media-session
-                - pulseaudio
-                - swayidle
-                - syncthing
-                - telegram
-                - udiskie
-                - waybar
-                - xdpw
-                - xsettingsd
         dotfiles:
-            - services
+            - runit_services
 
     artixlinux:
         include:
@@ -358,8 +345,6 @@ actions:
         https://github.com/alexanderjeurissen/ranger_devicons
         ~/.config/ranger/plugins/ranger_devicons
 
-    enable_runit_services: _runit_config "{{@@ _dotfile_abs_dst @@}}" {{@@ ' '.join(runit_enable) @@}}
-
     # bootstrap scripts
     pam_gpg: _pam-gpg-strap
     make_theme: _make_theme
@@ -485,11 +470,9 @@ dotfiles: # Just a bunch of paths and action mappings
         - make_theme
         - groups_install
 
-    services:
+    runit_services:
         src: runit_sv
-        dst: ~/.config/runit/sv
-        actions:
-        - enable_runit_services
+        dst: ~/.config/runit
 
     libinput-gestures:
         src: libinput-gestures.conf

dotfiles/fish/config.fish

@@ -15,7 +15,9 @@ if status is-interactive
     source {$__fish_config_dir}/keys.fish
     source {$__fish_config_dir}/tmux.fish
     source {$__fish_config_dir}/colors.fish
-    source {$__fish_config_dir}/plugins.fish
+    if test "$USER" != root
+        source {$__fish_config_dir}/plugins.fish
+    end
 
 end
 

dotfiles/runit_sv/dbus-daemon/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec _start_dbus-daemon

dotfiles/runit_sv/geoclue/run

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-PATH="/usr/lib/geoclue-2.0/demos/:/usr/libexec/geoclue-2.0/demos/"
-
-exec agent

dotfiles/runit_sv/light/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec light -N 1

dotfiles/runit_sv/redshift/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec redshift

dotfiles/scripts/_runit_config

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-mkdir -p "$1"
-cd `dirname $1` && shift
-
-create_logger() {
-    pushd sv/
-    for svd in */; do
-        pushd "$svd"
-
-        if ! test -d log; then
-            mkdir -p log
-            ln -s "$(which _default_logger)" log/run
-        fi
-
-        popd
-    done
-    popd
-}
-
-enable_defaults() {
-
-    mkdir -p "runsvdir/default"
-    pushd "runsvdir/default"
-
-    svdir="$(readlink -f ../../sv)"
-
-    for sv; do
-        ln -fs "$svdir/$sv" .
-    done
-    popd
-}
-
-create_logger
-
-test -f .inited && exit 0
-
-enable_defaults "$@"
-
-touch .inited

dotfiles/sway/config

@@ -42,7 +42,7 @@ include modes
 include assigns
 
 {%@@ if profile in ["voidlinux"] @@%}
-    set $user_svd "$HOME/.config/runit/runsvdir/default"
+    set $user_svd "{{@@ user_svdir @@}}"
     exec_always pgrep -u "$USER" "^runsvdir$" || runsvdir $user_svd
     exec_always env SVDIR=$user_svd sv hup kanshi
     exec_always env SVDIR=$user_svd sv hup waybar
@@ -51,6 +51,7 @@ include assigns
     include daemons
 {%@@ endif @@%}
 
+exec light -N 1
 exec dbus-update-activation-environment DISPLAY XAUTHORITY SWAYSOCK I3SOCK WAYLAND_DISPLAY
 
 # Prevent the screen from locking if fullscreen

root/config.yaml

@@ -43,7 +43,7 @@ actions:
     dbus_uuidgen: dbus-uuidgen --ensure
     sysctl_apply: sysctl -a
     mkinitcpio: mkinitcpio -P
-    enable_runit_services: _runit_config "{{@@ _dotfile_abs_dst @@}}" {{@@ ' '.join(runit_autostart) @@}}
+    enable_runit_services: ln -sf "{{@@ sys_services @@}}/{0}" "{{@@ sys_svdir @@}}/{0}"
 
 ###############################################################
 profiles:
@@ -63,25 +63,15 @@ profiles:
 
     voidlinux:
         variables:
-            runit_autostart:
-                - acpid
-                - bluetoothd
-                - crond
-                - dbus
-                - dhcpcd
-                - docker
-                - iwd
-                - ntpd
-                - rundird
-                - seatd
-                - socklog-unix
-                - tlp
+            sys_services: /etc/sv
+            sys_svdir: /etc/runit/runsvdir/default/
         include:
             - "common"
         dotfiles:
             - elogind
             - libc_locales
             - runit_services
+            - runit_services_enable
 
     artixlinux:
         include:
@@ -198,7 +188,20 @@ dotfiles:
     runit_services:
         src: runit_sv
         dst: /etc/runit/sv
+
+    runit_services_enable:
+        src:
+        dst:
         actions:
-        - enable_runit_services
-
-
+        - enable_runit_services acpid
+        - enable_runit_services bluetoothd
+        - enable_runit_services crond
+        - enable_runit_services dbus
+        - enable_runit_services dhcpcd
+        - enable_runit_services docker
+        - enable_runit_services iwd
+        - enable_runit_services ntpd
+        - enable_runit_services rundird
+        - enable_runit_services seatd
+        - enable_runit_services socklog-unix
+        - enable_runit_services tlp