config/automatrop/playbooks/default.yml

@@ -1,4 +1,3 @@
----
 - name: Default
   hosts: all
   roles:

config/automatrop/roles/access/tasks/main.yml

@@ -1,23 +1,22 @@
----
 - name: Set variables
-  ansible.builtin.set_fact:
+  set_fact:
     manjaro: "{{ ansible_lsb.id == 'Manjaro' or ansible_lsb.id == 'Manjaro-ARM' }}"
 
 - name: Enable passwordless sudo access to wheel group (Others)
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /etc/sudoers
     line: "%wheel ALL=(ALL) NOPASSWD: ALL"
     regexp: "^#? *%wheel ALL=\\(ALL\\) NOPASSWD: ALL$"
-  become: true
+  become: yes
   when: not manjaro
 
 - name: Enable passwordless sudo access to wheel group (Manjaro)
-  ansible.builtin.copy:
+  copy:
-    content: "%wheel ALL=(ALL) NOPASSWD: ALL"
+    content: "%wheel ALL=(ALL) NOPASSWD: ALL" 
     dest: /etc/sudoers.d/11-wheel-nopasswd
-    mode: u=rwx,g=rx,o=
+    mode: "u=rwx,g=rx,o="
   when: manjaro
-  become: true
+  become: yes
 # /etc/sudoers.d/10-installer is the same thing,
 # but **with** a password, and it's overwritten
 # with each upgrade of manjaro-system, hence this.

config/automatrop/roles/desktop_environment/handlers/main.yml

@@ -1,11 +1,14 @@
----
+- name: xrdb-reload
-- name: Xrdb-reload
+  command: "xrdb -I{{ ansible_env.HOME }} {{ ansible_env.HOME }}/.config/Xresources/main"
-  ansible.builtin.command: xrdb -I{{ ansible_env.HOME }} {{ ansible_env.HOME }}/.config/Xresources/main
+
-- name: I3-reload
+- name: i3-reload
-  ansible.builtin.command: i3-msg reload
+  command: i3-msg reload
-- name: Shell-reload
+
-  ansible.builtin.command: "{{ ansible_env.HOME }}/.local/bin/colorSchemeApply"
+- name: shell-reload
-- name: Fzf-reload
+  command: "{{ ansible_env.HOME }}/.local/bin/colorSchemeApply"
-  ansible.builtin.command: source {{ ansible_env.HOME }}/.local/bin/colorSchemeApplyFzf
+
-- name: Qutebrowser-reload
+- name: fzf-reload
-  ansible.builtin.shell: "! pgrep qutebrowser || qutebrowser :config-source"
+  shell: "source {{ ansible_env.HOME }}/.local/bin/colorSchemeApplyFzf"
+
+- name: qutebrowser-reload
+  shell: "! pgrep qutebrowser || qutebrowser :config-source"

config/automatrop/roles/desktop_environment/tasks/main.yml

@@ -1,24 +1,22 @@
----
 - name: Ensure directories for desktop applications are present
-  ansible.builtin.file:
+  file:
     state: directory
     path: "{{ ansible_user_dir }}/{{ item }}"
-    mode: u=rwx,g=rx,o=rx
+    mode: "u=rwx,g=rx,o=rx"
   with_items:
-    - .config/Xresources
+    - ".config/Xresources"
-    - .config/rofi
+    - ".config/rofi"
-    - .local/bin
+    - ".local/bin"
-    - .local/share/fonts
+    - ".local/share/fonts"
-    - .config/qutebrowser
+    - ".config/qutebrowser"
-    - .config/tridactyl/themes
+    - ".config/tridactyl/themes"
 
 # Download fonts
 - name: Download Nerd fonts
-  ansible.builtin.get_url:
+  get_url:
-    url: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/704336735f576781b2a57b12a0c723e3316cbdec/patched-fonts/DejaVuSansMono/{{ item.folder }}/complete/{{
+    url: "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/patched-fonts/DejaVuSansMono/{{ item.folder }}/complete/{{ item.filename | urlencode }}"
-      item.filename | urlencode }}
     dest: "{{ ansible_user_dir }}/.local/share/fonts/{{ item.filename }}"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   loop:
     - filename: DejaVu Sans Mono Bold Nerd Font Complete Mono.ttf
       folder: Bold
@@ -30,16 +28,15 @@
       folder: Italic
 
 - name: Download icon fonts
-  ansible.builtin.get_url:
+  get_url:
-    url: https://raw.githubusercontent.com/FortAwesome/Font-Awesome/a8386aae19e200ddb0f6845b5feeee5eb7013687/fonts/fontawesome-webfont.ttf
+    url: "https://raw.githubusercontent.com/FortAwesome/Font-Awesome/a8386aae19e200ddb0f6845b5feeee5eb7013687/fonts/fontawesome-webfont.ttf"
     dest: "{{ ansible_user_dir }}/.local/share/fonts/fontawesome-webfont.ttf"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
 # TODO Either replace with ForkAwesome or Nerd Fonts
 
 - name: Install python dependencies for lemonbar
-  ansible.builtin.pip:
+  pip:
     requirements: "{{ ansible_user_dir }}/.dotfiles/config/lemonbar/requirements.txt"
-    extra_args: --break-system-packages # It's fine, it's local anyways
 
 # Build a single color scheme and template and assign it to a variable
 - base16_builder:
@@ -61,20 +58,20 @@
     - i3
 
 - name: Configure Alacritty
-  ansible.builtin.template:
+  template:
     src: "{{ ansible_env.HOME }}/.config/alacritty/alacritty.yml.j2"
     dest: "{{ ansible_env.HOME }}/.config/alacritty/alacritty.yml"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
-  # Alacritty has live config reload, so no command to execute
+# Alacritty has live config reload, so no command to execute
-  # However, it doesn't work with yaml includes, hence the template
+# However, it doesn't work with yaml includes, hence the template
   tags:
     - color
 
 - name: Set base16 theme for Xresources
