Make packages.yml flat

packages.yml

@@ -1,40 +1,39 @@
-packages:
+kernel:
-  kernel:
   archlinux:
     - linux-zen
     - linux-zen-headers
     - linux-zen-docs
     - linux-firmware
-  grub:
+grub:
   archlinux:
     - grub
     - efibootmgr
-  lvm:
+lvm:
   archlinux:
     - lvm2
-  build-essentials:
+build-essentials:
   archlinux:
     - gcc
     - ctags
     - cmake
     - maven
     - base-devel
-  posix:
+posix:
   archlinux:
     - posix
-  make:
+make:
   archlinux: ["make"]
-  gdb:
+gdb:
   archlinux: ["gdb"]
-  strace:
+strace:
   archlinux: ["strace"]
-  sudo:
+sudo:
   archlinux: ["sudo"]
-  doas:
+doas:
   archlinux: ["opendoas"]
-  apt:
+apt:
   archlinux: ["apt"]
-  xorg:
+xorg:
   archlinux:
     - xorg-server
     - xorg-xrandr
@@ -44,152 +43,152 @@ packages:
     - xorg-xprop
     - xorg-xset
     - xorg-xinit
-  dmenu:
+dmenu:
   archlinux: ["dmenu"]
-  ansible:
+ansible:
   archlinux:
     - ansible
     - ansible-language-server
     - python-jmespath
-  xdotool:
+xdotool:
   archlinux: ["xdotool"]
-  arandr:
+arandr:
   archlinux: ["arandr"]
-  docker:
+docker:
   archlinux: ["docker", "docker-compose"]
-  font-awesome:
+font-awesome:
   archlinux: ["ttf-font-awesome", "otf-font-awesome"]
-  font-inconsolata:
+font-inconsolata:
   archlinux: ["ttf-inconsolata"]
-  font-dejavu:
+font-dejavu:
   archlinux: ["ttf-dejavu"]
-  font-libertine:
+font-libertine:
   archlinux: ["ttf-linux-libertine"]
-  font-emoji:
+font-emoji:
   archlinux: ["noto-fonts-emoji"]
-  fonts:
+fonts:
   archlinux:
     - noto-fonts
     - noto-fonts-extra
     - noto-fonts-cjk
-  git:
+git:
   # tk required for gitk
   archlinux: ["git", "tk", "git-delta", "git-filter-repo"]
-  htop:
+htop:
   archlinux: ["htop"]
-  feh:
+feh:
   archlinux: ["feh"]
-  i3:
+i3:
   archlinux:
     - i3-wm
     - i3status-rust
-  i3lock:
+i3lock:
   archlinux: ["i3lock"]
-  pluma:
+pluma:
   archlinux: ["pluma"]
-  neovim:
+neovim:
   archlinux: ["neovim", "python-pynvim"]
-  vim:
+vim:
   archlinux: ["vim"]
-  network-manager-applet:
+network-manager-applet:
   archlinux: ["network-manager-applet"]
-  pasystray:
+pasystray:
   archlinux: ["pasystray"]
-  redshift:
+redshift:
   archlinux: ["redshift"]
-  pavucontrol:
+pavucontrol:
   archlinux: ["pavucontrol-qt"]
-  pinentry-qt:
+pinentry-qt:
   archlinux: ["pinentry"]
-  pinta:
+pinta:
   archlinux: ["pinta"]
-  pass:
+pass:
   archlinux: ["pass", "passff-host", "xclip"]
-  urxvt:
+urxvt:
   archlinux: ["rxvt-unicode"]
-  alacritty:
+alacritty:
   archlinux: ["alacritty"]
-  tmux:
+tmux:
   archlinux: ["tmux"]
-  zsh:
+zsh:
   archlinux: ["zsh", "zsh-syntax-highlighting", "zsh-completions"]
-  zathura:
+zathura:
   archlinux: ["zathura", "zathura-pdf-poppler"]
-  pdf:
+pdf:
   archlinux: ["ghostscript", "enscript"]
-  pandoc:
+pandoc:
   archlinux: ["pandoc-cli", "texlive-basic", "texlive-fontsextra", "texlive-latexextra"]
-  libvirt:
+libvirt:
   archlinux: ["virt-manager", "libvirt", "dnsmasq", "iptables-nft", "dmidecode", "virt-install", "virt-viewer", "libguestfs", "edk2-ovmf"]
-  firefox:
+firefox:
   archlinux: ["firefox"]
-  ranger:
+ranger:
   archlinux: ["ranger"]
-  thunar:
+thunar:
   archlinux: ["thunar"]
-  unclutter:
+unclutter:
   archlinux: ["unclutter"]
-  libreoffice:
+libreoffice:
   archlinux: ["libreoffice-fresh", "libreoffice-fresh-de"]
-  qt-theming:
+qt-theming:
   archlinux: ["breeze", "breeze-icons", "breeze-grub", "qt5ct"]
