From 9c16ecd2c16428bc089ef9b3fea05da7985de523 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 12 May 2021 17:25:22 +0200
Subject: [PATCH] fixes

---
 config                  | 4 ++--
 profiles/desktop        | 8 +++++++-
 profiles/desktops/gnome | 7 -------
 profiles/desktops/i3wm  | 7 -------
 profiles/desktops/kde5  | 8 --------
 step1/50-system         | 5 ++---
 6 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/config b/config
index 1de7c20..2526449 100644
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 lastminute() {
-	#addpkg mpv mpv-mpris
+	#addpkg vlc
 	servicesenable sshd
 	#servicesdisable sshd
 	#ignorepkg openssh
-	#removepkg vlc
+	#removepkg mpv
 }
diff --git a/profiles/desktop b/profiles/desktop
index 859ae1a..845108a 100644
--- a/profiles/desktop
+++ b/profiles/desktop
@@ -1,8 +1,14 @@
+browser="firefox-i18n-de"
+networkmanager="NetworkManager"
+messenger="gajim-omemo"
+office="libreoffice-i18n-de"
+media="mpv"
+
 spelling="aspell-de gspell"
 alsa="alsa-utils alsa-plugins-pulseaudio pulseaudio"
 xorg="xorg-minimal xorg-fonts mesa-dri vulkan-loader xorg-apps"
 
-pkgs="$spelling $alsa $xorg"
+
 ignorepkgs="font-adobe-75dpi font-adobe-100dpi"
 servicedisable="acpid"
 serviceenable="dbus alsa"
diff --git a/profiles/desktops/gnome b/profiles/desktops/gnome
index 7af24e5..bbc61a3 100644
--- a/profiles/desktops/gnome
+++ b/profiles/desktops/gnome
@@ -1,5 +1,4 @@
 email=thunderbird-i18n-de
-messenger=gajim-omemo
 terminal=gnome-terminal
 imageviewer=eog
 pdf=evince
@@ -10,16 +9,10 @@ calc=gnome-calculator
 pinentry=pinentry-gnome
 keyring=gnome-keyring
 gpg=seahorse
-browser=firefox-i18n-de
-video=vlc
-music=vlc
 policykit=polkit-gnome
 sshaskpass=gnome-ssh-askpass
-office=libreoffice-i18n-de
 dm=gdm
 de=gnome
-networkmanager=NetworkManager
 
 misc=""
 
-pkgs="$email $messenger $terminal $imageviewer $pdf $filemanager $archiver $screenshot $calc $pinentry $keyring $gpg $sshaskpass $browser $video $music $office $dm $de $networkmanager $misc"
diff --git a/profiles/desktops/i3wm b/profiles/desktops/i3wm
index fed934c..514bec4 100644
--- a/profiles/desktops/i3wm
+++ b/profiles/desktops/i3wm
@@ -1,5 +1,4 @@
 email=claws-mail
-messenger=gajim-omemo
 terminal=xfce4-terminal
 imageviewer=viewnior
 pdf=mupdf
@@ -12,14 +11,8 @@ keyring=gnome-keyring
 gpg=gnome-keyring
 sshaskpass=gnome-ssh-askpass
 policykit=polkit-gnome
-browser=firefox-i18n-de
-video=mpv
-music=mpv
-office=libreoffice-i18n-de
 dm=lightdm
 de=i3-gaps
-networkmanager=NetworkManager
 
 misc="lightdm-gtk3-greeter i3lock-color i3status dmenu elogind dunst gvfs gvfs-afc gvfs-afp gvfs-cdda gvfs-gphoto2 gvfs-mtp gvfs-smb xss-lock paprefs pavucontrol network-manager-applet"
 
-pkgs="$email $messenger $terminal $imageviewer $pdf $filemanager $archiver $screenshot $calc $pinentry $keyring $gpg $sshaskpass $browser $video $music $office $dm $de $networkmanager $misc"
diff --git a/profiles/desktops/kde5 b/profiles/desktops/kde5
index 02300be..a0d3987 100644
--- a/profiles/desktops/kde5
+++ b/profiles/desktops/kde5
@@ -1,5 +1,4 @@
 email=kmail
-messenger=gajim-omemo
 terminal=konsole
 imageviewer=gwenview
 pdf=okular
@@ -10,16 +9,9 @@ calc=kcalc
 pinentry=pinentry-qt
 keyring=kwalletmanager
 gpg=kleopatra
-browser=firefox-i18n-de
-video=vlc
-music=vlc
 policykit=polkit-kde-agent
 sshaskpass=ksshaskpass
-office=libreoffice-i18n-de
 dm=sddm
 de=kde5
-networkmanager=NetworkManager
 
 misc="kdegraphics-thumbnailers ffmpegthumbs print-manager plasma-browser-integration"
-
-pkgs="$email $messenger $terminal $imageviewer $pdf $filemanager $archiver $screenshot $calc $pinentry $keyring $gpg $sshaskpass $browser $video $music $office $dm $de $networkmanager $misc"
diff --git a/step1/50-system b/step1/50-system
index 35f93ee..342f346 100644
--- a/step1/50-system
+++ b/step1/50-system
@@ -41,12 +41,11 @@ if [[ ! "${cfg[de]}" == "none" ]]; then
 	source "${dir}/profiles/desktop"
 	servicesenable "${serviceenable}"
 	servicesdisable "${servicedisable}"
-	addpkg "${pkgs}"
 	ignorepkg "${ignorepkgs}"
 
 	source "${dir}/profiles/desktops/${cfg[de]}"
-	addpkg "${pkgs}"
 	servicesenable "${dm}"
+	addpkg "${spelling}" "${alsa}" "${xorg}" "${browser}" "${mail}" "${messenger}" "${terminal}" "${imageviewer}" "${pdf}" "${filemanager}" "${archiver}" "${screenshot}" "${calc}" "${pinentry}" "${keyring}" "${gpg}" "${policykit}" "${sshaskpass}" "${office}" "${dm}" "${de}" "${networkmanager}" 
 fi
 
-servicesenable "$networkmanager"
+servicesenable "{$networkmanager}"