-  ansible.builtin.copy:
+  copy:
     content: "{{ base16_schemes['schemes'][base16_scheme]['xresources']['xresources']['base16-' + base16_scheme + '-256.Xresources'] }}"
     dest: "{{ ansible_env.HOME }}/.config/Xresources/theme"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   notify:
     - xrdb-reload
   tags:
@@ -82,30 +79,30 @@
   when: display_server == 'x11'
 
 - name: Download base16 theme for qutebrowser
-  ansible.builtin.copy:
+  copy:
     content: "{{ base16_schemes['schemes'][base16_scheme]['qutebrowser']['themes/minimal']['base16-' + base16_scheme + '.config.py'] }}"
     dest: "{{ ansible_env.HOME }}/.config/qutebrowser/theme.py"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   notify:
     - qutebrowser-reload
   tags:
     - color
 
 - name: Download base16 theme for Tridactyl
-  ansible.builtin.copy:
+  copy:
     content: "{{ base16_schemes['schemes'][base16_scheme]['tridactyl']['base16-' + base16_scheme + '.config.py'] }}"
     # url: "https://raw.githubusercontent.com/bezmi/base16-tridactyl/master/base16-{{ base16_scheme }}.css"
     dest: "{{ ansible_env.HOME }}/.config/tridactyl/themes/theme.css"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
-  when: false # Not currently used
+  when: False # Not currently used
   tags:
     - color
 
 - name: Configure i3
-  ansible.builtin.template:
+  template:
     src: "{{ ansible_env.HOME }}/.config/i3/config.j2"
     dest: "{{ ansible_env.HOME }}/.config/i3/config"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   notify:
     - i3-reload
   tags:
@@ -114,10 +111,10 @@
   when: display_server == 'x11'
 
 - name: Set base16 theme for rofi
-  ansible.builtin.copy:
+  copy:
     content: "{{ base16_schemes['schemes'][base16_scheme]['rofi']['themes']['base16-' + base16_scheme + '.' + item] }}"
     dest: "{{ ansible_env.HOME }}/.config/rofi/theme.{{ item }}"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   tags:
     - color
   loop:
@@ -125,49 +122,49 @@
     - rasi
 
 - name: Configure Dunst
-  ansible.builtin.template:
+  template:
     src: "{{ ansible_env.HOME }}/.config/dunst/dunstrc.j2"
     dest: "{{ ansible_env.HOME }}/.config/dunst/dunstrc"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   tags:
     - color
   when: display_server == 'x11'
 
 - name: Download base16 theme for fzf
-  ansible.builtin.copy:
+  copy:
     content: "{{ base16_schemes['schemes'][base16_scheme]['fzf']['bash']['base16-' + base16_scheme + '.config'] }}"
     dest: "{{ ansible_env.HOME }}/.local/bin/colorSchemeApplyFzf"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   notify:
     - fzf-reload
   tags:
     - color
 
 - name: Download base16 theme for shell
-  ansible.builtin.copy:
+  copy:
     content: "{{ base16_schemes['schemes'][base16_scheme]['shell']['script']['base16-' + base16_scheme + '.sh'] }}"
     dest: "{{ ansible_env.HOME }}/.local/bin/colorSchemeApply"
-    mode: u=rwx,g=rx,o=rx
+    mode: "u=rwx,g=rx,o=rx"
   notify:
     - shell-reload
-  when: false # Not currently used
+  when: False # Not currently used
   tags:
     - color
 
 - name: Set used base16 theme for vim
-  ansible.builtin.copy:
+  copy:
     path: "{{ ansible_env.HOME }}/.config/vim/colorscheme.vim"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
-    content: colorscheme base16-{{ base16_scheme }}
+    content: "colorscheme base16-{{ base16_scheme }}"
-  when: false # Not currently used
+  when: False # Not currently used
   tags:
     - color
 
 - name: Enable user services
-  ansible.builtin.systemd:
+  systemd:
     name: "{{ item }}"
     state: started
-    enabled: true
+    enabled: yes
     scope: user
   loop:
     - pulseaudio

config/automatrop/roles/dotfiles/handlers/main.yml

@@ -1,3 +1,3 @@
----
+- name: install dotfiles
-- name: Install dotfiles
+  command: "{{ ansible_user_dir }}/.dotfiles/config/scripts/dotfiles install"
-  ansible.builtin.command: "{{ ansible_user_dir }}/.dotfiles/config/scripts/dotfiles install"
+# TODO A python module to do that, so without an handler

config/automatrop/roles/dotfiles/tasks/main.yml

@@ -1,32 +1,31 @@
----
 - name: Ensure directories for applications are present
-  ansible.builtin.file:
+  file:
     state: directory
     path: "{{ ansible_user_dir }}/{{ item }}"
-    mode: u=rwx,g=rx,o=rx
+    mode: "u=rwx,g=rx,o=rx"
   with_items:
-    - .cache/zsh
+    - ".cache/zsh"
-    - .cache/mpd
+    - ".cache/mpd"
-    - .ssh
+    - ".ssh"
-    - .local/bin
+    - ".local/bin"
-    - .ansible/collections/ansible_collections/geoffreyfrogeye
+    - ".ansible/collections/ansible_collections/geoffreyfrogeye"
 
 - name: Install dotfiles repository
-  ansible.builtin.git:
+  git:
     repo: "{% if has_forge_access %}git@git.frogeye.fr:{% else %}https://git.frogeye.fr/{% endif %}geoffrey/dotfiles.git"
     dest: "{{ ansible_user_dir }}/.dotfiles"
-    update: true
+    update: yes
   notify: install dotfiles
   tags: dotfiles_repo
 # TODO Put actual dotfiles in a subdirectory of the repo, so we don't have to put everything in config
 
 - name: Register as Ansible collection
