Merge branch 'master' of https://gitlab.manjaro.org/profiles-and-settings/iso-profiles

community/budgie/Packages-Desktop

@@ -39,8 +39,6 @@ gnome-screenshot
 grilo-plugins
 gucharmap
 mousetweaks
-nautilus
-nautilus-empty-file
 file-roller
 sushi
 vino
@@ -74,7 +72,6 @@ manjaro-pulse
 manjaro-settings-manager-notifier
 manjaro-hello
 manjaro-application-utility
->extra bauh
 >extra snapd
 mesa-demos
 mobile-broadband-provider-info
@@ -141,7 +138,7 @@ yelp
 #>extra libreoffice-fresh
 >extra thunderbird
 >extra lollypop
->extra empathy
+>extra pidgin
 >extra uget
 >extra transmission-gtk
 >extra brasero
@@ -155,7 +152,7 @@ timeshift
 >extra manjaro-printer
 >extra blueman
 >extra ffmpegthumbnailer
-#AUR complete support ( base devel + yaourt )
+#AUR complete support ( base devel )
 #>extra autoconf
 #>extra automake
 #>extra binutils
@@ -170,5 +167,4 @@ timeshift
 #>extra make
 #>extra patch
 #>extra subversion
-#>extra yaourt
 manjaro-aur-support

manjaro/kde-dev/Packages-Desktop

@@ -307,7 +307,7 @@ xorg-xkill
 ## Desktop Utils
 perl-file-mimeinfo
 xdg-utils
-xdg-su
+zensu
 
 ## Misc
 manjaro-hotfixes

manjaro/kde/Packages-Desktop

@@ -303,7 +303,7 @@ xorg-xkill
 ## Desktop Utils
 perl-file-mimeinfo
 xdg-utils
-xdg-su
+zensu
 >extra timeshift
 >extra kernel-alive
 

shared/Packages-Live

@@ -7,3 +7,5 @@ manjaro-live-systemd
 mkinitcpio-nfs-utils
 nbd
 clonezilla
+KERNEL-zfs
+zfs-utils

shared/Packages-Mhwd

@@ -1,14 +1,15 @@
+## The following is only temp until we find a better solution
+>office libreoffice-still
+>office freeoffice
+
 ## Normal MHWD package list
 
 KERNEL-bbswitch
 KERNEL-broadcom-wl
 #KERNEL-r8168
-KERNEL-zfs
-zfs-utils
 #KERNEL-rt3562sta
 KERNEL-virtualbox-guest-modules
 KERNEL-headers
-zfs-dkms
 libva-intel-driver
 libva-mesa-driver
 libva-vdpau-driver