From 5525d3eb5b332f362ba828cc0d5939f52be516e6 Mon Sep 17 00:00:00 2001
From: user <user@pop-os.localdomain>
Date: Sun, 16 Jul 2023 06:58:34 -0500
Subject: [PATCH] update

---
 roles/packages/tasks/Debian-12.yml    |  2 ++
 roles/packages/tasks/Debian.yml       | 24 ------------------
 roles/packages/vars/Debian-12.yml     | 36 +++++++++++++++++++++++++++
 roles/packages/vars/Pop!_OS-22.04.yml |  1 +
 scripts/install_apt.yml               |  2 ++
 5 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 roles/packages/tasks/Debian-12.yml
 delete mode 100644 roles/packages/tasks/Debian.yml
 create mode 100644 roles/packages/vars/Debian-12.yml

diff --git a/roles/packages/tasks/Debian-12.yml b/roles/packages/tasks/Debian-12.yml
new file mode 100644
index 0000000..df3f1f7
--- /dev/null
+++ b/roles/packages/tasks/Debian-12.yml
@@ -0,0 +1,2 @@
+- name: "Install APT Packages"
+  include_tasks: "../scripts/install_apt.yml"
diff --git a/roles/packages/tasks/Debian.yml b/roles/packages/tasks/Debian.yml
deleted file mode 100644
index 435b483..0000000
--- a/roles/packages/tasks/Debian.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- name: add apt repository key
-  apt_key:
-    url: "{{ item }}"
-  with_items: "{{ apt_keys }}"
-  become: yes
-
-- name: add apt repository
-  apt_repository:
-    repo: "{{ item }}"
-  with_items: "{{ apt_repo }}"
-  become: yes
-
-- name: Upgrade Packages
-  package:
-    update_cache: yes
-    upgrade: safe 
-  become: yes
-
-- name: Install Packages
-  apt:
-    state: latest
-    update_cache: yes
-    pkg: "{{ required_packages }}"
-  become: yes
diff --git a/roles/packages/vars/Debian-12.yml b/roles/packages/vars/Debian-12.yml
new file mode 100644
index 0000000..8aecb2f
--- /dev/null
+++ b/roles/packages/vars/Debian-12.yml
@@ -0,0 +1,36 @@
+required_packages:
+  - ripgrep
+  - ansible
+  - libfuse2
+  - git
+  - zsh
+  - nfs-common
+  - powershell
+  - kubectl
+  - terraform
+  - helm
+  - htop
+  - libvirt-daemon     
+  - stow
+  - tmux
+  - xsel
+  - easy-rsa 
+  - docker.io
+  - httpie
+  - wl-clipboard
+
+apt_keys:
+  - https://packages.cloud.google.com/apt/doc/apt-key.gpg
+  - https://apt.releases.hashicorp.com/gpg
+  - https://baltocdn.com/helm/signing.asc
+  - https://packages.microsoft.com/keys/microsoft.asc
+apt_repo:
+  - deb https://apt.kubernetes.io/ kubernetes-xenial main
+  - deb [arch=amd64] https://apt.releases.hashicorp.com jammy main
+  - deb https://baltocdn.com/helm/stable/debian/ all main
+  - deb [arch=amd64] https://packages.microsoft.com/ubuntu/22.04/prod jammy main
+      
+groups_to_add:
+    - docker
+
+
diff --git a/roles/packages/vars/Pop!_OS-22.04.yml b/roles/packages/vars/Pop!_OS-22.04.yml
index 305ddcd..e5734c3 100644
--- a/roles/packages/vars/Pop!_OS-22.04.yml
+++ b/roles/packages/vars/Pop!_OS-22.04.yml
@@ -22,6 +22,7 @@ required_packages:
   - easy-rsa 
   - docker.io
   - httpie
+  - wl-clipboard
 
 apt_keys:
   - https://packages.cloud.google.com/apt/doc/apt-key.gpg
diff --git a/scripts/install_apt.yml b/scripts/install_apt.yml
index 08bd394..122bd01 100644
--- a/scripts/install_apt.yml
+++ b/scripts/install_apt.yml
@@ -3,12 +3,14 @@
     url: "{{ item }}"
   with_items: "{{ apt_keys }}"
   become: yes
+  when: apt_keys is defined   
 
 - name: add apt repository
   apt_repository:
     repo: "{{ item }}"
   with_items: "{{ apt_repo }}"
   become: yes
+  when: apt_repo is defined   
 
 - name: Upgrade Packages
   package: