Make packages.yml flat

packages.yml

@@ -1,4 +1,3 @@
-packages:
 kernel:
   archlinux:
     - linux-zen

playbook.yml

@@ -158,12 +158,10 @@
         - name: load package list
           include_vars:
             file: packages.yml
+            name: defined_packages
 
         - set_fact:
-            defined_packages: "{{ packages }}"
+            distro_packages: "{{ defined_packages|json_query('*.%s'|format(distro)) }}"
-
-        - set_fact:
-            distro_packages: "{{ packages|json_query('*.%s'|format(distro)) }}"
 
         - name: check list
           assert:
@@ -171,7 +169,7 @@
 
         - name: install packages
           package:
-            name: "{{ packages|json_query(query) }}"
+            name: "{{ defined_packages|json_query(query) }}"
             state: present
           become: true
           vars:

remove-unconfigured-packages.sh

@@ -19,7 +19,7 @@ packages_to_remove=()
 
 readarray -d $'\0' -t packages_to_remove < <(comm --zero-terminated -13 \
   <(cat \
-    <(<packages.yml yaml2json | jq --raw-output0 '.packages | map(.archlinux) | flatten[]') \
+    <(<packages.yml yaml2json | jq --raw-output0 'map(.archlinux) | flatten[]') \
     <(for dep in "${aurdeps[@]}" ; do printf '%s\0' "${dep}" ; done) \
   | sort -zu) \
   <(pacman -Qq --explicit | xargs -I "{}" printf '%s\0' "{}" | sort -zu) \