Streamling tagging & formatting

playbook.yml

@@ -36,7 +36,10 @@
             archlinux:
               - python-jmespath
 
-    - block:
+    - name: pacman
+      tags:
+        - pacman
+      block:
         - name: enable multilib repository
           blockinfile:
             path: /etc/pacman.conf
@@ -103,11 +106,11 @@
               state: started
               daemon_reload: true
             become: true
-        tags: [pacman_cache_cleanup]
 
-      when: distro == 'archlinux'
+    - name: dotfiles directory
-
+      tags:
-    - block:
+        - dotfiles-directory
+      block:
         - name: create dotfiles group
           group:
             name: dotfiles
@@ -147,9 +150,11 @@
           become: true
           become_user: root
           changed_when: dotfiles_permission_change.stdout_lines|length > 0
-      tags: [dotfiles-directory]
 
-    - block:
+    - name: packages
+      tags:
+        - packages
+      block:
         - name: load package list
           include_vars:
             file: packages.yml
@@ -158,7 +163,6 @@
           shell: pacman -Q iptables && yes | pacman -S iptables-nft
           changed_when: false
           become: true
-        when: distro == 'archlinux'
 
         - set_fact:
             defined_packages: "{{ packages|json_query('keys(list)') }}"
@@ -203,9 +207,10 @@
           when: machine.packages is defined
           become: true
 
-      tags: [packages]
+    - name: aur
-
+      tags:
-    - block:
+        - aur
+      block:
         - name: create build user on arch
           user:
             name: makepkg
@@ -477,10 +482,6 @@
           loop_control:
             label: "{{ item[0].name }}/{{ item[1] }}"
 
-      tags: ["aur"]
-      when: distro == 'archlinux'
-
-    - block:
     - name: configure timesyncd on arch
       copy:
         owner: root
@@ -499,7 +500,7 @@
         state: present
       become: true
 
-      - name: use lz4 for mkinitcpio compression
+    - name: use vz4 for mkinitcpio compression
       lineinfile:
         path: /etc/mkinitcpio.conf
         regexp: '^#?COMPRESSION=.*$'
@@ -507,12 +508,14 @@
       become: true
       notify:
         - rebuild initrd
-      when: distro == 'archlinux'
 
+    - name: services
+      tags:
+        - services
+      block:
         - set_fact:
             disable_services:
-          - sshd
+              - sshd.service
-      when: distro == 'archlinux'
 
         - name: disable services
           service:
@@ -634,7 +637,6 @@
         become: true
 
       when:
-        - distro == 'archlinux'
         - machine.gpu is defined and machine.gpu == 'amd'
 
     - set_fact:
@@ -664,6 +666,8 @@
         apply:
           become: true
           become_user: "{{ user.name }}"
+          tags:
+            - user
       with_items: "{{ users }}"
       no_log: True # less spam
       loop_control:

user.yml

@@ -8,7 +8,6 @@
       - sudonopw
       - games
       - kvm
-  tags: [always]
 
 - name: create user group
   group:
@@ -81,7 +80,10 @@
   become: true
   become_user: root
 
-- block:
+- name: configure dotfiles
+  tags:
+    - dotfiles
+  block:
     - name: load dotfile list
       include_vars:
         file: dotfiles.yml
@@ -247,10 +249,11 @@
         src: /var/lib/dotfiles/bin
         owner: "{{ user.name }}"
         group: "{{ user.name }}"
-  tags:
-    - dotfiles
 
-- block:
+- name: vim
+  tags:
+    - vim
+  block:
     - name: install vim plugins
       command: nvim --headless +PlugInstall +qall
       register: vim_plugin_install
@@ -261,13 +264,15 @@
       register: vim_plugin_update
       changed_when: vim_plugin_update.stderr != ""
 
-  tags: [vim-plugins]
+- name: firefox
-
+  tags:
-- block:
+    - firefox
+  block:
     - name: create firefox directories
       firefox_profile:
         name: "{{ item.key }}"
       loop: "{{ user.firefox_profiles | dict2items }}"
+      check_mode: false
       register: firefox_profile_names
 
     - set_fact:
@@ -353,10 +358,10 @@
       with_items: "{{ firefox_profile_names.results }}"
       loop_control:
         label: "{{ item.profile_path }}"
-  tags:
-    - firefox
 
 - name: handle autostart units
+  tags:
+    - autostart
   block:
     - name: create systemd user directory
       file:
@@ -400,10 +405,10 @@
         force: true
         follow: false
 
+- name: gpg
   tags:
-    - autostart
+    - gpg
-
+  block:
-- block:
     - name: import gpg key
       command: gpg --import ./gpgkeys/{{ user.gpg_key.email }}.gpg.asc
       register: gpg_import_output
@@ -417,4 +422,3 @@
       changed_when: gpg_trust_output.stderr_lines|length > 0
 
   when: user.gpg_key is defined
-  tags: [gpg]