-  ansible.builtin.file:
+  file:
     state: link
     src: "{{ ansible_user_dir }}/.dotfiles/config/automatrop"
     path: "{{ ansible_user_dir }}/.ansible/collections/ansible_collections/geoffreyfrogeye/automatrop"
 
 - name: Install python dependencies for scripts
-  ansible.builtin.pip:
+  pip:
     requirements: "{{ ansible_user_dir }}/.dotfiles/config/scripts/requirements.txt"
-    extra_args: --break-system-packages # It's fine, it's local anyways
+

config/automatrop/roles/ecryptfs_automount/tasks/main.yml

@@ -1,35 +1,34 @@
----
 - name: Setup pam_encryptfs auth
-  ansible.builtin.blockinfile:
+  blockinfile:
     path: /etc/pam.d/system-auth
     block: |
       auth       [success=1 default=ignore]  pam_succeed_if.so    service = systemd-user quiet
       auth       required                    pam_ecryptfs.so      unwrap
-    insertafter: ^(auth\s+required\s+pam_unix.so|auth\s+\[default=die\]\s+pam_faillock.so\s+authfail)$
+    insertafter: '^(auth\s+required\s+pam_unix.so|auth\s+\[default=die\]\s+pam_faillock.so\s+authfail)$'
     marker: "# {mark} AUTOMATROP ECRYPTFS_AUTOMOUNT AUTH"
-  become: true
+  become: yes
   notify:
     - etc changed
 
 - name: Setup pam_encryptfs password
-  ansible.builtin.blockinfile:
+  blockinfile:
     path: /etc/pam.d/system-auth
     block: |
       password   optional                    pam_ecryptfs.so      unwrap
-    insertbefore: ^(password\s+required\s+pam_unix.so|-password\s+\[success=1\s+default=ignore\]\s+pam_systemd_home.so)$
+    insertbefore: '^(password\s+required\s+pam_unix.so|-password\s+\[success=1\s+default=ignore\]\s+pam_systemd_home.so)$'
     marker: "# {mark} AUTOMATROP ECRYPTFS_AUTOMOUNT PASSWORD"
-  become: true
+  become: yes
   notify:
     - etc changed
 
 - name: Setup pam_encryptfs session
-  ansible.builtin.blockinfile:
+  blockinfile:
     path: /etc/pam.d/system-auth
     block: |
       session    [success=1 default=ignore]  pam_succeed_if.so    service = systemd-user quiet
       session    optional                    pam_ecryptfs.so      unwrap
-    insertafter: ^session\s+required\s+pam_unix.so$
+    insertafter: '^session\s+required\s+pam_unix.so$'
     marker: "# {mark} AUTOMATROP ECRYPTFS_AUTOMOUNT SESSION"
-  become: true
+  become: yes
   notify:
     - etc changed

config/automatrop/roles/extensions/tasks/main.yml

@@ -1,14 +1,13 @@
----
 - name: Load extensions
-  ansible.builtin.include_role:
+  include_role:
-    name: geoffreyfrogeye.{{ extension }}automatrop.entry
+    name: "geoffreyfrogeye.{{ extension }}automatrop.entry"
   loop: "{{ extensions }}"
   loop_control:
     loop_var: extension
   tags: always
 
 - name: Configure extensions rc sourcing
-  ansible.builtin.template:
+  template:
     src: extrc.sh.j2
     dest: "{{ ansible_user_dir }}/.config/shell/extrc"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"

config/automatrop/roles/facts/tasks/main.yml

@@ -1,6 +1,5 @@
----
 - name: Set facts
-  ansible.builtin.set_fact:
+  set_fact:
     arch_based: "{{ ansible_distribution == 'Archlinux' }}"
     arch: "{{ ansible_lsb.id == 'Arch' }}"
     manjaro: "{{ ansible_lsb.id == 'Manjaro' or ansible_lsb.id == 'Manjaro-ARM' }}"
@@ -12,7 +11,7 @@
     - always
 
 - name: Set composed facts
-  ansible.builtin.set_fact:
+  set_fact:
     debian_based: "{{ debian or ubuntu }}"
     can_chown: "{{ not junest }}"
     has_systemd: "{{ not junest }}"

config/automatrop/roles/gnupg/tasks/main.yml

@@ -1,23 +1,22 @@
----
 - name: Create GnuPG directory
-  ansible.builtin.file:
+  file:
     path: "{{ gnupghome }}"
     state: directory
-    mode: u=rwx
+    mode: "u=rwx"
 
 - name: Create GnuPG configuration files
-  ansible.builtin.file:
+  file:
     path: "{{ gnupghome }}/{{ item }}"
     state: file
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   loop:
     - gpg-agent.conf
     - gpg.conf
 
 - name: Configure GnuPG
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: "{{ gnupghome }}/gpg.conf"
-    regex: ^#?\s*{{ item.key }}\s
+    regex: "^#?\\s*{{ item.key }}\\s"
     line: "{{ item.key }}{% if item.value is defined %} {{ item.value }}{% endif %}"
   loop:
     # Remove fluff
@@ -26,7 +25,7 @@
     - key: no-comments
     # Output format that I prefer
     - key: keyid-format
-      value: "0xlong"
+      value: 0xlong
     # Show fingerprints
     - key: with-fingerprint
     # Make sure to show if key is invalid

config/automatrop/roles/gnupg/vars/main.yml

@@ -1,2 +1 @@
----
 gnupghome: "{{ ansible_user_dir }}/.config/gnupg"

config/automatrop/roles/software/handlers/main.yml

@@ -1,24 +1,23 @@
----
 - name: Create and install meta package for Arch Linux
-  when: arch_based
-
   block:
     - name: Generate meta package PKGBUILD
-      ansible.builtin.template:
+      template:
         src: PKGBUILD.j2
         dest: "{{ ansible_user_dir }}/.cache/automatrop/PKGBUILD"
-      listen: software changed
+      listen: "software changed"
 
     - name: Install meta package
       aur:
