From 04b868c65e21c853f9d7364cafcd1fd97f75ac3d Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Sun, 29 Nov 2020 17:24:00 +0100
Subject: [PATCH] Move systemd tasks to different repo

---
 roles/development/handlers/main.yml      |  8 +---
 roles/development/tasks/coc.yml          | 33 ++++++++++++++
 roles/development/tasks/main.yml         | 58 +-----------------------
 roles/development/templates/ssh-agent.j2 | 12 -----
 roles/development/templates/tmux.j2      | 13 ------
 roles/development/vars/archlinux.yml     |  2 +
 6 files changed, 37 insertions(+), 89 deletions(-)
 create mode 100644 roles/development/tasks/coc.yml
 delete mode 100644 roles/development/templates/ssh-agent.j2
 delete mode 100644 roles/development/templates/tmux.j2

diff --git a/roles/development/handlers/main.yml b/roles/development/handlers/main.yml
index cc3328b..8b13789 100644
--- a/roles/development/handlers/main.yml
+++ b/roles/development/handlers/main.yml
@@ -1,7 +1 @@
-- name: restart ssh-agent
-  systemd:
-    name: ssh-agent
-    state: restarted
-    enabled: yes
-    daemon-reload: yes
-    scope: user
+
diff --git a/roles/development/tasks/coc.yml b/roles/development/tasks/coc.yml
new file mode 100644
index 0000000..f8e4166
--- /dev/null
+++ b/roles/development/tasks/coc.yml
@@ -0,0 +1,33 @@
+- name: install coc.nvim node packages
+  npm:
+    path: "{{ xdg_data_dir }}/nvim/site/pack/default/start/coc.nvim"
+    state: present
+    global: false
+
+- name: create default coc.nvim venv directory
+  file:
+    path: "{{ ansible_env.HOME }}/.local/lib/coc"
+    state: directory
+    mode: "0755"
+
+- name: copy coc pyproject.toml
+  template:
+    src: "pyproject.j2"
+    dest: "{{ ansible_env.HOME }}/.local/lib/coc/pyproject.toml"
+    mode: "0644"
+    force: false
+
+- name: set default venv python version
+  command: "poetry env use python3"
+  args:
+    chdir: "{{ ansible_env.HOME }}/.local/lib/coc"
+  environment:
+    PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
+  when: ansible_distribution == "Debian"
+
+- name: install default coc.nvim python packages # noqa 301
+  command: "poetry install"
+  args:
+    chdir: "{{ ansible_env.HOME }}/.local/lib/coc"
+  environment:
+    PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
diff --git a/roles/development/tasks/main.yml b/roles/development/tasks/main.yml
index 46311fa..71e29e4 100644
--- a/roles/development/tasks/main.yml
+++ b/roles/development/tasks/main.yml
@@ -51,60 +51,4 @@
     name: common
     tasks_from: "poetry"
 
-- name: coc.nvim setup
-  block:
-    - name: install coc.nvim node packages
-      npm:
-        path: "{{ xdg_data_dir }}/nvim/site/pack/default/start/coc.nvim"
-        state: present
-        global: false
-    - name: create default coc.nvim venv directory
-      file:
-        path: "{{ ansible_env.HOME }}/.local/lib/coc"
-        state: directory
-        mode: "0755"
-    - name: copy coc pyproject.toml
-      template:
-        src: "pyproject.j2"
-        dest: "{{ ansible_env.HOME }}/.local/lib/coc/pyproject.toml"
-        mode: "0644"
-        force: false
-    - name: set default venv python version
-      command: "poetry env use python3"
-      args:
-        chdir: "{{ ansible_env.HOME }}/.local/lib/coc"
-      environment:
-        PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
-      when: ansible_distribution == "Debian"
-    - name: install default coc.nvim python packages # noqa 301
-      command: "poetry install"
-      args:
-        chdir: "{{ ansible_env.HOME }}/.local/lib/coc"
-      environment:
-        PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
-
-- name: systemd user setup
-  block:
-    - name: setup systemd user service folder
-      file:
-        path: "{{ xdg_config_dir }}/systemd/user"
-        state: directory
-        mode: "0755"
-    - name: add ssh-agent service
-      template:
-        src: "ssh-agent.j2"
-        dest: "{{ ansible_env.HOME }}/.config/systemd/user/ssh-agent.service"
-        mode: "0644"
-      notify: restart ssh-agent
-    - name: copy tmux service
-      template:
-        src: "tmux.j2"
-        dest: "{{ xdg_config_dir }}/systemd/user/tmux.service"
-        force: false
-        mode: "0644"
-    - name: copy tmux startup script
-      copy:
-        src: "tmux_start"
-        dest: "{{ ansible_env.HOME }}/.local/bin/tmux_start"
-        mode: "0740"
-        force: false
+- include_tasks: coc.yml
diff --git a/roles/development/templates/ssh-agent.j2 b/roles/development/templates/ssh-agent.j2
deleted file mode 100644
index 67fdbea..0000000
--- a/roles/development/templates/ssh-agent.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-# {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
-
-[Unit]
-Description=SSH key agent
-
-[Service]
-Type=simple
-Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
-ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
-
-[Install]
-WantedBy=default.target
diff --git a/roles/development/templates/tmux.j2 b/roles/development/templates/tmux.j2
deleted file mode 100644
index 8fa1473..0000000
--- a/roles/development/templates/tmux.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
-
-[Unit]
-Description=Tmux startup script
-
-[Service]
-Environment=DISPLAY=:0
-ExecStart=/home/sonny/.local/bin/tmux_start
-Type=forking
-RemainAfterExit=yes
-
-[Install]
-WantedBy=default.target
diff --git a/roles/development/vars/archlinux.yml b/roles/development/vars/archlinux.yml
index 7e96f32..f96720f 100644
--- a/roles/development/vars/archlinux.yml
+++ b/roles/development/vars/archlinux.yml
@@ -7,3 +7,5 @@ packages:
   - npm
   - ctags
   - kitty
+  - docker # TODO add tasks
+  - docker-compose