From ef560719f44fa57b6ec43f3d8f4ddc0fb1cba23f Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 17 Jun 2021 16:35:11 -0500
Subject: [PATCH] Package cleanup on desktop

---
 roles/desktop/defaults/main.yml  | 24 ++++++++++++++----------
 roles/desktop/tasks/packages.yml |  2 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/roles/desktop/defaults/main.yml b/roles/desktop/defaults/main.yml
index 859b837..f1fa7fa 100644
--- a/roles/desktop/defaults/main.yml
+++ b/roles/desktop/defaults/main.yml
@@ -57,7 +57,6 @@ desktop_apt_packages:
   # CLI Packages
   - apt                                 # Useful for Android debugging, and also for pinephone shenanigans
   - build-essential                     # Used in numerous build ventures, just all-around important
-  - cava                                # Audio visualizer thing
   - cmake                               # Also useful for building from source
   - docker-ce                           # soy
   - docker-compose
@@ -86,10 +85,6 @@ desktop_apt_packages:
   - python3-pyqt5
   - python3-usb
   - python3-venv
-  - tmux-xpanes                         # Used for administration and work stuff
-  - tree                                # Useful basic utility
-  - vagrant                             # Very handy for development
-  - vagrant-libvirt
   - vim                                 # VERY important utility
   - wine                                # Used for gaming and other things
   - wine-binfmt                         # Quality-of-life support for single-click launching EXEs
@@ -122,8 +117,6 @@ desktop_apt_packages:
   - minetest
   # Applications
   - audacity                            # Audio recording and editing tool
-  - barrier                             # FOSS variant of Synergy
-  - bitcoin-qt                          # Bitcoin stuffs
   - chromium-browser                    # Nice to have an alternative browser, even if it's trash
   - clonezilla                          # Gotta make them clones
   - dolphin-emu-master                  # GameCube and Wii emulator
@@ -132,7 +125,6 @@ desktop_apt_packages:
   - filelight                           # Disk space management utility
   - filezilla                           # FTP/SFTP/FTPS client, useful once in a blue moon
   - firefox                             # MY MAN
-  - g810-led                            # Controls lights on Logitech peripherals
   - gimp                                # Fantastic image editor
   - joy2key                             # A neat wrapper to bind controller inputs to keyboard keys
   - kcolorchooser                       # Color picker, used all the time in themeing
@@ -148,8 +140,6 @@ desktop_apt_packages:
   - libretro-snes9x
   - lutris                              # Fantastic third-party wine gaming client
   - mesa-vulkan-drivers                 # Important graphics drivers
-  - mono-complete                       # Initialization may take an eternity
-  - monodevelop                         # For Terraria modding, don't hate me
   - mpv                                 # Video player of choice
   - mupen64plus-qt                      # For when I don't want to fight libretro
   - nextcloud-desktop                   # Desktop sync client for probably another box in this repo
@@ -179,6 +169,20 @@ desktop_apt_packages:
   - "mesa-vulkan-drivers:i386"
 desktop_apt_packages_extra: []
 
+desktop_apt_packages_remove:
+  - cava                                # Audio visualizer thing
+  - tmux-xpanes                         # Used for administration and work stuff
+  - tree                                # Useful basic utility
+  - vagrant                             # Very handy for development
+  - vagrant-libvirt
+  - barrier                             # FOSS variant of Synergy
+  - bitcoin-qt                          # Bitcoin stuffs
+  - g810-led                            # Controls lights on Logitech peripherals
+  - mono-complete                       # Initialization may take an eternity
+  - monodevelop                         # For Terraria modding, don't hate me
+  - monodoc-browser                     # Tries to get installed when Mono is removed
+desktop_apt_packages_remove_extra: []
+
 desktop_apt_debs:
   - "https://dl.discordapp.net/apps/linux/0.0.15/discord-0.0.15.deb" # Discord
   - "https://github.com/MultiMC/MultiMC5/releases/download/0.6.8/multimc_1.4-1.deb" # MultiMC
diff --git a/roles/desktop/tasks/packages.yml b/roles/desktop/tasks/packages.yml
index fd70d49..694ced4 100644
--- a/roles/desktop/tasks/packages.yml
+++ b/roles/desktop/tasks/packages.yml
@@ -21,6 +21,8 @@
       # Manage packages
     - name: configure installed packages
       apt: name="{{ desktop_apt_packages + desktop_apt_packages_extra }}"
+    - name: configure removed packages
+      apt: name="{{ desktop_apt_packages_remove + desktop_apt_packages_remove_extra }}" state=absent
     - name: configure out-of-repo packages
       apt: deb="{{ item }}"
       loop: "{{ desktop_apt_debs + desktop_apt_debs_extra }}"