Move base things out to the roles that need them

roles/base/tasks/main.yml

@@ -5,26 +5,14 @@
     name:
       - archlinux-keyring
       - base-devel
-      - libnotify
+      - curl
       - pacman-contrib  # for checkupdates, paccache, pacdiff...
       - pkgfile  # get hint on missing package when command not found
       - python-pip
-      - python-wheel
       - python-setuptools
+      - python-wheel
       - reflector
-      - xorg-xinit  # enable xinit to avoid having to type 'startx'
-      - ttf-font-awesome
-      - ttf-jetbrains-mono
-      - ttf-fira-code
-      - rsync  # used for backup
-      - curl
       - wget
-      - xorg
-      - numlockx  # activate numlock (set in .xinitrc)
-      - dunst
-      - udiskie  # automount external drives (set in .xinitrc)
-      - xmlstarlet  # for clitip
-      - pandoc  # for clitip
   when: ansible_facts['distribution'] == 'Archlinux'
 
 - name: Install packages (Debian)
@@ -32,33 +20,15 @@
   apt:
     name:
       - build-essential
-      - libnotify-bin
-      - python3-venv
-      - python3-pip
-      - python3-wheel
-      - python3-setuptools
-      - xinit  # enable xinit to avoid having to type 'startx'
-      - fonts-font-awesome
-      - fonts-jetbrains-mono
-      - fonts-firacode
-      - rsync  # used for backup
       - curl
+      - python3-pip
+      - python3-setuptools
+      - python3-venv
+      - python3-wheel
       - wget
-      - xorg
-      - numlockx  # activate numlock (set in .xinitrc)
-      - dunst
-      - udiskie  # automount external drives (set in .xinitrc)
-      - xmlstarlet  # for clitip
-      - pandoc  # for clitip
   when: ansible_facts['distribution'] == 'Debian'
 
 - name: Update pkgfile for Archlinux
   become: true
   command: pkgfile -u
   when: ansible_facts['distribution'] == 'Archlinux'
-
-- name: Copy Xmodmap
-  copy:
-    src: Xmodmap
-    dest: ~/.Xmodmap
-    mode: 0644

roles/gitea-backup/tasks/main.yml

@@ -1,8 +1,23 @@
 ---
+- name: Install packages (Archlinux)
+  become: true
+  pacman:
+    name:
+      - rsync  # used for backup
+  when: ansible_facts['distribution'] == 'Archlinux'
+
+- name: Install packages (Debian)
+  become: true
+  apt:
+    name:
+      - rsync  # used for backup
+  when: ansible_facts['distribution'] == 'Debian'
+
 - name: Copy gitea-backup timer
   copy:
     src: gitea-backup.timer
     dest: ~/.config/systemd/user/gitea-backup.timer
+    mode: 0644
   notify:
     - Run daemon-reload
     - Enable gitea-backup timer
@@ -11,4 +26,5 @@
   template:
     src: gitea-backup.service.j2
     dest: ~/.config/systemd/user/gitea-backup.service
+    mode: 0644
   notify: Run daemon-reload

roles/i3/tasks/main.yml

@@ -3,43 +3,65 @@
   become: true
   pacman:
     name:
-      - noto-fonts
-      - i3-gaps
       - dmenu
-      - picom
+      - dunst
-      - xdg-user-dirs
-      - i3lock
-      - xsettingsd
-      - lxappearance
-      - scrot
-      - viewnior
       - hsetroot
+      - i3-gaps
+      - i3blocks
+      - i3lock
+      - libnotify
+      - lxappearance
+      - pandoc  # for clitip
+      - picom
       - python-feedparser
       - python-matplotlib
-      - i3blocks
+      - noto-fonts
+      - numlockx  # activate numlock (set in .xinitrc)
+      - scrot
       - sysstat
+      - ttf-font-awesome
+      - ttf-jetbrains-mono
+      - ttf-fira-code
+      - udiskie  # automount external drives (set in .xinitrc)
       - upower
