From a13d0c244f54c218e2c438c36b960d7392dffb20 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Thu, 2 Dec 2021 18:10:43 +0100
Subject: [PATCH] break inventory overrides less

---
 defaults/main.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++-
 meta/main.yml     |  2 --
 tasks/main.yml    |  8 ++++++++
 vars/main.yml     | 46 ---------------------------------------------
 4 files changed, 55 insertions(+), 49 deletions(-)
 delete mode 100644 meta/main.yml
 delete mode 100644 vars/main.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index 157c642..9d16424 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -19,4 +19,50 @@ default_repos:
       backports:
         url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
 
-
+default_packages:
+  debian:
+    bullseye: &debian_packages
+      aptitude: {}
+      "apt-transport-https": {}
+      "libarchive-tools": {}
+      bzip2: {}
+      curl: {}
+      dnsutils: {}
+      file: {}
+      git: {}
+      haveged: {}
+      htop: {}
+      iftop: {}
+      iotop: {}
+      less: {}
+      "locales-all": {}
+      lsof: {}
+      mailutils: {}
+      members: {}
+      mksh: {}
+      "molly-guard": {}
+      mosh: {}
+      "mtr-tiny": {}
+      ncdu: {}
+      "ncurses-term": {}
+      "net-tools": {}
+      nmap: {}
+      pciutils: {}
+      pv: {}
+      python3: {}
+      rsync: {}
+      screen: {}
+      sshfs: {}
+      sudo: {}
+      sysstat: {}
+      tcpdump: {}
+      tmux: {}
+      tree: {}
+      unzip: {}
+      usbutils: {}
+      "vim": {}
+      vnstat: {}
+      "xz-utils": {}
+      zip: {}
+      zsh: {}
+    buster: *debian_packages
diff --git a/meta/main.yml b/meta/main.yml
deleted file mode 100644
index 7574daa..0000000
--- a/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
-- { role: packages }
diff --git a/tasks/main.yml b/tasks/main.yml
index 958215f..8957ada 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,4 +1,12 @@
 ---
+- name: install default packages and repos
+  include_role:
+    name: packages
+  vars:
+    packages:
+      pkg: "{{ default_packages[ansible_distribution|lower][ansible_distribution_release|lower] }}"
+      repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}"
+
 - name: copy environment
   copy:
     src: dotfiles/environment
diff --git a/vars/main.yml b/vars/main.yml
deleted file mode 100644
index 0474326..0000000
--- a/vars/main.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-packages:
-  pkg:
-    aptitude: {}
-    "apt-transport-https": {}
-    "libarchive-tools": {}
-    bzip2: {}
-    curl: {}
-    dnsutils: {}
-    file: {}
-    git: {}
-    haveged: {}
-    htop: {}
-    iftop: {}
-    iotop: {}
-    less: {}
-    "locales-all": {}
-    lsof: {}
-    mailutils: {}
-    members: {}
-    mksh: {}
-    "molly-guard": {}
-    mosh: {}
-    "mtr-tiny": {}
-    ncdu: {}
-    "ncurses-term": {}
-    "net-tools": {}
-    nmap: {}
-    pciutils: {}
-    pv: {}
-    python3: {}
-    rsync: {}
-    screen: {}
-    sshfs: {}
-    sudo: {}
-    sysstat: {}
-    tcpdump: {}
-    tmux: {}
-    tree: {}
-    unzip: {}
-    usbutils: {}
-    "vim": {}
-    vnstat: {}
-    "xz-utils": {}
-    zip: {}
-    zsh: {}
-  repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}"