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

Choux.yml

@@ -19,6 +19,7 @@
     - include: tasks/arch_gnome.yml
     - include: tasks/arch_graphicals.yml
     - include: tasks/dotfiles.yml
+    - include: tasks/dotfiles_desktop.yml
     - include: tasks/home_autofs.yml
     - include: tasks/nfs_share.yml
     - include: tasks/wine.yml

Combava.yml

@@ -8,7 +8,6 @@
     - vars/Combava.yml
 
   tasks:
-    # - include: tasks/test.yml
     - include: tasks/arch_aur.yml
     - include: tasks/arch_CLI_packages.yml
     - include: tasks/prompt.yml
@@ -19,6 +18,7 @@
     - include: tasks/arch_gnome.yml
     - include: tasks/arch_graphicals.yml
     - include: tasks/dotfiles.yml
+    - include: tasks/dotfiles_desktop.yml
     - include: tasks/home_autofs.yml
     - include: tasks/nfs_share.yml
       #- include: tasks/wine.yml

files/dotfiles/mbsyncrc

@@ -0,0 +1,68 @@
+IMAPAccount opytex
+Host imap.mailfence.com
+User Takanuva
+PassCmd "pass show mail/mailfence/Takanuva | head -n 1"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore opytex-remote
+Account opytex
+
+MaildirStore opytex-local
+Subfolders Verbatim
+Path ~/.mail/opytex/
+Inbox ~/.mail/opytex/INBOX
+
+Channel opytex
+Master :opytex-remote:
+Slave :opytex-local:
+Create Both
+Expunge Both
+Patterns *
+SyncState *
+
+IMAPAccount lafrite26
+Host imap.gmail.com
+User lafrite26
+PassCmd "pass show mail/lafrite26@gmail.com | head -n 1"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore lafrite26-remote
+Account lafrite26
+
+MaildirStore lafrite26-local
+Subfolders Verbatim
+Path ~/.mail/lafrite26/
+Inbox ~/.mail/lafrite26/INBOX
+
+Channel lafrite26
+Master :lafrite26-remote:
+Slave :lafrite26-local:
+Create Both
+Expunge Both
+Patterns *
+SyncState *
+
+IMAPAccount benjamin.jm.bertrand
+Host imap.gmail.com
+User benjamin.jm.bertrand
+PassCmd "pass show mail/benjamin.jm.bertrand@gmail.com | head -n 1"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore benjamin.jm.bertrand-remote
+Account benjamin.jm.bertrand
+
+MaildirStore benjamin.jm.bertrand-local
+Subfolders Verbatim
+Path ~/.mail/benjamin.jm.bertrand/
+Inbox ~/.mail/benjamin.jm.bertrand/INBOX
+
+Channel benjamin.jm.bertrand
+Master :benjamin.jm.bertrand-remote:
+Slave :benjamin.jm.bertrand-local:
+Create Both
+Expunge Both
+Patterns *
+SyncState *

files/dotfiles/newsboat/config

@@ -0,0 +1,27 @@
+auto-reload yes
+reload-time 30
+browser chromium
+macro y set browser "mpv %u"; open-in-browser ; set browser chromium
+
+unbind-key h
+unbind-key j
+unbind-key k
+unbind-key l
+
+bind-key h quit
+bind-key j down
+bind-key k up
+bind-key l open
+
+color background         default   default
+color listnormal         default   default
+color listnormal_unread  default   default
+color listfocus          black     yellow
+color listfocus_unread   black     yellow
+color info               default   black
+color article            default   default
+
+# highlights
+highlight article "^(Title):.*$" blue default
+highlight article "https?://[^ ]+" red default
+highlight article "\\[image\\ [0-9]+\\]" green default

files/dotfiles/newsboat/urls

@@ -0,0 +1,37 @@
+https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA "Tech"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCXuqSBlHAE6Xw-yeJA0Tunw "Tech"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCsRIv1fsbnQRIPKmUQbRzZg "Tech"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCUQo7nzH1sXVpzL92VesANw "Tech"
+
+https://www.youtube.com/feeds/videos.xml?channel_id=UC9C07cryUrKzLuAzwITPA3A "SC2" "SC2HL"
+
+
+https://www.youtube.com/feeds/videos.xml?channel_id=UCg7HRuQ93hl9v8dTSt_XDHA "Ferme" "~Banabé"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCsM4_jihNFYe4CtSkXvDR-Q "Ferme" "~permaculture agroécologie etc..."
+https://www.youtube.com/feeds/videos.xml?channel_id=UC2avy3Pwc3yVtt-tPKJn33A "Ferme" "~Ma ferme autonome"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCleSLCKdAEovKJxX-Kgbccw "Ferme" "~Ma ferme autonome2"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCNqADXg6dTqov4klT703jYg "Ferme" "Les Jérômes"
+
+https://www.youtube.com/feeds/videos.xml?channel_id=UCL_r1ELEvAuN0peKUxI0Umw "Permaculture" "Geoff Lawton"
+
+
+https://www.youtube.com/feeds/videos.xml?channel_id=UCzVy7DiPyVvfiOvXF_XMs4Q "Apnée" "~Adam Freediver"
+
+
+https://www.youtube.com/feeds/videos.xml?channel_id=UCJNItGjNhUx3Zz6W4OCVfHA "Bois" "~Passion renovation"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCvDpfkniGG6WkX5L7DwyGaA "Bois" "Olivier Verdier"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC7TiJ6Tnxc_dSE42byTPMug "Bois" "Copain des copeaux"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC9fGq2-6FaftcegcIadLf6A "Bois" "Samuel Mamias"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCOuow_HIYmeaIqi42zVs3qg "Bois" "Kirby Meets Audio"
+https://www.youtube.com/feeds/videos.xml?channel_id=UC7FkqjV8SU5I8FCHXQSQe9Q "Bois" "Ishitani furniture"
+
+https://www.youtube.com/feeds/videos.xml?channel_id=UC6mIxFTvXkWQVEHPsEdflzQ "Electronique" "GreatScott!"
+
+https://www.youtube.com/feeds/videos.xml?channel_id=UCP6qAy9q_Lkhzu2reZfun9g "Ski" "~WINTERACTIVITY"
+https://www.youtube.com/feeds/videos.xml?channel_id=UChkpEJqHjX-tGmYoGf8jdGA "Escalade" "EpicTV Relais Vertical"
+
+
+https://www.youtube.com/feeds/videos.xml?channel_id=UCgkhWgBGRp0sdFy2MHDWfSg "Math" "El Ji"
+
+https://www.youtube.com/feeds/videos.xml?channel_id=UCvjgXvBlbQiydffZU7m1_aw "Programmation" "~Coding Train"
+https://www.youtube.com/feeds/videos.xml?channel_id=UCj_iGliGCkLcHSZ8eqVNPDQ "Programmation" "~Grafikart.fr"