+      - viewnior
+      - xdg-user-dirs
+      - xmlstarlet  # for clitip
+      - xorg
+      - xorg-xinit  # enable xinit to avoid having to type 'startx'
+      - xsettingsd
   when: ansible_facts['distribution'] == 'Archlinux'
 
 - name: Install packages (Debian)
   become: true
   apt:
     name:
+      - dunst
+      - fonts-font-awesome
+      - fonts-jetbrains-mono
+      - fonts-firacode
       - fonts-noto
-      - i3-wm
-      - suckless-tools
-      - picom
-      - xdg-user-dirs
-      - i3lock
-      - xsettingsd
-      - lxappearance
-      - scrot
-      - viewnior
       - hsetroot
+      - i3-wm
+      - i3lock
+      - libnotify-bin
       - libstartup-notification0-dev  # build dependency
+      - lxappearance
+      - numlockx  # activate numlock (set in .xinitrc)
+      - pandoc  # for clitip
+      - picom
+      - scrot
       - python3-matplotlib
+      - suckless-tools
       - sysstat
       - upower
+      - udiskie  # automount external drives (set in .xinitrc)
+      - viewnior
+      - xdg-user-dirs
+      - xinit  # enable xinit to avoid having to type 'startx'
+      - xmlstarlet  # for clitip
+      - xorg
+      - xsettingsd
   when: ansible_facts['distribution'] == 'Debian'
 
 - name: Clone repos
@@ -65,6 +87,7 @@
     - {src: 'i3blocksconfig', dest: '~/.config/i3blocks/config'}
     - {src: 'xinitrc', dest: '~/.xinitrc'}
     - {src: 'xserverrc', dest: '~/.xserverrc'}
+    - {src: 'Xmodmap', dest: '~/.Xmodmap'}
     - {src: 'Xresources', dest: '~/.Xresources'}
     - {src: 'xsettingsd', dest: '~/.xsettingsd'}
     - {src: 'picom.conf', dest: '~/.config/picom.conf'}

roles/rsync-backup/tasks/main.yml

@@ -1,11 +1,27 @@
 ---
-- include_vars: vault.yml
+- name: Include vault variables
+  include_vars: vault.yml
+
+- name: Install packages (Archlinux)
+  become: true
+  pacman:
+    name:
+      - rsync  # used for backup
+  when: ansible_facts['distribution'] == 'Archlinux'
+
+- name: Install packages (Debian)
+  become: true
+  apt:
+    name:
+      - rsync  # used for backup
+  when: ansible_facts['distribution'] == 'Debian'
 
 - name: Copy rsync_backup timer
   become: true
   copy:
     src: rsync_backup.timer
     dest: /etc/systemd/system/rsync_backup.timer
+    mode: 0644
   notify:
     - Run daemon-reload
     - Enable rsync_backup timer
@@ -15,6 +31,7 @@
   copy:
     src: rsync_backup.service
     dest: /etc/systemd/system/rsync_backup.service
+    mode: 0644
   notify: Run daemon-reload
 
 - name: Copy rsync_backup script

roles/shell/files/shell_aliases.ansible

@@ -66,15 +66,6 @@ pw() {
     unset PASSWORD_STORE_CLIP_TIME
 }
 
-clitip() {
-    curl -s https://raw.githubusercontent.com/jlevy/the-art-of-command-line/master/README.md |
-        sed '/cowsay[.]png/d' |
-        pandoc -f markdown -t html |
-        xmlstarlet fo --html --dropdtd |
-        xmlstarlet sel -t -v "(html/body/ul/li[count(p)>0])[$RANDOM mod last()+1]" |
-        xmlstarlet unesc | fmt -80 | iconv -t US
-}
-
 system-update() {
     # Don't update if its a kernel update that will require reboot
     if checkupdates >/dev/null 2>&1; then