-  gtk-theming:
+gtk-theming:
   archlinux: ["breeze-gtk", "lxappearance"]
-  xcompmgr:
+xcompmgr:
   archlinux: ["xcompmgr"]
-  python:
+python:
   archlinux:
     - python
     - python-lsp-server
     - bandit
     - python-pyflakes
     - python-pylint
-  python-modules:
+python-modules:
   archlinux:
     - python-ruamel-yaml
     - python-gitpython
     - python-semver
-  black:
+black:
   archlinux: ["python-black"]
-  xbacklight:
+xbacklight:
   archlinux: ["acpilight"]
-  wireshark:
+wireshark:
   archlinux: ["wireshark-cli", "wireshark-qt"]
-  nmap:
+nmap:
   archlinux: ["nmap"]
-  curl:
+curl:
   archlinux: ["curl"]
-  wget:
+wget:
   archlinux: ["wget"]
-  tree:
+tree:
   archlinux: ["tree"]
-  which:
+which:
   archlinux: ["which"]
-  zip:
+zip:
   archlinux: ["zip", "unzip"]
-  traceroute:
+traceroute:
   archlinux: ["traceroute"]
-  tcpdump:
+tcpdump:
   archlinux: ["tcpdump"]
-  tar:
+tar:
   archlinux: ["tar"]
-  rsync:
+rsync:
   archlinux: ["rsync"]
-  net-tools:
+net-tools:
   archlinux: ["net-tools"]
-  ntfs:
+ntfs:
   archlinux: ["ntfs-3g"]
-  lsof:
+lsof:
   archlinux: ["lsof"]
-  iptables:
+iptables:
   archlinux: ["iptables-nft"]
-  pwgen:
+pwgen:
   archlinux: ["pwgen"]
-  gpg:
+gpg:
   archlinux: ["gnupg", "paperkey", "yubikey-manager", "yubikey-touch-detector"]
-  networkmanager:
+networkmanager:
   archlinux: ["networkmanager", "capnet-assist"]
-  pulseaudio:
+pulseaudio:
   archlinux:
     - pulseaudio
     - pulseaudio-alsa
@@ -198,39 +197,39 @@ packages:
     - alsa-firmware
     - sof-firmware
     - alsa-ucm-conf
-  iw:
+iw:
   archlinux: ["iw"]
-  cowsay:
+cowsay:
   archlinux: ["cowsay"]
-  ruby:
+ruby:
   archlinux: ["ruby"]
-  acpi:
+acpi:
   archlinux: ["acpi", "acpid"]
-  nodejs:
+nodejs:
   archlinux: ["nodejs", "npm"]
-  xdg:
+xdg:
   archlinux: ["xdg-utils"]
-  dunst:
+dunst:
   archlinux: ["dunst"]
-  cloc:
+cloc:
   archlinux: ["cloc"]
-  bwm-ng:
+bwm-ng:
   archlinux: ["bwm-ng"]
-  virtualbox:
+virtualbox:
   archlinux: ["virtualbox"]
-  ssh:
+ssh:
   archlinux: ["openssh"]
-  sshfs:
+sshfs:
   archlinux: ["sshfs"]
-  expect:
+expect:
   archlinux: ["expect"]
-  inotify:
+inotify:
   archlinux: ["inotify-tools"]
-  rclone:
+rclone:
   archlinux: ["rclone"]
-  dnf:
+dnf:
   archlinux: ["dnf"]
-  rust:
+rust:
   archlinux:
     - rustup
     - rust-analyzer
@@ -239,220 +238,220 @@ packages:
     - cargo-watch
     - cargo-release
     - cargo-sort
-  musescore:
+musescore:
   archlinux: ["musescore"]
-  sipcalc:
+sipcalc:
   archlinux: ["sipcalc"]
-  rofi:
+rofi:
   archlinux: ["rofi"]
-  imv:
+imv:
   archlinux: ["imv"]
-  pacman:
+pacman:
   archlinux: ["pacman", "pacman-contrib"]
-  steam:
+steam:
   archlinux: ["steam"]
-  man:
+man:
   archlinux: ["man-db", "man-pages"]
-  nextcloud:
+nextcloud:
   archlinux: ["nextcloud-client"]
-  kwallet:
+kwallet:
   archlinux: ["kwallet", "kwalletmanager"]
-  pv:
+pv:
   archlinux: ["pv"]
-  stress:
+stress:
   archlinux: ["stress"]
-  mpris:
+mpris:
   archlinux: ["playerctl"]
-  imagemagick:
+imagemagick:
   archlinux: ["imagemagick"]
-  mpv:
+mpv:
   archlinux: ["mpv"]
-  gnome-keyring:
+gnome-keyring:
   archlinux: ["gnome-keyring", "seahorse"]
-  element:
+element:
   archlinux: ["element-desktop"]
-  maim:
+maim:
   archlinux: ["maim"]
