From 3634c4cbd23f1ca2f42a40aab3e9bd3c17be8784 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Thu, 15 Apr 2021 11:07:16 +0200
Subject: [PATCH] add fixes

---
 config               |  4 ++++
 modules/60-de/config | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 config

diff --git a/config b/config
new file mode 100644
index 0000000..a77ed4b
--- /dev/null
+++ b/config
@@ -0,0 +1,4 @@
+gnome_apps="seahorse seahorse-nautilus evince"
+kde5_apps="kde5-baseapps kdegraphics-thumbnailers ffmpegthumbs ark gwenview kmail okular spectacle kalarm kcalc print-manager plasma-browser-integration kwalletmanager"
+i3wm_apps="claws-mail galculator-gtk3"
+
diff --git a/modules/60-de/config b/modules/60-de/config
index 43f7cc8..e29cdfb 100644
--- a/modules/60-de/config
+++ b/modules/60-de/config
@@ -9,16 +9,18 @@ fi
 
 if [[ "${cfg[de]}" == "gnome" ]]; then
 	setconf add "dm" "gdm"
-	addpkg "${cfg[dm]}" "gnome" "seahorse" "seahorse-nautilus" "evince"
+	addpkg "${cfg[dm]}" "gnome" "${gnome_apps}"
 elif [[ "${cfg[de]}" == "kde5" ]]; then
 	setconf add "dm" "sddm"
-	addpkg "${cfg[dm]}" kde5 kde5-baseapps kdegraphics-thumbnailers ffmpegthumbs ark gwenview kmail okular spectacle kalarm kcalc print-manager plasma-browser-integration kwalletmanager
+	addpkg "${cfg[dm]}" "kde5" "${kde5_apps}"
 elif [[ "${cfg[de]}" == "i3wm" ]]; then
 	setconf add "dm" "lightdm"
-	addpkg lightdm lightdm-gtk3-greeter i3-gaps i3lock-color i3status xfce4-terminal dmenu rofi pcmanfm dunst elogind gvfs gvfs-afc gvfs-afp gvfs-cdda paprefs pavucontrol gvfs-gphoto2 gvfs-mtp gvfs-smb xss-lock claws-mail galculator-gtk3
+	addpkg "lightdm" "lightdm-gtk3-greeter" "i3-gaps" "i3lock-color" "i3status" "xfce4-terminal" "dmenu" "rofi" "pcmanfm" "dunst" "elogind" "gvfs" "gvfs-afc" "gvfs-afp" "gvfs-cdda" "paprefs" "pavucontrol" "gvfs-gphoto2" "gvfs-mtp" "gvfs-smb" "xss-lock" "${i3wm_apps}"
 fi
 
-
+gnome_apps="seahorse seahorse-nautilus evince"
+kde5_apps="kde5-baseapps kdegraphics-thumbnailers ffmpegthumbs ark gwenview kmail okular spectacle kalarm kcalc print-manager plasma-browser-integration kwalletmanager"
+i3wm_apps="claws-mail galculator-gtk3"
 
 if [[ ! "${cfg[de]}" == "none" ]]; then
 	servicesenable "${cfg[dm]}" "dbus"