Remove trailing whitespace

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>

.gitignore

@@ -0,0 +1 @@
+debug.yml

ansible.cfg

@@ -4,7 +4,8 @@ timeout = 60
 # ask_vault_pass = True
 
 [privilege_escalation]
-# become_ask_pass = True
+become = True
+become_ask_pass = True
 
 [ssh_connection]
 pipelining = True

group_vars/all.yml

@@ -1,7 +1,26 @@
 ---
+# Custom header
+dirty: "{% if template_path is defined %}{{ lookup('pipe', 'git diff --quiet -- ' + template_path | quote + ' || echo dirty') }}{% else %}{{ lookup('pipe', 'git diff --quiet || echo dirty') }}{% endif %}"
+ansible_header: |
+    +++++++++++++++++++++++++++++++++++++++++++++++++++
+
+       Ansible managed, don't modify the file locally.
+       See https://gitlab.crans.org/ynerant/templier-ansible.
+       {% if template_path is defined %}{% set _, rpath = template_path.split('roles/', 1) %}Commit: {% if dirty %}({{dirty}}) {% endif %}{{ lookup('pipe', 'git log -n 1 --pretty=format:%H -- ' + template_path | quote) }}
+       {% if dirty %}Run by: {{ ansible_env.SUDO_USER }}
+       {% else %}Author: {{ lookup('pipe', 'git log -n 1 --pretty=format:%an -- ' + template_path | quote) }}
+       {% endif %}Template: roles/{{ rpath }}
+       {% else %}
+       Run by: {{ ansible_env.SUDO_USER }}
+       Latest commit: {% if dirty %}({{dirty}}) {% endif %}{{ lookup('pipe', 'git rev-parse HEAD') }}
+       {% endif %}
+
+    +++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
 
 pass:
-  upstream: 'ssh://git@git.ynerant.fr:2222/ynerant/pass'
+  upstream: 'ssh://git@git.ynerant.fr:2222/ynerant/pass.git'
   dest: '.password-store/'
 
 cliutils:
@@ -9,7 +28,7 @@ cliutils:
     bogus_dirs: []
   git:
     email: ynerant@crans.org
-    name: ynerant
+    name: Yohann D'ANELLO
     signingkey: 3A75C55819C8CF85
 
 bind:
@@ -18,5 +37,17 @@ bind:
       administrator: ynerant.crans.org
       ipv4: 185.230.78.178
       ipv6: 2a0c:700:12:0:f21f:afff:fee5:34ca
-      slave: 51.15.199.212
-      aliases: []
+      slave: ""  # 51.15.199.212
+      aliases:
+        - cloud
+        - element
+        - git
+        - hydrogen
+        - mailu
+        - notls
+        - synapse
+        - thelounge
+        - traefik
+        - translate
+        - whoami
+        - www

host_vars/ynerant-thinkpad.wifi.sand.auro.re.yml

@@ -6,4 +6,5 @@ user:
 laptop:
   numpad: false
   resolution: 1080p
+  touchscreen: true
   gpu: false

roles/audio/tasks/main.yml

@@ -9,4 +9,3 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes

roles/bind/templates/named.conf.local.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment(decoration='//') }}
+
 //
 // Do any local configuration here
 //

roles/cli-utils/tasks/main.yml

@@ -13,24 +13,30 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
-  when: user.root
 
 - name: Create directory hierarchy
   file:
     path: '.config/{{ item }}'
     state: directory
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0755
   with_items:
     - 'git/'
     - 'bash/'
+  become_user: "{{ user.name }}"
 
 - name: Deploying config files
   template:
     src: '{{ item.src }}'
     dest: '{{ item.dest }}'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
   with_items:
     - { src: bashrc.j2, dest: .bashrc }
     - { src: inputrc.j2, dest: .inputrc }
     - { src: bash_aliases.j2, dest: .config/bash/bash_aliases }
     - { src: gitconfig.j2, dest: .config/git/config }
     - { src: tmux.conf.j2, dest: .tmux.conf }
+  become_user: '{{ user.name }}'

roles/cli-utils/templates/bash_aliases.j2

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+{{ ansible_header | comment }}
+
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
     test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
