Refact: move dotfiles to specific folder and split dotfile in 2

tasks/arch_CLI_packages.yml

@@ -49,7 +49,6 @@
   pacman:
     name:
       - moc
-      - newsboat
       - pass
       - cups
       - cups-pdf

tasks/dotfiles.yml

@@ -1,11 +1,4 @@
 ---
-- name: Copy urxvt Xdefault
-  template:
-    src: files/Xdefaults
-    dest: /home/{{ item.username }}/.Xdefaults
-  with_items: "{{ me }}"
-  when: not minimal
-
 - name: Clone TPM (tmux plugin manager)
   git:
     repo: https://github.com/tmux-plugins/tpm
@@ -16,7 +9,7 @@
 
 - name: Copy tmux.conf
   template:
-    src: files/tmux.conf
+    src: files/dotfiles/tmux.conf
     dest: /home/{{ item.username }}/.tmux.conf
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
@@ -30,7 +23,7 @@
 
 - name: Copy .tmuxinator/
   copy:
-    src: files/tmuxinator/
+    src: files/dotfiles/tmuxinator/
     dest: /home/{{ item.username }}/.tmuxinator/
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
@@ -56,7 +49,7 @@
 
 - name: Copy local zshrc
   template:
-    src: files/zshrc
+    src: files/dotfiles/zshrc
     dest: /home/{{ item.username }}/.zshrc
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
@@ -65,7 +58,7 @@
 
 - name: Copy local zshrc.local
   template:
-    src: files/zshrc.local
+    src: files/dotfiles/zshrc.local
     dest: /home/{{ item.username }}/.zshrc.local
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
@@ -74,7 +67,7 @@
 
 - name: Copy local zsh_plugins.txt
   template:
-    src: files/zsh_plugins.txt
+    src: files/dotfiles/zsh_plugins.txt
     dest: /home/{{ item.username }}/.zsh_plugins.txt
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
@@ -83,7 +76,7 @@
 
 - name: Copy .vim/
   copy:
-    src: files/vim/
+    src: files/dotfiles/vim/
     dest: /home/{{ item.username }}/.vim/
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
@@ -105,21 +98,12 @@
 
 - name: Copy vimrc
   template:
-    src: files/vimrc
+    src: files/dotfiles/vimrc
     dest: /home/{{ item.username }}/.vimrc
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
   with_items: "{{ me }}"
 
-- name: Copy .moc/
-  copy:
-    src: files/moc/
-    dest: /home/{{ item.username }}/.moc/
-    owner: "{{ item.username }}"
-    group: "{{ item.username }}"
-  with_items: "{{ me }}"
-  when: not minimal and not server
-
 - name: Creates .ssh
   file:
     path: /home/{{ item.username }}/.ssh/
@@ -130,7 +114,7 @@
 
 - name: Copy ssh user config
   template:
-    src: files/sshconfig
+    src: files/dotfiles/sshconfig
     dest: /home/{{ item.username }}/.ssh/config
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
@@ -138,7 +122,7 @@
 
 - name: Copy gitconfig
   template:
-    src: files/gitconfig
+    src: files/dotfiles/gitconfig
     dest: /home/{{ item.username }}/.gitconfig
     owner: "{{ item.username }}"
     group: "{{ item.username }}"

tasks/dotfiles_desktop.yml

@@ -0,0 +1,69 @@
+---
+- name: Copy urxvt Xdefault
+  template:
+    src: files/dotfiles/Xdefaults
+    dest: /home/{{ item.username }}/.Xdefaults
+  with_items: "{{ me }}"
+  when: not minimal
+
+- name: Install mocp (Archlinux)
+  pacman:
+    name:
+      - mocp
+    state: present
+  when: ansible_distribution != 'Debian'
+
+- name: mocp configfiles
+  copy:
+    src: files/dotfiles/moc/
+    dest: /home/{{ item.username }}/.moc/
+    owner: "{{ item.username }}"
+    group: "{{ item.username }}"
+  with_items: "{{ me }}"
+
+- name: Install newsboat (Archlinux)
+  pacman:
+    name: 
+      - newsboat
+    state: present
+  when: ansible_distribution != 'Debian'
+
+- name: Newsboat configfiles
+  copy:
+    src: files/dotfiles/newsboat/
+    dest: /home/{{ item.username }}/.newsboat/
+    owner: "{{ item.username }}"
+    group: "{{ item.username }}"
+  with_items: "{{ me }}"
+
+- name: Install calendar and contact synchronisation tools (Archlinux)
+  pacman:
+    name:
+      - khal
+      - khard
+      - vdirsyncer
+    state: present
+  when: ansible_distribution != 'Debian'
+
+- name: vdirsyncer configfiles
+  copy:
+    src: files/dotfiles/vdirsyncer/
+    dest: /home/{{ item.username }}/.config/vdirsyncer/
+    owner: "{{ item.username }}"
+    group: "{{ item.username }}"
+  with_items: "{{ me }}"
+
+- name: Install imap synchroniser (Archlinux)
+  pacman:
+    name:
+      - isync
+    state: present
+  when: ansible_distribution != 'Debian'
+
+- name: isync configfiles
+  template:
+    src: files/dotfiles/mbsyncrc
+    dest: /home/{{ item.username }}/.mbsyncrc
+    owner: "{{ item.username }}"
+    group: "{{ item.username }}"
+  with_items: "{{ me }}"