From d00e4787d79e94f8bdbffeeed8584c198276a095 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Fri, 4 May 2018 09:11:44 +0200
Subject: [PATCH 1/2] [hshared] add nvidia-390xx

---
 shared/Packages-Mhwd                                      | 5 ++++-
 .../usr/share/calamares/branding/manjaro/branding.desc    | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index de6c9a4..478ad2d 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -19,13 +19,16 @@ mesa-vdpau
 >nonfree_default KERNEL-nvidia
 >nonfree_default KERNEL-nvidia-304xx
 >nonfree_default KERNEL-nvidia-340xx
+>nonfree_default KERNEL-nvidia-390xx
 >nonfree_default nvidia-304xx-utils
 >nonfree_default nvidia-340xx-utils
+>nonfree_default nvidia-390xx-utils
 >nonfree_default nvidia-utils
 >nonfree_multilib lib32-catalyst-utils
+>nonfree_multilib lib32-nvidia-utils
 >nonfree_multilib lib32-nvidia-304xx-utils
 >nonfree_multilib lib32-nvidia-340xx-utils
->nonfree_multilib lib32-nvidia-utils
+>nonfree_multilib lib32-nvidia-390xx-utils
 opencl-mesa
 open-vm-tools
 pangox-compat
diff --git a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
index d5e30b5..5e29040 100644
--- a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
+++ b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
@@ -4,10 +4,10 @@ componentName:  manjaro
 strings:
     productName:         Manjaro Linux
     shortProductName:    Manjaro
-    version:             18.0-alpha-1
-    shortVersion:        18.0a1
-    versionedName:       Manjaro Linux 18.0-alpha-1 "Illyria"
-    shortVersionedName:  Manjaro 18.0a1
+    version:             18.0-alpha-3
+    shortVersion:        18.0a3
+    versionedName:       Manjaro Linux 18.0-alpha-3 "Illyria"
+    shortVersionedName:  Manjaro 18.0a3
     bootloaderEntryName: Manjaro
 
 images:

From b075df150b782ddfd36d084126ccd1e2dcc33a0e Mon Sep 17 00:00:00 2001
From: excalibur1234 <excalibur_1_2_3_4@hotmail.com>
Date: Sat, 5 May 2018 00:19:21 +0200
Subject: [PATCH 2/2] kde-minimal: do not explicitly install some base packages
 anymore

---
 community/kde-minimal/Packages-Desktop | 6 ++----
 community/kde-minimal/Packages-Root    | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/community/kde-minimal/Packages-Desktop b/community/kde-minimal/Packages-Desktop
index 6b6f51c..ea853d9 100644
--- a/community/kde-minimal/Packages-Desktop
+++ b/community/kde-minimal/Packages-Desktop
@@ -1,5 +1,5 @@
 
-## xorg
+## xorg - should be explicitly installed to prevent user from removing accidentally
 xorg-server
 
 ## display manager
@@ -11,8 +11,6 @@ plasma-desktop
 dolphin
 konsole
 >extra kwrite
-
-## plasma - extra packages
 >extra kde-servicemenus-rootactions
 >extra plasma-pa
 >extra kde-gtk-config
@@ -24,7 +22,7 @@ konsole
 # optional dependencies of ark:
 >extra p7zip
 >extra unarchiver
-# wifi setup for systemd-networkd (recommended reading: https://wiki.archlinux.org/index.php/Systemd-networkd#Wireless_adapter  and  https://wiki.archlinux.org/index.php/WPA_supplicant)
+# wifi setup for systemd-networkd (recommended reading: https://wiki.archlinux.org/index.php/Systemd-networkd#Wireless_adapter  and  https://wiki.archlinux.org/index.php/WPA_supplicant):
 #>extra wpa_supplicant_gui
 
 ## package manager
diff --git a/community/kde-minimal/Packages-Root b/community/kde-minimal/Packages-Root
index 446614f..8e9e1b1 100644
--- a/community/kde-minimal/Packages-Root
+++ b/community/kde-minimal/Packages-Root
@@ -3,15 +3,11 @@
 base
 
 ## manjaro base system
+KERNEL
 manjaro-system
 mhwd
 sudo
 
-## required packages
-systemd-sysvcompat
-licenses
-KERNEL
-
 ## boot loader
 grub
 os-prober