@@ -29,6 +31,12 @@ alias gst='git status -s'
 alias proxy='ssh -q -C -N -D 8080'
 alias wip='watch -c ip -c'
 
+# Shortcuts to open ports
+alias ldap_tealc="ssh -L 1636:tealc.adm.crans.org:636 tealc.adm.crans.org"
+alias sam="ssh -L 8006:sam.adm.crans.org:8006 sam.adm.crans.org"
+alias jack="ssh -L 8006:jack.adm.crans.org:8006 jack.adm.crans.org"
+alias daniel="ssh -L 8006:daniel.adm.crans.org:8006 daniel.adm.crans.org"
+
 alias vi=vim
 alias cat=bat
 
@@ -39,3 +47,5 @@ alias 🚆=sl
 alias 🚂=sl
 alias 🚅=sl
 alias 💿=cd
+
+alias 🐿️="cd /home/ynerant/PycharmProjects/SquirrelBattle && venv/bin/python main.py"

roles/cli-utils/templates/bashrc.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [ -z "$PS1" ] && return
 
 HISTCONTROL=ignoredups:ignorespace

roles/cli-utils/templates/gitconfig.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [user]
     email = {{ cliutils.git.email }}
     name = {{ cliutils.git.name }}

roles/cli-utils/templates/inputrc.j2

@@ -1 +1,3 @@
+{{ ansible_header | comment }}
+
 set mark-symlinked-directories on

roles/cli-utils/templates/tmux.conf.j2

@@ -1,8 +1,17 @@
+{{ ansible_header | comment }}
+
 unbind r
 bind r source-file ~/.tmux.conf
 
 set -g mouse on
 
+## set the default TERM
+set -g default-terminal screen
+
+## update the TERM variable of terminal emulator when creating a new session or attaching a existing session
+set -g update-environment 'DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY TERM'
+## determine if we should enable 256-colour support
+if "[[ ${TERM} =~ 256color || ${TERM} == fbterm ]]" 'set -g default-terminal screen-256color'
 
 # use the vim motion keys to move between panes
 bind h select-pane -L

roles/communication/tasks/main.yml

@@ -12,29 +12,40 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
 
 - name: Create lxappearance directory hierarchy
   file:
     path: '{{ item }}'
     state: directory
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0700
   with_items:
     - '.config/gtk-3.0/'
     - '.icons/default/'
+  become_user: '{{ user.name }}'
 
 - name: Enable dark mode for evolution
   template:
     src: '{{ item.src }}'
     dest: '{{ item.dest }}'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
   with_items:
     - { src: 'gtkrc.j2', dest: '.gtkrc-2.0' }
     - { src: 'settings.ini.j2', dest: '.config/gtk-3.0/settings.ini' }
     - { src: 'index.theme.j2', dest: '.icons/default/index.theme'}
+  become_user: '{{ user.name }}'
 
 - name: Create evolution config and cache parent directories
   file:
     path: '{{ item }}'
     state: directory
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0700
   with_items:
     - '.config/'
     - '.local/share/'
+  become_user: '{{ user.name }}'

roles/communication/templates/gtkrc.j2

@@ -1,10 +1,11 @@
+{{ ansible_header | comment }}
+
 # DO NOT EDIT! This file will be overwritten by LXAppearance.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
 include "/home/ynerant/.gtkrc-2.0.mine"
 gtk-theme-name="Adwaita-dark"
 gtk-icon-theme-name="Adwaita"
-gtk-font-name="Monospace 8"
 gtk-cursor-theme-name="Adwaita"
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_TEXT

roles/communication/templates/index.theme.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [Icon Theme]
 Name=Default
 Comment=Default Cursor Theme

roles/communication/templates/settings.ini.j2

@@ -1,7 +1,8 @@
+{{ ansible_header | comment }}
+
 [Settings]
 gtk-theme-name=Adwaita-dark
 gtk-icon-theme-name=Adwaita
-gtk-font-name=Monospace 8
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_TEXT

roles/docker/tasks/main.yml

@@ -15,4 +15,6 @@
   template:
     src: update-motd.d/05-service.j2
     dest: /etc/update-motd.d/05-docker
