From 4af12bc100c97f410b02abecb21f5966fb6029fa Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Sat, 15 May 2021 17:56:17 +0200
Subject: [PATCH] runit per user improved

---
 roles/fish/files/fish/cli/config.fish |  1 -
 roles/runit/files/runit.fish          |  1 +
 roles/runit/tasks/main.yml            | 12 +++++++++++-
 roles/sway/templates/config.j2        |  2 --
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 roles/runit/files/runit.fish

diff --git a/roles/fish/files/fish/cli/config.fish b/roles/fish/files/fish/cli/config.fish
index 0af822b..b43a1a0 100644
--- a/roles/fish/files/fish/cli/config.fish
+++ b/roles/fish/files/fish/cli/config.fish
@@ -2,7 +2,6 @@ set -x LANG 'fr_FR.UTF-8'
 set -x EDITOR 'nvim'
 set -x VISUAL 'nvim'
 set -x PAGER 'most'
-set -x SVDIR '~/.config/service'
 set -gx SYSTEMD_PAGER 'less'
 set -U fish_greeting ""
 
diff --git a/roles/runit/files/runit.fish b/roles/runit/files/runit.fish
new file mode 100644
index 0000000..bab3c7f
--- /dev/null
+++ b/roles/runit/files/runit.fish
@@ -0,0 +1 @@
+set -x SVDIR '~/service'
diff --git a/roles/runit/tasks/main.yml b/roles/runit/tasks/main.yml
index 7c414a8..f189a13 100644
--- a/roles/runit/tasks/main.yml
+++ b/roles/runit/tasks/main.yml
@@ -1,5 +1,15 @@
 ---
 - name: create service dir
   file:
-    path: ~/.config/service
+    path: ~/service
     state: directory
+
+- name: set svdir in fish
+  copy:
+    src: runit.fish
+    dest: ~/.config/fish/conf.d/
+
+- name: user services
+  synchronize:
+    src: service/
+    dest: ~/service
diff --git a/roles/sway/templates/config.j2 b/roles/sway/templates/config.j2
index 16f351f..cae163f 100644
--- a/roles/sway/templates/config.j2
+++ b/roles/sway/templates/config.j2
@@ -230,7 +230,5 @@ exec mako
 exec syncthing
 
 # pipewire
-{% if ansible_os_family == 'void' %}
 exec pipewire
 exec pipewire-pulse
-{% endif %}