-        name: automatrop-packages-{{ inventory_hostname_short }}
+        name: "automatrop-packages-{{ inventory_hostname_short }}"
         local_pkgbuild: "{{ ansible_user_dir }}/.cache/automatrop"
         use: makepkg
         state: latest
-      listen: software changed
+      listen: "software changed"
       when: root_access
-- name: Update pacman cache
+  when: arch_based
-  community.general.pacman:
+
-    update_cache: true
+- name: update pacman cache
-  become: true
+  pacman:
+    update_cache: yes
+  become: yes
   when: arch_based

config/automatrop/roles/software/tasks/main.yml

@@ -1,43 +1,43 @@
----
+
 # TODO Install python if not done
 # Or maybe not, it requires a lot of automation for something that can be done
 # very quickly manually and is usually already installed
 
 - name: Install python-apt dependency for Termux
-  when: termux
-  vars:
-    version: 2.39
-
   block:
     # TODO Check if the correct version
     - name: Check for DistUtilsExtra (Termux)
-      ansible.builtin.command: python -c 'import DistUtilsExtra'
+      command: python -c 'import DistUtilsExtra'
-      changed_when: false
+      changed_when: False
   rescue:
     - name: Create temporarty folder for DistUtilsExtra (Termux)
-      ansible.builtin.tempfile:
+      tempfile:
         state: directory
         suffix: python-distutils-extra
         # path: /data/data/com.termux/files/usr/tmp/
       register: pde_tempdir
 
     - name: Download DistUtilsExtra (Termux)
-      ansible.builtin.get_url:
+      get_url:
-        url: https://launchpad.net/python-distutils-extra/trunk/{{ version }}/+download/python-distutils-extra-{{ version }}.tar.gz
+        url: "https://launchpad.net/python-distutils-extra/trunk/{{ version }}/+download/python-distutils-extra-{{ version }}.tar.gz"
         dest: "{{ pde_tempdir.path }}/python-distutils-extra.tar.gz"
 
     - name: Extract DistUtilsExtra (Termux)
-      ansible.builtin.unarchive:
+      unarchive:
         src: "{{ pde_tempdir.path }}/python-distutils-extra.tar.gz"
-        remote_src: true
+        remote_src: yes
         dest: "{{ pde_tempdir.path }}"
 
     - name: Install DistUtilsExtra (Termux)
-      ansible.builtin.command:
+      command:
         cmd: python3 setup.py install
         chdir: "{{ pde_tempdir.path }}/python-distutils-extra-{{ version }}"
+  when: termux
+  vars:
+    version: 2.39
+
 - name: Install python-apt (Termux)
-  ansible.builtin.pip:
+  pip:
     name: python-apt
   when: termux
 
@@ -62,110 +62,116 @@
 # TODO Patch sudo-fake so it allows using -u so `become` works
 
 - name: Enable multilib repo
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /etc/pacman.conf
-    regexp: ^#?\s*\[multilib\]$
+    regexp: '^#?\s*\[multilib\]$'
-    line: "[multilib]"
+    line: '[multilib]'
-  become: true
+  become: yes
   when: arch_based and ansible_architecture == "x86_64"
   notify: udpate pacman cache
 
 - name: Configure multilib repo
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /etc/pacman.conf
-    regexp: ^#?\s*Include\s*=\s*/etc/pacman.d/mirrorlist
+    regexp: '^#?\s*Include\s*=\s*/etc/pacman.d/mirrorlist'
-    line: Include = /etc/pacman.d/mirrorlist
+    line: 'Include = /etc/pacman.d/mirrorlist'
-    insertafter: ^\[multilib\]$
+    insertafter: '^\[multilib\]$'
-  become: true
+  become: yes
   when: arch_based and ansible_architecture == "x86_64"
   notify: udpate pacman cache
 
 - name: Update cache if needed
-  ansible.builtin.meta: flush_handlers
+  meta: flush_handlers
+
 - name: Install ccache
-  community.general.pacman:
+  pacman:
     name: ccache
     state: present
-    extra_args: --asdeps
+    extra_args: "--asdeps"
-  become: true
+  become: yes
   when: arch_based
 
 - name: Enable makepkg color
-  ansible.builtin.replace:
+  replace:
     path: /etc/makepkg.conf
-    regexp: ^BUILDENV=(.+)!color(.+)$
+    regexp: '^BUILDENV=(.+)!color(.+)$'
-    replace: BUILDENV=\1color\2
+    replace: 'BUILDENV=\1color\2'
-  become: true
+  become: yes
   when: arch_based
 
 - name: Enable makepkg ccache
-  ansible.builtin.replace:
+  replace:
     path: /etc/makepkg.conf
-    regexp: ^BUILDENV=(.+)!ccache(.+)$
+    regexp: '^BUILDENV=(.+)!ccache(.+)$'
-    replace: BUILDENV=\1ccache\2
+    replace: 'BUILDENV=\1ccache\2'
-  become: true
+  become: yes
   when: arch_based
 
 - name: Remove -mtune from makepkg CFLAGS
-  ansible.builtin.replace:
+  replace:
     path: /etc/makepkg.conf
-    regexp: ^#? *CFLAGS=(.+)-mtune=\S+\s(.*)$
+    regexp: '^#? *CFLAGS=(.+)-mtune=\S+\s(.*)$'
-    replace: CFLAGS=\1\2
+    replace: "CFLAGS=\\1\\2"
-  become: true
+  become: yes
   when: arch_based
 
 - name: Change -march to native from makepkg CFLAGS
-  ansible.builtin.replace:
+  replace:
     path: /etc/makepkg.conf
-    regexp: ^#? *CFLAGS=(.+)-march=\S+(\s)(.*)$
+    regexp: '^#? *CFLAGS=(.+)-march=\S+(\s)(.*)$'
-    replace: CFLAGS=\1-march=native\2\3
+    replace: "CFLAGS=\\1-march=native\\2\\3"
-  become: true
+  become: yes
   when: arch_based
 
 - name: Set makepkg MAKEFLAGS