+    owner: root
+    group: root
     mode: 0755

roles/docker/templates/update-motd.d/05-service.j2

@@ -1,3 +1,3 @@
 #!/bin/sh
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 echo "> Les recettes Docker-compose se trouvent dans /var/local/ansible-docker"

roles/i3/tasks/main.yml

@@ -7,7 +7,6 @@
       - i3blocks
       - i3status
   register: pkg_result
-  become: yes
   retries: 3
   until: pkg_result is succeeded
 
@@ -15,14 +14,22 @@
   file:
     path: '.config/{{ item }}'
     state: directory
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0755
   with_items:
     - i3/
     - i3status/
+  become_user: '{{ user.name }}'
 
 - name: Copy i3 configuration files
   template:
     src: '{{ item }}.j2'
     dest: '.config/{{ item }}/config'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0755
   with_items:
     - i3
     - i3status
+  become_user: '{{ user.name }}'

roles/i3/templates/i3.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 # This file has been auto-generated by i3-config-wizard(1).
 # It will not be overwritten, so edit it as you like.
 #
@@ -33,8 +35,8 @@ title_align center
 hide_edge_borders both
 
 # Bindings for volume and light
-bindsym XF86MonBrightnessDown exec light -U 10
-bindsym XF86MonBrightnessUp exec light -A 10
+bindsym XF86MonBrightnessDown exec light -U 1
+bindsym XF86MonBrightnessUp exec light -A 1
 bindsym XF86AudioRaiseVolume exec volume -A 5 && $refresh
 bindsym XF86AudioLowerVolume exec volume -U 5 && $refresh
 bindsym Shift+XF86MonBrightnessDown exec light -U 1
@@ -67,10 +69,14 @@ bindsym $mod+Shift+q kill
 bindsym $mod+d exec dmenu_run -l 1 -p '[ ynerant@morgoth ~ ]'
 bindsym XF86Search exec dmenu_run -l 1
 
-# Screenshots
-bindsym Print exec scrot 'Pictures/Screenshots/%Y-%m-%d-%s.jpg'
-bindsym --release Shift+Print exec scrot -s "Pictures/Screenshots/$(ls Pictures/Screenshots/ | dmenu)"
+# Launch passmenu
+bindsym $mod+t exec passmenu
 
+# Screenshots
+bindsym --release Print exec screenshot
+bindsym --release Control+Print exec screenshot -c
+bindsym --release Shift+Print exec screenshot -s
+bindsym --release Control+Shift+Print exec screenshot -s -c
 
 # Binding to lock screen
 bindsym $mod+Escape exec physlock
@@ -229,3 +235,7 @@ bar {
   status_command i3status
   strip_workspace_numbers yes
 }
+
+{% if laptop.touchscreen %}
+exec xinput --set-prop 13 "libinput Natural Scrolling Enabled" 1
+{% endif %}

roles/i3/templates/i3status.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 # i3status configuration file.
 # see "man i3status" for documentation.
 
@@ -23,17 +25,17 @@ order += "tztime local"
 
 
 ipv6 {
- format_up = "IPV6"
+ format_up = "IPV6: %ip"
  format_down = ""
 }
 
 wireless _first_ {
-  format_up = "W:%essid"
+  format_up = "W:%essid, %ip"
   format_down = ""
 }
 
 ethernet _first_ {
-  format_up = "E: %speed"
+  format_up = "E: %ip, %speed"
   format_down = ""
 }
 
