From f0662bfe4301354ccb12bedc3948a44e2146257a Mon Sep 17 00:00:00 2001
From: Nico Jensch <njcrypted@protonmail.com>
Date: Sat, 14 Nov 2020 11:32:15 +0100
Subject: [PATCH] Add some more app choices

---
 usr/bin/setup-assistant                | 18 ++++++++++++++++++
 usr/lib/setup-assistant/internet.txt   |  8 +++++++-
 usr/lib/setup-assistant/multimedia.txt |  2 ++
 usr/lib/setup-assistant/office.txt     |  2 ++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/usr/bin/setup-assistant b/usr/bin/setup-assistant
index bca4e4d..ecb9e55 100755
--- a/usr/bin/setup-assistant
+++ b/usr/bin/setup-assistant
@@ -147,6 +147,9 @@ function upgrade2ultimate
     if grep -R "Abiword" /tmp/setup-assistant/office.txt; then
         echo "abiword" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Joplin" /tmp/setup-assistant/office.txt; then
+        echo "joplin" >> /tmp/setup-assistant/pkgs.txt
+    fi
 
     yad \
         --image='firefox' \
@@ -220,9 +223,21 @@ function upgrade2ultimate
     if grep -R "Jdownloader2" /tmp/setup-assistant/internet.txt; then
         echo "jdownloader2" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Deluge" /tmp/setup-assistant/internet.txt; then
+        echo "deluge-gtk" >> /tmp/setup-assistant/pkgs.txt
+    fi
+    if grep -R "Cockpit" /tmp/setup-assistant/internet.txt; then
+        echo "cockpit
+        cockpit-dashboard
+        cockpit-machines" >> /tmp/setup-assistant/pkgs.txt
+        echo "sudo systemctl enable --now cockpit.socket" >> /tmp/setup-assistant/setup_root.sh
+    fi
     if grep -R "Twitch GUI" /tmp/setup-assistant/internet.txt; then
         echo "streamlink-twitch-gui" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Remmina" /tmp/setup-assistant/internet.txt; then
+        echo "remmina" >> /tmp/setup-assistant/pkgs.txt
+    fi
 
 
     yad \
@@ -507,6 +522,9 @@ function upgrade2ultimate
     if grep -R "Qwinff" /tmp/setup-assistant/multimedia.txt; then
         echo "qwinff" >> /tmp/setup-assistant/pkgs.txt
     fi
+    if grep -R "Variety" /tmp/setup-assistant/multimedia.txt; then
+        echo "variety" >> /tmp/setup-assistant/pkgs.txt
+    fi
 
 
     yad \
diff --git a/usr/lib/setup-assistant/internet.txt b/usr/lib/setup-assistant/internet.txt
index 412aeff..bc5cb05 100644
--- a/usr/lib/setup-assistant/internet.txt
+++ b/usr/lib/setup-assistant/internet.txt
@@ -7,15 +7,21 @@ Xtreme Download Manager
 true
 Firefox XDM extension (download manager)
 false
+Cockpit (Access some system settings at localhost:9090)
+false
 Syncthing-GTK (sync files between devices)
 false
+Remmina (Remote access client)
+false
 Filezilla (FTP client)
 false
 Putty (SSH/Telnet client)
 false
 Nitroshare (Network file sharing via LAN)
 false
-Jdownloader2
+Jdownloader2 (Advanced download manager)
+false
+Deluge (GTK torrent client)
 false
 Twitch GUI
 false
diff --git a/usr/lib/setup-assistant/multimedia.txt b/usr/lib/setup-assistant/multimedia.txt
index f363540..d386328 100644
--- a/usr/lib/setup-assistant/multimedia.txt
+++ b/usr/lib/setup-assistant/multimedia.txt
@@ -24,3 +24,5 @@ false
 Converseen (Image converter)
 false
 Handbrake (Video format transcoder)
+false
+Variety (Wallpaper changer)
\ No newline at end of file
diff --git a/usr/lib/setup-assistant/office.txt b/usr/lib/setup-assistant/office.txt
index 48e7f57..93f1616 100644
--- a/usr/lib/setup-assistant/office.txt
+++ b/usr/lib/setup-assistant/office.txt
@@ -17,4 +17,6 @@ Calligra Suite
 false
 Abiword	(Simple wordprocessor, recommended for simple writing)
 false
+Joplin (Is able to sync notes to Garuda cloud)
+false
 No office suite