-  ansible.builtin.replace:
+  replace:
     path: /etc/makepkg.conf
-    regexp: ^#? *MAKEFLAGS=(.+)-j[0-9]+(.+)$
+    regexp: '^#? *MAKEFLAGS=(.+)-j[0-9]+(.+)$'
-    replace: MAKEFLAGS=\1-j{{ j }}\2
+    replace: "MAKEFLAGS=\\1-j{{ j }}\\2"
-  become: true
+  become: yes
   vars:
     j: "{{ [ansible_processor_nproc - 1, 1] | max | int }}"
   when: arch_based
 
 - name: Enable pacman ParallelDownloads
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /etc/pacman.conf
-    regexp: ^#?ParallelDownloads
+    regexp: '^#?ParallelDownloads'
-    line: ParallelDownloads = 5
+    line: 'ParallelDownloads = 5'
-    insertafter: ^\[options\]$
+    insertafter: '^\[options\]$'
-  become: true
+  become: yes
   when: arch_based
 
 - name: Enable pacman colors
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /etc/pacman.conf
-    regexp: ^#?Color
+    regexp: '^#?Color'
-    line: Color
+    line: 'Color'
-    insertafter: ^\[options\]$
+    insertafter: '^\[options\]$'
-  become: true
+  become: yes
   when: arch_based
 
 - name: Enable pacman pac-man
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /etc/pacman.conf
-    regexp: ^#?ILoveCandy
+    regexp: '^#?ILoveCandy'
-    line: ILoveCandy
+    line: 'ILoveCandy'
-    insertafter: ^#?Color
+    insertafter: '^#?Color'
-  become: true
+  become: yes
   when: arch_based
 
+
 # Install alternative package managers
+- name: List packages from base-devel
+  command: pacman -Sqg base-devel
+  register: base_devel_packages
+  changed_when: no
+  check_mode: no
+
 - name: Install dependencies for AUR helpers
-  community.general.pacman:
+  pacman:
-    name:
+    name: "{{ (base_devel_packages.stdout | split('\n') | reject('eq', 'sudo')) + ['fakeroot'] }}"
-      - base-devel
+  become: yes
-      - fakeroot
-  become: true
   when: arch_based
 # Do not install sudo because maybe sudo-fake is installed (otherwise it conflicts)
 # It should already be installed already anyway
@@ -176,41 +182,41 @@
   when: arch
 
 - name: Install AUR package manager (Manjaro)
-  community.general.pacman:
+  pacman:
     name: yay
-  become: true
+  become: yes
   when: manjaro
 # Not sure if regular Manjaro has yay in its community packages,
 # but Manjaro-ARM sure does
 
 - name: Create cache folder
-  ansible.builtin.file:
+  file:
     state: directory
-    mode: u=rwx,g=rx,o=rx
+    mode: "u=rwx,g=rx,o=rx"
     path: "{{ ansible_user_dir }}/.cache/automatrop"
 
 - name: Generate list of packages for package manager
-  ansible.builtin.set_fact:
+  set_fact:
     packages: "{{ query('template', 'package_manager.j2')[0].split('\n')[:-1]|sort|unique }}"
   tags: softwarelist
 
 - name: Install packages (Arch-based)
   aur:
     name: "{{ packages }}"
-    extra_args: --asdeps --needed
+    extra_args: "--asdeps --needed"
     # Nothing is set as installed manually so it can
     # be removed by dependency check.
     # Current packages will be kept by the meta package
     use: yay
-  notify: software changed
+  notify: "software changed"
   tags: softwarelist
   when: arch_based
 
 - name: Check if list of packages changed
-  ansible.builtin.copy:
+  copy:
     content: "{% for package in packages %}{{ package }}\n{% endfor %}"
     dest: "{{ ansible_user_dir }}/.cache/automatrop/package_manager"
-  notify: software changed
+  notify: "software changed"
   tags: softwarelist
 
 # translate-shell

config/automatrop/roles/system/handlers/main.yaml

@@ -1,47 +1,46 @@
----
 - name: Create a etckeeper commit
-  ansible.builtin.command: etckeeper commit 'automatrop {{ ansible_date_time.iso8601 }}'
+  command: "etckeeper commit 'automatrop {{ ansible_date_time.iso8601 }}'"
-  listen: etc changed
+  listen: "etc changed"
-  become: true
+  become: yes
   register: etckeeper_commit
-  failed_when: etckeeper_commit.rc != 0 and 'nothing to commit' not in etckeeper_commit.stdout
+  failed_when: "etckeeper_commit.rc != 0 and 'nothing to commit' not in etckeeper_commit.stdout"
   changed_when: "'nothing to commit' not in etckeeper_commit.stdout"
 
 - name: Restart chrony
-  ansible.builtin.systemd:
+  systemd:
     name: chronyd
     state: restarted
   listen: chrony reconfigured
-  become: true
+  become: yes
 
 - name: Reload systemd daemon
-  ansible.builtin.systemd:
+  systemd:
-    daemon_reload: true
+    daemon_reload: yes
   listen: systemd changed
-  become: true
+  become: yes
 
 - name: Restart wpa_supplicant
-  ansible.builtin.systemd:
+  systemd:
-    name: wpa_supplicant@{{ item }}
+    name: "wpa_supplicant@{{ item }}"
     state: restarted
-  become: true
+  become: yes
   loop: "{{ ansible_interfaces }}"
-  when: item.startswith('wl')
+  when: "item.startswith('wl')"
   listen: wpa_supplicant changed
 # Could probably use something better like
 # listing /sys/class/ieee80211/*/device/net/
 
 - name: Warn about changed Wi-Fi setup
-  ansible.builtin.debug:
+  debug:
-    msg: The Wi-Fi configuration was changed, but not applied to let this playbook finish. A reboot is required.
+    msg: "The Wi-Fi configuration was changed, but not applied to let this playbook finish. A reboot is required."
   listen: wifi setup changed
 
 - name: Warn about changed Panfrost config
