Continue work

main.yml

@@ -8,8 +8,9 @@
     private_repo: "git@austenwares.com:stonewareslord/private"
     overwrite_existing: no
   roles:
+    - {role: core, tags: [core,default]}
     - {role: clean, tags: [clean]}
-    - {role: core, tags: [default]}
+    - {role: default, tags: [default]}
     - {role: private, tags: [private]}
     - {role: youcompleteme, tags: [youcompleteme]}
     - {role: secure, become: yes, tags: [secure]}

roles/clean/tasks/main.yml

@@ -3,6 +3,7 @@
     path: "{{ install_path }}/{{ item.path }}"
     state: absent
   with_filetree: "skel/"
+  when: item.state == 'file'
 - name: Remove cloned repositories
   file:
     path: "{{ install_path }}/{{ item }}"

roles/core/tasks/main.yml

@@ -5,27 +5,3 @@
     clone: yes
     update: yes
     force: yes
-- name: Create directories
-  file:
-    path: "{{ install_path }}/{{ item.path }}"
-    state: directory
-    force: "{{ overwrite_existing }}"
-  with_filetree: "skel/"
-  when: item.state == 'directory'
-- name: Link files
-  file:
-    src: "{{ item.src }}"
-    dest: "{{ install_path }}/{{ item.path }}"
-    state: link
-    force: "{{ overwrite_existing }}"
-  with_filetree: "skel/"
-  when: item.state == 'file'
-- name: Clone fzf
-  git:
-    repo: "https://gitea.austenwares.com/stonewareslord/fzf.git"
-    dest: "{{ install_path }}/.fzf"
-    clone: yes
-    update: yes
-    force: yes
-- name: Install fzf
-  shell: "{{ install_path|quote }}/.fzf/install --bin"

roles/default/tasks/main.yml

@@ -0,0 +1,24 @@
+- name: Create directories
+  file:
+    path: "{{ install_path }}/{{ item.path }}"
+    state: directory
+    force: "{{ overwrite_existing }}"
+  with_filetree: "skel/"
+  when: item.state == 'directory'
+- name: Link files
+  file:
+    src: "{{ sync_path }}/skel/{{ item.path }}"
+    dest: "{{ install_path }}/{{ item.path }}"
+    state: link
+    force: "{{ overwrite_existing }}"
+  with_filetree: "skel/"
+  when: item.state == 'file'
+- name: Clone fzf
+  git:
+    repo: "https://gitea.austenwares.com/stonewareslord/fzf.git"
+    dest: "{{ install_path }}/.fzf"
+    clone: yes
+    update: yes
+    force: yes
+- name: Install fzf
+  shell: "{{ install_path|quote }}/.fzf/install --bin"

roles/private/tasks/main.yml

@@ -1,7 +1,7 @@
 - name: Clone private repo
   git:
     repo: "{{ private_repo }}"
-    dest: "{{ playbook_dir }}/private"
+    dest: "{{ sync_path }}/private"
     clone: yes
     update: yes
 - name: Create priavte directories
@@ -13,7 +13,7 @@
   when: item.state == 'directory'
 - name: Copy priavte files
   copy:
-    src: "{{ item.src }}"
+    src: "{{ sync_path }}/private/skel/{{ item.path }}"
     dest: "{{ install_path }}/{{ item.path }}"
     mode: 0600
     force: "yes"