X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=roles%2Finit%2Ftasks%2Fmain.yml;h=576053d41d52f754e6b815c38139abbd1893be9f;hb=ba49638af92aaa5349c5476db8136caec4b0166d;hp=ce56ec4f7104ce4f3781757b58291bba135de46b;hpb=d03cede672edcf559379ca0b12c80fd7b92cfb18;p=perso%2FImmae%2FConfig%2FAnsible.git

diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml
index ce56ec4..576053d 100644
--- a/roles/init/tasks/main.yml
+++ b/roles/init/tasks/main.yml
@@ -1,9 +1,27 @@
 ---
+- name: Create XDG dirs
+  file:
+    path: "{{ item }}"
+    state: directory
+  loop:
+    - "$XDG_CONFIG_HOME"
+    - "$XDG_STATE_HOME"
+    - "$XDG_STATE_HOME/bash"
+    - "$XDG_DATA_HOME"
+    - "$XDG_CACHE_HOME"
+    - "$HOME/Downloads"
 - name: Get gnupg runtime folder name
   shell: 'GNUPGHOME=$XDG_CONFIG_HOME/gnupg gpgconf --list-dirs socketdir | sed -e "s@$XDG_RUNTIME_DIR/gnupg/@@"'
   changed_when: false
   register: gnupg_runtime_dir_cmd
   check_mode: no
+- name: Add user dirs
+  copy:
+    src: "user_dirs/{{ item }}"
+    dest: "$XDG_CONFIG_HOME/{{ item }}"
+  loop:
+    - user-dirs.dirs
+    - user-dirs.locale
 - name: Add pam_environment
   register: pam_environment
   template:
@@ -12,7 +30,7 @@
 - name: Remove old lines in bashrc_temp
   lineinfile:
     line: "{{ ('unset ' ~ item | regex_replace('=.*')) if item != '' and item.0 != '#' else '' }}"
-    dest: $HOME/.bashrc_temp
+    dest: $XDG_STATE_HOME/bash/bashrc_temp
     insertafter: EOF
     create: true
     state: present
@@ -20,8 +38,8 @@
   when: pam_environment.changed
 - name: Add new lines in bashrc_temp
   lineinfile:
-    line: "{{ ('export ' ~ item) if item != '' and item.0 != '#' else '' }}"
-    dest: $HOME/.bashrc_temp
+    line: "{{ ('export ' ~ item) | regex_replace('@{HOME}', '${HOME}') if item != '' and item.0 != '#' else '' }}"
+    dest: $XDG_STATE_HOME/bash/bashrc_temp
     insertafter: EOF
     create: true
     state: present
@@ -31,14 +49,3 @@
   when: pam_environment.changed
   debug:
     msg: "\u26A0\uFE0F \u26A0\uFE0F  You need to log out and back in to update your environment \u26A0\uFE0F \u26A0\uFE0F"
-- name: Create XDG dirs
-  file:
-    path: "{{ item }}"
-    state: directory
-  loop:
-    - "$XDG_CONFIG_HOME"
-    - "$XDG_STATE_HOME"
-    - "$XDG_DATA_HOME"
-    - "$XDG_CACHE_HOME"
-    - "$HOME/Desktop"
-    - "$HOME/Downloads"