Merge remote-tracking branch 'upstream/master'

community/cinnamon/Packages-Desktop

@@ -53,7 +53,6 @@ icon-naming-utils
 inxi
 >extra jre8-openjdk
 >extra jre8-openjdk-headless
-kvantum-manjaro
 >multilib lib32-flex
 libtool
 >extra libdvdcss
@@ -75,7 +74,6 @@ manjaro-pulse
 manjaro-settings-manager-notifier
 >extra mesa-demos
 >basic midori
->extra mint-themes
 >extra mobile-broadband-provider-info
 >extra modemmanager
 >extra mousetweaks
@@ -116,7 +114,6 @@ pulseaudio-zeroconf
 >extra pygtk # needed for deluge
 python2-ptyprocess
 python-ptyprocess
-qt5ct
 qt5-styleplugins
 screenfetch
 >extra subversion
@@ -132,7 +129,6 @@ ttf-bitstream-vera
 >extra ttf-indic-otf
 >extra ttf-liberation
 >extra udiskie
->extra vertex-maia-themes
 vi
 >extra vlc
 >extra xcursor-chameleon-pearl-deepin

community/cinnamon/live-overlay/root/.config/Kvantum/kvantum.kvconfig

@@ -1,2 +1,2 @@
 [General]
-theme=KvAdaptaMaia
+theme=KvAdapta

manjaro/kde-dev/Packages-Desktop

@@ -91,7 +91,7 @@ terminus-font
 
 ## Package management
 appimagelauncher
-#packagekit-qt5
+packagekit-qt5
 discover-git
 flatpak
 #fwupd 

manjaro/kde-vanilla/Packages-Desktop

@@ -86,18 +86,17 @@ terminus-font
 >extra ttf-liberation
 >extra ttf-droid
 
+## Games
+#>extra steam-manjaro
+
 ## Package management
 #appimagelauncher
-#packagekit-qt5
+packagekit-qt5
 discover-git
-#flatpak
+flatpak
-#fwupd 
+xdg-desktop-portal
-octopi
+xdg-desktop-portal-kde
-octopi-cachecleaner
+fwupd
-octopi-repoeditor
-#octopi-notifier-frameworks
-pamac-qt
-#manjaro-application-utility
 
 ## Printing
 #>extra cups
@@ -153,6 +152,7 @@ user-manager-git
 ## Themes QT/GTK/SDDM
 breeze-git
 breeze-gtk-git
+breeze-icons-git
 gnome-icon-theme
 gnome-themes-standard
 #gtk-theme-breath
@@ -249,8 +249,8 @@ htop
 #imagewriter
 inxi
 #>extra krita
-#>extra firefox
+>extra firefox
-falkon
+>basic falkon
 #ms-office-online
 #>extra libreoffice-fresh
 >extra calligra
@@ -313,8 +313,3 @@ xdg-su
 
 ## Misc
 manjaro-hotfixes
-
-## Flatpak support
-#>extra flatpak
-#>extra xdg-desktop-portal
-#>extra xdg-desktop-portal-kde

manjaro/kde-vanilla/usr

@@ -1 +0,0 @@
-../kde/desktop-overlay/usr/

manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf

@@ -4,7 +4,7 @@ font-name = Cantarell Bold 12
 xft-antialias = true
 icon-theme-name = Adapta-Papirus-Maia
 screensaver-timeout = 60
-theme-name = Adapta-Eta-Maia
+theme-name = Matcha-sea
 cursor-theme-name = xcursor-breeze
 show-clock = false
 default-user-image = #avatar-default

shared/Packages-Mhwd

@@ -1,8 +1,8 @@
 KERNEL-bbswitch
 KERNEL-broadcom-wl
-KERNEL-r8168
+#KERNEL-r8168
-KERNEL-zfs
+#KERNEL-zfs
-zfs-utils
+#zfs-utils
 #KERNEL-rt3562sta
 KERNEL-virtualbox-guest-modules
 libva-intel-driver