files/dotfiles/vdirsyncer/config

@@ -0,0 +1,102 @@
+# An example configuration for vdirsyncer.
+#
+# Move it to ~/.vdirsyncer/config or ~/.config/vdirsyncer/config and edit it.
+# Run `vdirsyncer --help` for CLI usage.
+#
+# Optional parameters are commented out.
+# This file doesn't document all available parameters, see
+# http://vdirsyncer.pimutils.org/ for the rest of them.
+
+[general]
+# A folder where vdirsyncer can store some metadata about each pair.
+status_path = "~/.config/vdirsyncer/status/"
+
+# CALDAV
+[pair Cours_cal]
+a = "cours_cal_local"
+b = "cours_cal_remote"
+collections = ["from a", "from b"]
+
+# Calendars also have a color property
+metadata = ["displayname", "color"]
+
+[storage cours_cal_local]
+type = "filesystem"
+path = "~/.calendars/Cours1/"
+fileext = ".ics"
+
+[storage cours_cal_remote]
+type = "caldav"
+url = "https://cloud.poneyworld.net/remote.php/dav/calendars/lafrite/cours1/"
+username = "lafrite"
+password.fetch = ["command", "pass", "OVH/Embrevade/docker/nextcloud/lafrite"]
+
+[pair perso_cal]
+a = "perso_cal_local"
+b = "perso_cal_remote"
+collections = ["from a", "from b"]
+
+# Calendars also have a color property
+metadata = ["displayname", "color"]
+
+[storage perso_cal_local]
+type = "filesystem"
+path = "~/.calendars/Perso/"
+fileext = ".ics"
+
+[storage perso_cal_remote]
+type = "caldav"
+url = "https://cloud.poneyworld.net/remote.php/dav/calendars/lafrite/personal/"
+username = "lafrite"
+password.fetch = ["command", "pass", "OVH/Embrevade/docker/nextcloud/lafrite"]
+
+[pair vacancesA]
+a = "vacancesA_public"
+b = "vacancesA_private"
+collections = null
+[storage vacancesA_public]
+type = "http"
+# The URL to your iCalendar file.
+url = "https://www.data.gouv.fr/fr/datasets/r/b580138b-ae5c-4b4d-8cbf-110ffd373192"
+[storage vacancesA_private]
+type = "filesystem"
+path = "~/.calendars/Vacances/"
+fileext = ".ics"
+
+# CARDAV
+[pair nextcloud_contacts]
+# A `[pair <name>]` block defines two storages `a` and `b` that should be
+# synchronized. The definition of these storages follows in `[storage <name>]`
+# blocks. This is similar to accounts in OfflineIMAP.
+a = "nextcloud_contacts_local"
+b = "nextcloud_contacts_remote"
+
+# Synchronize all collections that can be found.
+# You need to run `vdirsyncer discover` if new calendars/addressbooks are added
+# on the server.
+
+collections = ["from a", "from b"]
+
+# Synchronize the "display name" property into a local file (~/.contacts/displayname).
+metadata = ["displayname"]
+
+# To resolve a conflict the following values are possible:
+#   `null` - abort when collisions occur (default)
+#   `"a wins"` - assume a's items to be more up-to-date
+#   `"b wins"` - assume b's items to be more up-to-date
+#conflict_resolution = null
+
+[storage nextcloud_contacts_local]
+# A storage references actual data on a remote server or on the local disk.
+# Similar to repositories in OfflineIMAP.
+type = "filesystem"
+path = "~/.contacts/"
+fileext = ".vcf"
+
+[storage nextcloud_contacts_remote]
+type = "carddav"
+url = "https://cloud.poneyworld.net/remote.php/dav/addressbooks/users/lafrite/contacts/"
+username = "lafrite"
+password.fetch = ["command", "pass", "OVH/Embrevade/docker/nextcloud/lafrite"]
+# The password can also be fetched from the system password storage, netrc or a
+# custom command. See http://vdirsyncer.pimutils.org/en/stable/keyring.html

files/zshrc.local.old

@@ -1 +0,0 @@
-PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin"

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 }}"