-  ansible.builtin.debug:
+  debug:
-    msg: The Panfrost display driver configuration was changed, but needs a reboot to be applied.
+    msg: "The Panfrost display driver configuration was changed, but needs a reboot to be applied."
   listen: panfrost config changed
 
 - name: Reload systemd-logind
-  ansible.builtin.command: systemctl kill -s HUP systemd-logind
+  command: systemctl kill -s HUP systemd-logind
-  become: true
+  become: yes
   listen: systemd-logind config changed

config/automatrop/roles/system/tasks/main.yml

@@ -1,4 +1,3 @@
----
 # TODO For other distributions
 
 # Package are installed with --asdeps because they are needed
@@ -6,96 +5,97 @@
 # Etckeeper
 
 - name: Check if etckeeper is initialized
-  ansible.builtin.stat:
+  stat:
     path: /etc/.git
   register: etckeeper
-  become: true
+  become: yes
 
 - name: Initialize etckeeper
-  ansible.builtin.command: etckeeper init
+  command: "etckeeper init"
-  become: true
+  become: yes
   when: not etckeeper.stat.exists
-  changed_when: true
+  changed_when: yes
 
 - name: Configure git user.name for etckeeper
-  community.general.git_config:
+  git_config:
     scope: local
     repo: /etc
     name: "{{ item.name }}"
     value: "{{ item.value }}"
   loop:
-    - name: user.name
+    - name: "user.name"
-      value: etckeeper on {{ inventory_hostname_short }}
+      value: "etckeeper on {{ inventory_hostname_short }}"
-    - name: user.email
+    - name: "user.email"
-      value: etckeeper@{{ inventory_hostname }}
+      value: "etckeeper@{{ inventory_hostname }}"
-  become: true
+  become: yes
 
 # Manjaro configuration
 
 - name: Remove Manjaro's pamac
-  community.general.pacman:
+  pacman:
     name: pamac
     state: absent
-  become: true
+  become: yes
   when: arch_based and False # I'm trying to remember why I usually delete this thing
 
 # Verbose logging during boot
 
 - name: Check if using Uboot
-  ansible.builtin.stat:
+  stat:
     path: /boot/extlinux/extlinux.conf
   register: extlinux
 # This (and the following) was made with the Pinebook in mind,
 # not sure about compatibility
 
 - name: Remove non-tty1 console (Uboot)
-  ansible.builtin.replace:
+  replace:
     path: /boot/extlinux/extlinux.conf
-    regexp: ^APPEND(.*) console=(?!tty1)\S+(.*)$
+    regexp: '^APPEND(.*) console=(?!tty1)\S+(.*)$'
-    replace: APPEND\1\2
+    replace: 'APPEND\1\2'
-  become: true
+  become: yes
   when: extlinux.stat.exists
 # Only one console= will be removed because regular expression are either hard
 # or somewhat limited. It's just what I need anyway
 
 - name: Remove bootsplash.bootfile (Uboot)
-  ansible.builtin.replace:
+  replace:
     path: /boot/extlinux/extlinux.conf
-    regexp: ^APPEND(.*) bootsplash.bootfile=\S+(.*)$
+    regexp: '^APPEND(.*) bootsplash.bootfile=\S+(.*)$'
-    replace: APPEND\1\2
+    replace: 'APPEND\1\2'
-  become: true
+  become: yes
   when: extlinux.stat.exists
 
 - name: Remove bootsplash packages (Arch based)
-  community.general.pacman:
+  pacman:
     name:
       - bootsplash-systemd
       - bootsplash-theme-manjaro
     state: absent
-  become: true
+  become: yes
   when: arch_based
 
+
 # Display Manager
 
 - name: Remove display manager packages (Arch based)
-  community.general.pacman:
+  pacman:
     name:
       - sddm
       - sddm-breath2-theme
     state: absent
-  become: true
+  become: yes
   when: arch_based
 
 # Xorg configuration
 
 - name: Check if there is nvidia-xrun is installed
-  ansible.builtin.stat:
+  stat:
     path: /etc/X11/nvidia-xorg.conf
   register: nvidia_xrun
   when: display_server == 'x11'
 
 - name: Add nvidia-xrun xorg config directory
-  ansible.builtin.set_fact:
+  set_fact:
     xorg_common_config_dirs: "{{ xorg_default_config_dirs + xorg_nvidia_config_dirs }}"
   vars:
     xorg_default_config_dirs:
@@ -104,78 +104,78 @@
   when: display_server == 'x11'
 
 - name: Configure Xorg keyboard layout
-  ansible.builtin.copy:
+  copy:
     src: xorg/keyboard.conf
     dest: "{{ item }}/00-keyboard.conf"
-  become: true
+  become: yes
   when: display_server == 'x11'
   notify: etc changed
   loop: "{{ xorg_common_config_dirs }}"
 
 - name: Use Alt keys for numpad
-  ansible.posix.patch:
+  patch:
     src: us_qwert_alt_numpad.patch
     dest: /usr/share/X11/xkb/symbols/us_qwerty-fr
-  become: true
+  become: yes
   when: display_server == 'x11'
 # This is not very nice but it's updated so infrequently that it's not worth
 # the trouble
 
 - name: Check if there is Intel backlight
-  ansible.builtin.stat:
+  stat:
     path: /sys/class/backlight/intel_backlight
   register: intel_backlight
   when: display_server == 'x11'
 
 - name: Install Intel video drivers (Arch based)
-  community.general.pacman:
+  pacman:
     name: xf86-video-intel
     # state: "{{ intel_backlight.stat.exists }}"
     state: present
-  become: true
+  become: yes
   when: display_server == 'x11' and intel_backlight.stat.exists and arch_based
   # TODO With software role? Would permit other distributions
 
 - name: Configure Xorg Intel backlight
