From db9812bb92f3b95077c885c9606cfa8a2b5aede0 Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Sat, 9 Oct 2021 14:13:48 -0500
Subject: [PATCH] Disk Maintenance Day Changes (#14)

* Remove Thunderbird and Audacity. Don't add Geary to new installs but don't remove it in case it comes with the distro.

* Remove Thunderbird from Favorites.

* Add more systems to Dev branch.

* Add sudo so older distros don't ask for password on every app update.

* Alias for sync to help save some time typing.

* Post less often to hopefully allow keeping up a year of data in less than 16GB.
---
 facts/general/package.yml                     | 2 +-
 hosts                                         | 2 ++
 tasks/general/acct_mgmt/users.yml             | 2 ++
 tasks/general/software/telegraf.yml           | 8 ++++----
 tasks/workstation/linux/software/flatpaks.yml | 6 ++----
 tasks/workstation/settings/gnome.yml          | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/facts/general/package.yml b/facts/general/package.yml
index b1e0f8c..6516d48 100644
--- a/facts/general/package.yml
+++ b/facts/general/package.yml
@@ -88,7 +88,7 @@
   set_fact:
     update_flatpak: |
       echo "*** Flatpak ***" && 
-      flatpak update {{ update_accept_var }} &&
+      sudo flatpak update {{ update_accept_var }} &&
   when: flatpak_exec is defined and flatpak_exec.failed is defined and not flatpak_exec.failed
   
 - name: General | Facts | Package | Update Commands | flatpak | not exists
diff --git a/hosts b/hosts
index 66c6d2f..86676be 100644
--- a/hosts
+++ b/hosts
@@ -6,6 +6,8 @@
 ;
 localhost
 dell-laptop branch=dev
+airbook branch=dev
+x570 branch=dev
 
 [workstation]
 ;;;;;;; Available options - all require lowercase values ;;;;;;
diff --git a/tasks/general/acct_mgmt/users.yml b/tasks/general/acct_mgmt/users.yml
index 6c48dcd..9924fa8 100644
--- a/tasks/general/acct_mgmt/users.yml
+++ b/tasks/general/acct_mgmt/users.yml
@@ -143,6 +143,7 @@
         echo "ERROR: $PROG experienced a problem and has aborted."
         return 1
       }
+    sync: alias sync='date && echo "Syncing!" && sync && date'
 
 - name: General | Account Management | Users | Files | Common Variable
   set_fact:
@@ -157,6 +158,7 @@
       {{ PS1 }}
       {{ remount }}
       {{ update }}
+      {{ sync }}
 
 - name: General | Account Management | Users | Files | .bashrc
   blockinfile:
diff --git a/tasks/general/software/telegraf.yml b/tasks/general/software/telegraf.yml
index 329f584..3a78519 100644
--- a/tasks/general/software/telegraf.yml
+++ b/tasks/general/software/telegraf.yml
@@ -85,12 +85,12 @@
         # user = "$USER"
       
       [agent]
-        interval = "10s"
+        interval = "30s"
         metric_batch_size = 1000
         metric_buffer_limit = 10000
-        collection_jitter = "0s"
-        flush_interval = "10s"
-        flush_jitter = "0s"
+        collection_jitter = "3s"
+        flush_interval = "30s"
+        flush_jitter = "7s"
         precision = ""
         # debug = false
         # quiet = false
diff --git a/tasks/workstation/linux/software/flatpaks.yml b/tasks/workstation/linux/software/flatpaks.yml
index 675d2ea..eb78b57 100644
--- a/tasks/workstation/linux/software/flatpaks.yml
+++ b/tasks/workstation/linux/software/flatpaks.yml
@@ -24,8 +24,6 @@
     remote: flathub
     state: present
   loop:
-    - org.mozilla.Thunderbird
-    - org.gnome.Geary
     - org.libreoffice.LibreOffice
     - com.discordapp.Discord
     - org.telegram.desktop
@@ -69,7 +67,6 @@
     - org.shotcut.Shotcut
     - com.obsproject.Studio
     - org.gimp.GIMP
-#    - org.audacityteam.Audacity
   ignore_errors: yes
   when: editing is defined
 
@@ -82,7 +79,6 @@
     - org.shotcut.Shotcut
     - com.obsproject.Studio
     - org.gimp.GIMP
-    - org.audacityteam.Audacity
   ignore_errors: yes
   when: editing is not defined
 
@@ -120,6 +116,8 @@
     - org.midori_browser.Midori
     - com.github.Eloston.UngoogledChromium
     - org.gnome.Evolution # Doesn't pick up GNOME theme since contained.
+    - org.mozilla.Thunderbird # Doesn't integrate with Nextcloud as well as Evolution.
+    - org.audacityteam.Audacity # Say "no thanks" to spyware.
   ignore_errors: yes
 
 
diff --git a/tasks/workstation/settings/gnome.yml b/tasks/workstation/settings/gnome.yml
index 6aae803..0ca1de3 100644
--- a/tasks/workstation/settings/gnome.yml
+++ b/tasks/workstation/settings/gnome.yml
@@ -153,7 +153,7 @@
   dconf: 
     key: /org/gnome/shell/favorite-apps
     value: "['org.gnome.Terminal.desktop', 'gnome-system-monitor.desktop', 'org.gnome.Nautilus.desktop', 
-             '{{ browser }}', 'org.gnome.Evolution.desktop', 'org.mozilla.Thunderbird.desktop',
+             '{{ browser }}', 'org.gnome.Evolution.desktop', 
              'com.vscodium.codium.desktop', 'org.shotcut.Shotcut.desktop', 
              'org.telegram.desktop.desktop', 'com.discordapp.Discord.desktop', 
              'rhythmbox.desktop', 'io.lbry.lbry-app.desktop',