@@ -45,7 +47,7 @@ battery all {
 }
 
 tztime local {
-  format = "%d-%m %H:%M"
+  format = "%d-%m %H:%M:%S"
 }
 
 volume master {

roles/mime/tasks/main.yml

@@ -12,8 +12,16 @@
   file:
     path: '.config/'
     state: directory
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0700
+  become_user: '{{ user.name }}'
 
 - name: Install default applications configuration file
   template:
     src: 'mimeapps.list.j2'
     dest: '.config/mimeapps.list'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
+  become_user: '{{ user.name }}'

roles/mime/templates/mimeapps.list.j2

@@ -1,3 +1,4 @@
+{{ ansible_header | comment }}
 
 [Default Applications]
 text/html=firefox.desktop
@@ -14,4 +15,3 @@ application/x-extension-xhtml=firefox.desktop
 application/x-extension-xht=firefox.desktop
 application/pdf=org.pwmt.zathura.desktop
 
-

roles/multimedia/tasks/main.yml

@@ -11,20 +11,27 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
 
 - name: Create multimedia folder hierarchy
   file:
     path: '.config/{{ item }}'
     state: directory
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0700
   with_items :
     - 'mpv/'
     - 'zathura/'
+  become_user: '{{ user.name }}'
 
 - name: Copy multimedia configuration files
   template:
     src: '{{ item.src }}'
     dest: '.config/{{ item.dest }}'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
   with_items:
     - { src: 'zathurarc.j2', dest: 'zathura/zathurarc' }
     - { src: 'mpv.conf.j2', dest: 'mpv/mpv.conf' }
+  become_user: '{{ user.name }}'

roles/multimedia/templates/mpv.conf.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 ##################
 # video settings #
 ##################

roles/multimedia/templates/zathurarc.j2

@@ -1,3 +1,3 @@
+{{ ansible_header | comment }}
+
 set selection-clipboard clipboard
-set recolor true
-set recolor-lightcolor "#121212"

roles/navigateur/tasks/main.yml

@@ -3,7 +3,7 @@
   package:
     name:
       - firefox
+      - firefox-i18n-fr
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes

roles/notification/tasks/main.yml

@@ -10,15 +10,21 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
 
 - name: Create dunst config directory
   file:
     path: '.config/dunst/'
     state: directory
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0755
+  become_user: '{{ user.name }}'
 
 - name: Copy dunst configuration file
   template:
     src: 'dunstrc.j2'
     dest: '.config/dunst/dunstrc'
-
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
+  become_user: '{{ user.name }}'

roles/notification/templates/dunstrc.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [global]
     ### Display ###
 

roles/ntp/tasks/main.yml

@@ -6,18 +6,18 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
   notify: restart ntpd.service
 
 - name: Deploy ntp configuration
   template:
     src: 'ntp.conf.j2'
     dest: '/etc/ntp.conf'
-  become: yes
+    owner: root
+    group: root
+    mode: 0644
   notify: restart ntpd.service
 
 - name: Enable ntp service
   service:
     name: ntpd
     enabled: yes
-  become: true

roles/ntp/templates/ntp.conf.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 # Please consider joining the pool:
 #
 #     http://www.pool.ntp.org/join.html

roles/pass/tasks/main.yml

@@ -8,9 +8,10 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
 
 - name: Clone git pass repository
   git:
     repo: '{{ pass.upstream }}'
     dest: '{{ pass.dest }}'
+    umask: '0066'
+  become_user: '{{ user.name }}'

roles/scripts/tasks/main.yml

@@ -8,18 +8,22 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
 
 - name: Clone scripts git repo
   git:
     repo: '{{ scripts.git }}'
     dest: '.local/src/scripts'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    umask: 0022
+  become_user: '{{ user.name }}'
 
 - name: Find scripts
   find:
     path: '.local/src/scripts'
     pattern: "*"
   register: scripts
+  become_user: user.name
 
 - name: Link scripts
   file:
@@ -28,3 +32,4 @@
     state: link
     force: yes
   with_items: '{{ scripts.files }}'
+  become_user: '{{ user.name }}'

roles/ssh/tasks/main.yml

@@ -3,26 +3,41 @@
 - name: Create ssh directory
   file:
     path: '.ssh'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
     mode: 0700
     state: directory
+  become_user: '{{ user.name }}'
 
 - name: Create ssh configuration file directory
   file:
     path: '.ssh/config.d'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
     mode: 0755
     state: directory
+  become_user: '{{ user.name }}'
 
 - name: Deploying config files
   template:
     src: 'config.d/{{ item }}.j2'
     dest: '.ssh/config.d/{{ item }}'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
   loop:
     - aurore
     - crans
     - dptinfo
     - perso
+    - virtu
+  become_user: '{{ user.name }}'
 
 - name: Include config files
   template:
     src: 'config.j2'
     dest: '.ssh/config'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
+  become_user: '{{ user.name }}'

roles/ssh/templates/config.d/aurore.j2

@@ -1,3 +1,5 @@
-Host *.adm.auro.re
+{{ ansible_header | comment }}
+
+Host 10.128.0.* *.adm.auro.re
     User ynerant
     ProxyJump camelot.auro.re

roles/ssh/templates/config.d/crans.j2

@@ -1,13 +1,10 @@
-Host freebox.crans.org titanic.adm.crans.org soyouz.crans.org ssh.crans.org zamok.crans.org zamok.adm.crans.org *.adh.crans.org note*.crans.org
-    User ynerant
+{{ ansible_header | comment }}
 
-Host odlyd.crans.org odlyd 10.231.136.4
+Host ssh.crans.org zamok.crans.org zamok.adm.crans.org *.adh.crans.org note*.crans.org
     User ynerant
-    Hostname 10.231.136.4
-    ProxyJump zamok.crans.org
 
 Host 172.16.10.* 185.230.79.* *.adm.crans.org *.crans.org
     User _ynerant
 
-Host 172.16.10.* *.adm.crans.org *.crans.org ynerant.fr !hodaur.crans.org !odlyd.crans.org !note*.crans.org
+Host 172.16.10.* *.adm.crans.org
     ProxyJump hodaur.crans.org

roles/ssh/templates/config.d/dptinfo.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 Host *.dptinfo.ens-cachan.fr !ssh.dptinfo.ens-cachan.fr
     User danello
     ProxyJump ssh.dptinfo.ens-cachan.fr

roles/ssh/templates/config.d/perso.j2

@@ -1,4 +1,11 @@
+{{ ansible_header | comment }}
+
 Host main
     User ynerant
     Hostname ynerant-pc.fil.sand.auro.re
     ProxyJump camelot.auro.re
+
+Host laptop
+    User ynerant
+    Hostname ynerant-thinkpad.wifi.sand.auro.re
+    ProxyJump camelot.auro.re

roles/ssh/templates/config.d/virtu.j2

@@ -0,0 +1,5 @@
+{{ ansible_header | comment }}
+
+Host 172.16.42.*
+    User root
+    ProxyJump dt.adh.crans.org

roles/ssh/templates/config.j2

@@ -1 +1,3 @@
+{{ ansible_header | comment }}
+
 Include ~/.ssh/config.d/*

roles/sudo/tasks/main.yml

@@ -4,9 +4,10 @@
   template:
     src: '{{ item.src }}.j2'
     dest: '/etc/{{ item.src }}'
+    owner: root
+    group: root
     mode: '{{ item.mode }}'
   with_items:
     - { src: 'sudoers', mode: '0440' }
     - { src: 'sudoers.lecture', mode: '0644' }
-  become: yes
 

roles/sudo/templates/sudoers.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
@@ -39,7 +41,7 @@
 # Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET"
 ##
 ## Run X applications through sudo; HOME is used to find the
-## .Xauthority file.  Note that other programs use HOME to find   
+## .Xauthority file.  Note that other programs use HOME to find
 ## configuration files and this may lead to privilege escalation!
 # Defaults env_keep += "HOME"
 ##

roles/systemd/tasks/main.yml

@@ -4,16 +4,22 @@
   template:
     src: 'logind.conf.j2'
     dest: '/etc/systemd/logind.conf'
-  become: yes
+    owner: root
+    group: root
+    mode: 0644
 
 - name: Create autologin directory on tty1
   file:
     path: '/etc/systemd/system/getty@tty1.service.d'
     state: directory
-  become: yes
+    owner: root
+    group: root
+    mode: 0755
 
 - name: Copy autologin template file
   template:
     src: 'override.conf.j2'
     dest: '/etc/systemd/system/getty@tty1.service.d/override.conf'
-  become: yes
+    owner: root
+    group: root
+    mode: 0644

roles/systemd/templates/logind.conf.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it

roles/systemd/templates/override.conf.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [Service]
 ExecStart=
 ExecStart=-/usr/bin/agetty --autologin {{ user.name }} --noclear %I $TERM

roles/terminal/tasks/main.yml

@@ -7,14 +7,21 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
 
 - name: Create xfce4 terminal config directory
   file:
     path: '.config/xfce4/terminal/'
     state: directory
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0700
+  become_user: '{{ user.name }}'
 
 - name: Copy xfce4-terminal configuration file
   template:
     src: 'terminalrc.j2'
     dest: '.config/xfce4/terminal/terminalrc'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
+  become_user: '{{ user.name }}'

roles/terminal/templates/terminalrc.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [Configuration]
 MiscAlwaysShowTabs=FALSE
 MiscBell=TRUE
@@ -28,7 +30,7 @@ MiscSearchDialogOpacity=100
 MiscShowUnsafePasteDialog=FALSE
 TitleMode=TERMINAL_TITLE_HIDE
 ScrollingBar=TERMINAL_SCROLLBAR_NONE
-FontName=Monospace 8
+FontName=Monospace 12
 ShortcutsNoMnemonics=TRUE
 ShortcutsNoHelpkey=TRUE
 ScrollingOnOutput=FALSE

roles/texlive/tasks/main.yml

@@ -6,4 +6,3 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes

roles/vim/tasks/main.yml

@@ -7,10 +7,12 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
-  when: user.root
 
 - name: Deploying config files
   template:
     src: 'vimrc.j2'
     dest: '.vimrc'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
+  become_user: '{{ user.name }}'

roles/vim/templates/vimrc.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment(decoration='"') }}
+
 if has('autocmd')
   filetype plugin indent on
 endif

roles/xorg/tasks/main.yml

@@ -19,7 +19,6 @@
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded
-  become: yes
 
 - name: Queries package manager for graphical instalation specific to abyme installation
   package:
@@ -29,7 +28,6 @@
   retries: 3
   until: pkg_result is succeeded
   when: laptop.gpu
-  become: yes
 
 - name: Queries package manager for graphical instalation specific to abyme installation
   package:
@@ -39,46 +37,56 @@
   retries: 3
   until: pkg_result is succeeded
   when: laptop.numpad
-  become: yes
 
 - name: Copy user configuration files
   template:
     src: 'xinitrc.j2'
     dest: '.xinitrc'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0644
+  become_user: '{{ user.name }}'
 
 - name: Copy touchpad configuration
   template:
     src: '30-touchpad.conf.j2'
     dest: '/etc/X11/xorg.conf.d/30-touchpad.conf'
-  become: yes
+    owner: root
+    group: root
+    mode: 0644
 
-- name: Change backlight property # doing some shifty things
+- name: Change backlight property  # doing some shifty things
   file:
     path: '/sys/class/backlight/intel_backlight/brightness'
+    owner: root
     group: video
     mode: '0664'
-  become: yes
 
 - name: Gives user the good group
   user:
-    name: ynerant
+    name: '{{ user.name }}'
     groups: video
     append: yes
-  become: yes
 
 - name: Create autorandr configuration folder
   file:
     path: '~/.config/autorandr'
     state: directory
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0755
+  become_user: '{{ user.name }}'
 
 - name: Install autorandr postswitch configuration file
   template:
     src: 'postswitch.j2'
     dest: '~/.config/autorandr/postswitch'
-    mode: '0755'
+    owner: '{{ user.name }}'
+    group: '{{ user.name }}'
+    mode: 0755
+  become_user: '{{ user.name }}'
 
 - name: Enable autorandr service
   service:
     name: autorandr
     enabled: yes
-  become: true

roles/xorg/templates/30-touchpad.conf.j2

@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 Section "InputClass"
 	Identifier "touchpad"
 	Driver "libinput"

roles/xorg/templates/postswitch.j2

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+{{ ansible_header | comment }}
+
 ~/.fehbg

roles/xorg/templates/xinitrc.j2

@@ -1,8 +1,9 @@
+{{ ansible_header | comment }}
+
 eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
 export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
 dbus-update-activation-environment --systemd DISPLAY
 
-
 setxkbmap fr oss
 xss-lock -- physlock -d &
 autorandr --change