-  ansible.builtin.copy:
+  copy:
     src: xorg/intel_backlight.conf
     dest: "{{ item }}/20-intel_backlight.conf"
-  become: true
+  become: yes
   when: display_server == 'x11' and intel_backlight.stat.exists
   notify: etc changed
   loop: "{{ xorg_common_config_dirs }}"
 
 - name: Configure Xorg touchpad behaviour
-  ansible.builtin.copy:
+  copy:
     src: xorg/touchpad.conf
     dest: "{{ item }}/30-touchpad.conf"
-  become: true
+  become: yes
   when: display_server == 'x11'
   notify: etc changed
   loop: "{{ xorg_common_config_dirs }}"
 
 - name: Configure Xorg joystick behaviour
-  ansible.builtin.copy:
+  copy:
     src: xorg/joystick.conf
     dest: "{{ item }}/50-joystick.conf"
-  become: true
+  become: yes
   when: display_server == 'x11'
   notify: etc changed
   loop: "{{ xorg_common_config_dirs }}"
 
 - name: List modules we're using
-  ansible.builtin.slurp:
+  slurp:
     src: /proc/modules
-  register: modules
+  register: modules 
   when: display_server
 # Not sure the module will be loaded in early setup stages though
 
 - name: Make panfrost use OpenGL 3.3
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /etc/environment
-    line: PAN_MESA_DEBUG="gl3"
+    line: 'PAN_MESA_DEBUG="gl3"'
-    regexp: ^#? ?PAN_MESA_DEBUG=
+    regexp: '^#? ?PAN_MESA_DEBUG='
-  become: true
+  become: yes
   when: display_server and using_panfrost
   vars:
     using_panfrost: "{{ 'panfrost' in (modules.content | b64decode) }}"
@@ -183,21 +183,21 @@
 
 # Numlock on boot
 
-- name: Set numlock on boot
+- name: set numlock on boot
-  ansible.builtin.copy:
+  copy:
     src: getty.service
     dest: /etc/systemd/system/getty@.service.d/override.conf
-  become: true
+  become: yes
   notify:
     - etc changed
     - systemd changed
   when: auto_numlock
 
 - name: Unset numlock on boot
-  ansible.builtin.file:
+  file:
     path: /etc/systemd/system/getty@.service.d/override.conf
     state: absent
-  become: true
+  become: yes
   notify:
     - etc changed
     - systemd changed
@@ -206,163 +206,163 @@
 # TLP configuration
 
 - name: Start/enable TLP
-  ansible.builtin.systemd:
+  systemd:
     name: tlp
     state: started
-    enabled: true
+    enabled: yes
-  become: true
+  become: yes
   notify: etc changed
 
 # Network configuration
 
 - name: Start/enable dhcpcd
-  ansible.builtin.systemd:
+  systemd:
     name: dhcpcd
     state: started
-    enabled: true
+    enabled: yes
-  become: true
+  become: yes
   notify: etc changed
 
 - name: Configure wpa_supplicant
-  ansible.builtin.template:
+  template:
     src: wpa_supplicant.conf.j2
     dest: /etc/wpa_supplicant/wpa_supplicant.conf
   notify:
     - etc changed
     - wpa_supplicant changed
-  become: true
+  become: yes
   tags:
     - wificonf
 
 - name: Prepare directory for wpa_supplicant service override
-  ansible.builtin.file:
+  file:
     path: /etc/systemd/system/wpa_supplicant@.service.d
     state: directory
-    mode: u=rwx,g=rx,o=rx
+    mode: "u=rwx,g=rx,o=rx"
-  become: true
+  become: yes
 
 - name: Make wpa_supplicant use a common configuration file
-  ansible.builtin.copy:
+  copy:
     src: wpa_supplicant.service
     dest: /etc/systemd/system/wpa_supplicant@.service.d/override.conf
-  become: true
+  become: yes
   notify:
     - etc changed
     - systemd changed
     - wifi setup changed
 
 - name: Disable wpa_supplicant for networkmanager
-  ansible.builtin.systemd:
+  systemd:
     name: wpa_supplicant
-    enabled: false
+    enabled: no
-  become: true
+  become: yes
   notify:
     - etc changed
     - wifi setup changed
 
 - name: Start/enable wpa_supplicant for interface
-  ansible.builtin.systemd:
+  systemd:
-    name: wpa_supplicant@{{ item }}
+    name: "wpa_supplicant@{{ item }}"
-    enabled: true
+    enabled: yes
-  become: true
+  become: yes
   notify:
     - etc changed
     - wifi setup changed
   loop: "{{ ansible_interfaces }}"
-  when: item.startswith('wl')
+  when: "item.startswith('wl')"
 # Could probably use something better like
 # listing /sys/class/ieee80211/*/device/net/
 
 - name: Uninstall networkmanager
-  community.general.pacman:
+  pacman:
     name: networkmanager
     state: absent
-    extra_args: --cascade --recursive
+    extra_args: "--cascade --recursive"
   when: arch_based
-  become: true
+  become: yes
   notify:
     - wifi setup changed
 
 - name: Mask systemd-networkd
-  ansible.builtin.systemd:
+  systemd:
     name: systemd-networkd
     state: stopped
-    enabled: false
+    enabled: no
-    masked: true
+    masked: yes
-  become: true
+  become: yes
   notify: etc changed
 
 # Time synchronisation
 
 - name: Mask systemd-timesyncd
-  ansible.builtin.systemd:
+  systemd:
     name: systemd-timesyncd
     state: stopped
-    enabled: false
+    enabled: no
-    masked: true
+    masked: yes
-  become: true
+  become: yes
   notify: etc changed
 
 - name: Configure chrony
-  ansible.builtin.copy:
+  copy:
     src: chrony.conf
     dest: /etc/chrony.conf
-  become: true
+  become: yes
   notify:
     - etc changed
     - chrony reconfigured
 # TODO More configuration, RTC configuration
 
 - name: Enable chronyd
