From 73ef8d928a3fc1850eb317632b1017a106bba591 Mon Sep 17 00:00:00 2001
From: bretello <bretello@distruzione.org>
Date: Sat, 5 Feb 2022 13:44:05 +0100
Subject: [PATCH] ansible: cleanup setup playbook

---
 ansible/playbooks/setup.yml | 45 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/ansible/playbooks/setup.yml b/ansible/playbooks/setup.yml
index 317c4ff..0b2d76c 100644
--- a/ansible/playbooks/setup.yml
+++ b/ansible/playbooks/setup.yml
@@ -27,11 +27,23 @@
         version: master
       when: local_development is not defined
 
-    - name: antibody
+    - name: directories
+      file:
+        dest: '{{ item }}'
+        state: directory
+        mode: 0700
+      loop: '{{ directories }}'
+      vars:
+        directories:
+          - '$HOME/bin'
+          - '$HOME/projects'
+          - '$HOME/git'
+
+    - name: antibody # TODO: antibody is available on apt(debian)/brew/pacman
       shell: |
-        set -o pipefail
-        curl -sfL https://git.io/antibody | sh -s - -b /usr/local/bin
-        antibody bundle "{{ DOTFILES }}/antibody_plugins.txt"
+        set -euo pipefail
+        curl -sfL https://git.io/antibody | sh -s - -b $HOME/bin/
+        /opt/homebrew/bin/antibody bundle "{{ DOTFILES }}/antibody_plugins.txt"
       args:
         executable: /bin/bash
         creates: /usr/local/bin/antibody
@@ -42,11 +54,12 @@
         shell: /usr/bin/zsh
 
     - name: zsh config
-      shell: |
-        echo "export DOTFILES={{ DOTFILES }}" >> "$HOME/.zshrc"
-        echo 'source $DOTFILES/brethil_dotfile.sh' >> "$HOME/.zshrc"
-      args:
-        creates: '~{{ ansible_user }}/.zshrc'
+      blockinfile:
+        path: $HOME/.zshrc
+         marker: "# brethil dotfiles"
+        block: |
+          export DOTFILES={{ DOTFILES }}
+          source $DOTFILES/brethil_dotfile.sh
 
     - name: dotfiles symlink
       file:
@@ -93,8 +106,6 @@
       copy:
         src: ../../gitignore
         dest: ~/.gitignore
-        owner: root
-        group: root
         mode: '0600'
         backup: yes
 
@@ -110,15 +121,3 @@
       args:
         executable: /bin/bash
       when: fix_annoyances is true
-
-    - name: directories
-      file:
-        dest: '{{ item }}'
-        state: directory
-        mode: 0700
-      loop: '{{ directories }}'
-      vars:
-        directories:
-          - '$HOME/bin'
-          - '$HOME/projects'
-          - '$HOME/git'