From fb587ea7aebee39606d5cab9ebfe68c7ff2f4fc4 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Fri, 8 Feb 2019 08:17:42 +0100
Subject: [PATCH] Feat: custom promp

---
 tasks/arch_CLI_packages.yml |  1 -
 tasks/dotfiles.yml          |  3 +++
 tasks/prompt.yml            | 13 +++++++++++++
 tasks/users.yml             |  4 ++--
 vars/common.yml             | 10 ++++++++--
 vars/rpi3.yml               |  2 ++
 6 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 tasks/prompt.yml

diff --git a/tasks/arch_CLI_packages.yml b/tasks/arch_CLI_packages.yml
index 78d9bc2..1975b47 100644
--- a/tasks/arch_CLI_packages.yml
+++ b/tasks/arch_CLI_packages.yml
@@ -12,7 +12,6 @@
       - sudo
       - wget
       - cronie
-      - zsh
       - vim
       - tmux
       - ruby
diff --git a/tasks/dotfiles.yml b/tasks/dotfiles.yml
index 5d9ec6e..be92982 100644
--- a/tasks/dotfiles.yml
+++ b/tasks/dotfiles.yml
@@ -58,6 +58,7 @@
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
   with_items: "{{ me }}"
+  when: prompt == 'zsh'
 
 - name: Copy local zshrc.local
   template:
@@ -66,6 +67,7 @@
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
   with_items: "{{ me }}"
+  when: prompt == 'zsh'
 
 - name: Copy local zsh_plugins.txt
   template:
@@ -74,6 +76,7 @@
     owner: "{{ item.username }}"
     group: "{{ item.username }}"
   with_items: "{{ me }}"
+  when: prompt == 'zsh'
 
 - name: Copy .vim/
   copy:
diff --git a/tasks/prompt.yml b/tasks/prompt.yml
new file mode 100644
index 0000000..374653f
--- /dev/null
+++ b/tasks/prompt.yml
@@ -0,0 +1,13 @@
+---
+- name: Install prompt
+  pacman:
+    name: {{ prompt }}
+    state: present
+
+- name: Set shell for root
+  user:
+    name: root
+    shell: /bin/{{ prompt }}
+  tags:
+    - first_deployement
+
diff --git a/tasks/users.yml b/tasks/users.yml
index d4afa89..07463ed 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -4,7 +4,7 @@
     name: "{{ item.username }}"
     password: "{{ item.password }}"
     uid: "{{ item.uid }}"
-    shell: /bin/zsh
+    shell: /bin/{{ prompt }}
   with_items: "{{ deploy_users }}"
   tags:
     - first_deployement
@@ -14,7 +14,7 @@
     name: "{{ item.username }}"
     password: "{{ item.password }}"
     uid: "{{ item.uid }}"
-    shell: /bin/zsh
+    shell: /bin/{{ prompt }}
   with_items: "{{ me }}"
   when: not minimal or not server
   tags:
diff --git a/vars/common.yml b/vars/common.yml
index 473c3f0..c5c07fb 100644
--- a/vars/common.yml
+++ b/vars/common.yml
@@ -1,10 +1,16 @@
 ---
 
 me:
-  - { username: 'lafrite', password: '$6$OnPrZgotbSWZlh0T$VSyF8lUhD/N881d1GsggE7jDFt0uAzls2r.pqgDV6XQKbTqZWfv0X4QWd/3wivUDyzaSjP4LQWVfne7KYR6Vv1', uid: '1000'}
+  - username: 'lafrite'
+    password: '$6$OnPrZgotbSWZlh0T$VSyF8lUhD/N881d1GsggE7jDFt0uAzls2r.pqgDV6XQKbTqZWfv0X4QWd/3wivUDyzaSjP4LQWVfne7KYR6Vv1'
+    uid: '1000'
 
 deploy_users:
-  - { username: 'waha', password: '$6$tQLlZ3lI/NDcT3.C$VCBzrpNxDgOK7b2que2/BnAYWl.zKVugZrQEPxtsq3iWcskEzQ1NvytZRXkB4GCDa/xEohxiodyCaZyFnhxby1', uid: '999'}
+  - username: 'waha'
+    password: '$6$tQLlZ3lI/NDcT3.C$VCBzrpNxDgOK7b2que2/BnAYWl.zKVugZrQEPxtsq3iWcskEzQ1NvytZRXkB4GCDa/xEohxiodyCaZyFnhxby1'
+    uid: '999'
+
+prompt: 'zsh'
 
 minimal: false
 server: false
diff --git a/vars/rpi3.yml b/vars/rpi3.yml
index b5d2e78..20df057 100644
--- a/vars/rpi3.yml
+++ b/vars/rpi3.yml
@@ -1,2 +1,4 @@
 ---
 deploy_public_key: id_rsa_rpi3.pub
+
+prompt: fish