-  ansible.builtin.systemd:
+  systemd:
     name: chronyd
-    enabled: true
+    enabled: yes
-  become: true
+  become: yes
   notify:
     - etc changed
     - chrony reconfigured
 
 - name: Configure dhcpcd chrony hook
-  ansible.builtin.copy:
+  copy:
     src: dhcpcd.exit-hook
     dest: /etc/dhcpcd.exit-hook
-  become: true
+  become: yes
   notify: etc changed
 
 - name: Empty motd
-  ansible.builtin.copy:
+  copy:
     content: ""
     dest: /etc/motd
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
-  become: true
+  become: yes
   notify:
     - etc changed
 
 # VPN configuration
 
 - name: Prepare directory for openvpn-client service override
-  ansible.builtin.file:
+  file:
     path: /etc/systemd/system/openvpn-client@.service.d
     state: directory
-    mode: u=rwx,g=rx,o=rx
+    mode: "u=rwx,g=rx,o=rx"
-  become: true
+  become: yes
 
 - name: Make openvpn use hooks for resolvconf
-  ansible.builtin.copy:
+  copy:
     src: openvpn-client.service
     dest: /etc/systemd/system/openvpn-client@.service.d/override.conf
-  become: true
+  become: yes
   notify:
     - etc changed
     - systemd changed
 
 - name: Disable power button
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /etc/systemd/logind.conf
-    line: HandlePowerKey=ignore
+    line: 'HandlePowerKey=ignore'
-    regexp: ^#? *HandlePowerKey=
+    regexp: '^#? *HandlePowerKey='
-    insertafter: ^\[Login\]$
+    insertafter: '^\[Login\]$'
-  become: true
+  become: yes
   notify: systemd-logind config changed
   # Reason: I sometimes press it accidentally
   # (hoping to start it when it's already started,

config/automatrop/roles/termux/tasks/main.yml

@@ -1,17 +1,16 @@
----
 - name: Create Termux directory
-  ansible.builtin.file:
+  file:
     state: directory
     path: "{{ ansible_user_dir }}/.termux"
-    mode: u=rwx,g=rx,o=rx
+    mode: "u=rwx,g=rx,o=rx"
 # TODO This is a dotfiles directory.
 # Make it not install unless it's Termux
 
 - name: Silence Termux login message
-  ansible.builtin.file:
+  file:
     state: file
     path: "{{ ansible_user_dir }}/.hushlogin"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
 
 # Build a single color scheme and template and assign it to a variable
 - base16_builder:
@@ -23,10 +22,10 @@
     - color
 
 - name: Download base16 theme for Termux
-  ansible.builtin.copy:
+  copy:
     content: "{{ base16_schemes['schemes'][base16_scheme]['termux']['colors']['base16-' + base16_scheme + '.properties'] }}"
     dest: "{{ ansible_env.HOME }}/.termux/colors.properties"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   tags:
     - color
 

config/automatrop/roles/vim/handlers/main.yml

@@ -1,12 +1,11 @@
----
 - name: Upgrade Neovim plugins
-  ansible.builtin.command: nvim +PlugUpgrade +PlugUpdate +PlugInstall +qall!
+  command: "nvim +PlugUpgrade +PlugUpdate +PlugInstall +qall!"
   listen: nvim plugins changed
   environment:
-    VIMINIT: source {{ ansible_user_dir }}/.config/nvim/plugininstall.vim
+    VIMINIT: "source {{ ansible_user_dir }}/.config/nvim/plugininstall.vim"
 
 - name: Upgrade Vim plugins
-  ansible.builtin.command: vim +PlugUpgrade +PlugUpdate +PlugInstall +qall!
+  command: "vim +PlugUpgrade +PlugUpdate +PlugInstall +qall!"
   listen: vim plugins changed
   environment:
-    VIMINIT: source {{ ansible_user_dir }}/.config/vim/plugininstall.vim
+    VIMINIT: "source {{ ansible_user_dir }}/.config/vim/plugininstall.vim"

config/automatrop/roles/vim/tasks/main.yml

@@ -1,6 +1,5 @@
----
 - name: Set vim variants to use
-  ansible.builtin.set_fact:
+  set_fact:
     vim_variants:
       - vim
       - nvim
@@ -8,37 +7,37 @@
 # TODO Select those in a clever way
 
 - name: Create vim configuration directory
-  ansible.builtin.file:
+  file:
     state: directory
     path: "{{ ansible_user_dir }}/.config/{{ item }}"
-    mode: u=rwx,g=rx,o=rx
+    mode: "u=rwx,g=rx,o=rx"
   loop: "{{ vim_variants }}"
 
 - name: Install vim-plug
-  ansible.builtin.get_url:
+  get_url:
     url: https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
     dest: "{{ ansible_user_dir }}/.config/vim/plug.vim"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
 
 - name: Install loader
-  ansible.builtin.template:
+  template:
     src: loader.j2
     dest: "{{ ansible_user_dir }}/.config/vim/loader.vim"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
 
 - name: Install theme
-  ansible.builtin.template:
+  template:
     src: theme.j2
     dest: "{{ ansible_user_dir }}/.config/vim/theme.vim"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   tags:
     - color
 
 - name: Configure vim plugin list
-  ansible.builtin.template:
+  template:
     src: plugininstall.j2
     dest: "{{ ansible_user_dir }}/.config/{{ variant }}/plugininstall.vim"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   notify:
     - "{{ variant }} plugins changed"
   loop: "{{ vim_variants }}"
@@ -46,10 +45,10 @@
     loop_var: variant
 
 - name: Configure vim
-  ansible.builtin.template:
+  template:
     src: init.vim.j2
     dest: "{{ ansible_user_dir }}/.config/{{ variant }}/init.vim"
-    mode: u=rw,g=r,o=r
+    mode: "u=rw,g=r,o=r"
   loop: "{{ vim_variants }}"
   loop_control:
     loop_var: variant