-  mkinitcpio:
+mkinitcpio:
   archlinux: ["mkinitcpio"]
-  terraform:
+terraform:
   archlinux: ["terraform"]
-  synclient:
+synclient:
   archlinux: ["xf86-input-synaptics"]
-  ncdu:
+ncdu:
   archlinux: ["ncdu"]
-  dust:
+dust:
   archlinux: ["dust"]
-  font-utils:
+font-utils:
   archlinux: ["woff2"]
-  jq:
+jq:
   archlinux: ["jq"]
-  musl:
+musl:
   archlinux: ["musl"]
-  kdeconnect:
+kdeconnect:
   archlinux: ["kdeconnect"]
-  restic:
+restic:
   archlinux: ["restic"]
-  discord:
+discord:
   archlinux: ["discord"]
-  kubectl:
+kubectl:
   archlinux: ["kubectl"]
-  bind:
+bind:
   archlinux: ["bind"]
-  fzf:
+fzf:
   archlinux: ["fzf"]
-  chromium:
+chromium:
   archlinux: ["chromium"]
-  signal:
+signal:
   archlinux: ["signal-desktop"]
-  go:
+go:
   archlinux: ["go", "gopls", "delve"]
-  helix:
+helix:
   archlinux: ["helix"]
-  keepassxc:
+keepassxc:
   archlinux: ["keepassxc"]
-  awscli:
+awscli:
   archlinux: ["aws-cli"]
-  mariadb-client:
+mariadb-client:
   archlinux: ["mariadb-clients"]
-  php:
+php:
   archlinux: ["php"]
-  exa:
+exa:
   archlinux: ["eza"]
-  just:
+just:
   archlinux: ["just"]
-  ripgrep:
+ripgrep:
   archlinux: ["ripgrep"]
-  fd:
+fd:
   archlinux: ["fd"]
-  bat:
+bat:
   archlinux: ["bat"]
-  mdbook:
+mdbook:
   archlinux: ["mdbook"]
-  bash:
+bash:
   archlinux:
     - bash
     - bash-language-server
     - shellcheck
     - shfmt
-  packer:
+packer:
   archlinux: ["packer"]
-  c:
+c:
   archlinux:
     - gcc
     - clang
-  sed:
+sed:
   archlinux:
     - sed
-  findutils:
+findutils:
   archlinux:
     - findutils
-  html:
+html:
   archlinux:
     - vscode-html-languageserver
-  typescript:
+typescript:
   archlinux:
     - typescript
     - typescript-language-server
-  json:
+json:
   archlinux:
     - vscode-json-languageserver
     - gron
-  markdown:
+markdown:
   archlinux:
     - marksman
-  lldb:
+lldb:
   archlinux:
     - lldb
-  yaml:
+yaml:
   archlinux:
     - yaml-language-server
-  qemu:
+qemu:
   archlinux:
     - qemu-full
     - tigervnc
-  cloud-init:
+cloud-init:
   archlinux:
     - cloud-init
     - cloud-utils
-  netcat:
+netcat:
   archlinux:
     - openbsd-netcat
-  telnet:
+telnet:
   archlinux:
     - inetutils
-  cloudformation-tools:
+cloudformation-tools:
   archlinux:
     - python-cfn-lint
-  johntheripper:
+johntheripper:
   archlinux:
     - john
-  age:
+age:
   archlinux:
     - age
-  httpie:
+httpie:
   archlinux:
     - httpie
-  yt-dlp:
+yt-dlp:
   archlinux:
     - yt-dlp
-  ytfzf:
+ytfzf:
   archlinux:
     - ytfzf
     - ueberzug
-  ffmpeg:
+ffmpeg:
   archlinux:
     - ffmpeg
-  zeal:
+zeal:
   archlinux:
     - zeal
-  kcharselect:
+kcharselect:
   archlinux:
     - kcharselect
-  bottom:
+bottom:
   archlinux:
     - bottom
-  # for iotop
+# for iotop
-  sysstat:
+sysstat:
   archlinux:
     - sysstat
-  qrencode:
+qrencode:
   archlinux:
     - qrencode
-  iotop:
+iotop:
   archlinux:
     - iotop
-  w3m:
+w3m:
   archlinux:
     - w3m
-  ruff:
+ruff:
   archlinux:
     - ruff
-  mold:
+mold:
   archlinux:
     - clang
     - mold
-  arch-packaging:
+arch-packaging:
   archlinux:
     - namcap
     - devtools
     - arch-install-scripts
     - archiso
-  drone:
+drone:
   archlinux:
     - drone-cli
-  sqlite:
+sqlite:
   archlinux:
     - sqlite
-  css:
+css:
   archlinux:
     - vscode-css-languageserver
-  watchexec:
+watchexec:
   archlinux:
     - watchexec
-  postgresql:
+postgresql:
   archlinux:
     - postgresql
-  tokei:
+tokei:
   archlinux:
     - tokei

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) \