Merge remote-tracking branch 'upstream/master'

community/cinnamon/Packages-Desktop

@@ -1,6 +1,7 @@
 adapta-maia-theme
 alsa-firmware
 alsa-utils
+apparmor
 autoconf
 automake
 avahi
@@ -17,7 +18,10 @@ dmidecode
 fakeroot
 >extra ffmpegthumbnailer
 >extra firefox
+flatpak
 flex
+fpakman
+>extra freeoffice
 >extra galculator
 >extra gcc
 >extra >multilib gcc-libs-multilib
@@ -56,7 +60,6 @@ inxi
 libtool
 >extra libdvdcss
 >extra libgsf
->extra libreoffice-fresh
 lightdm-settings
 lightdm-slick-greeter
 m4
@@ -115,6 +118,7 @@ python2-ptyprocess
 python-ptyprocess
 qt5-styleplugins
 screenfetch
+snapd
 >extra subversion
 >extra system-config-printer
 >extra terminus-font
@@ -129,7 +133,6 @@ ttf-bitstream-vera
 >extra ttf-liberation
 >extra udiskie
 vi
->extra vlc
 >extra xcursor-chameleon-pearl-deepin
 xdg-su
 xdg-user-dirs-gtk
@@ -143,6 +146,7 @@ xf86-input-mouse
 xf86-input-void
 xorg-twm
 xorg-xinit
+>extra xplayer
 >extra xreader
 >extra xviewer-plugins
 xdg-user-dirs
@@ -150,4 +154,5 @@ xorg-server
 xorg-xhost
 xorg-xkill
 >extra yay
+yelp
 zensu

community/cinnamon/profile.conf

@@ -31,9 +31,16 @@ nonfree_mhwd="true"
 
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
 disable_systemd=('pacman-init')
 
+# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
+strict_snaps="snapd core18 snap-store core gnome-3-28-1804 gtk-common-themes"
+# add classic snaps: classic_snaps="code"
+# classic_snaps=""
+# choose the snap channel. Possible options are: stable, candidate, beta, edge
+# snap_channel="stable"
+
 # unset defaults to given values
 # addgroups="lp,network,power,wheel"
 

manjaro/gnome/Packages-Desktop

@@ -101,9 +101,11 @@ networkmanager-vpnc
 nss-mdns
 numlockx
 openresolv
-gnome-software-snap
-pamac
+#gnome-software-snap
 flatpak
+fpakman
+pamac
+snapd
 polkit-gnome
 powertop
 pulseaudio-bluetooth
@@ -147,7 +149,7 @@ xorg-xinit
 >extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
 yelp
 
-#ms-office-online
+ms-office-online
 freeoffice
 
 #extra depends for file-roller

manjaro/kde/Packages-Desktop

@@ -91,16 +91,18 @@ terminus-font
 >extra steam-manjaro
 
 ## Package management
-appimagelauncher
-pamac-cli
-packagekit-qt5
+#appimagelauncher
+pamac
+#pamac-cli
 apparmor
 snapd
-discover-snap
+#discover-snap
 #discover
-#flatpak
+#packagekit-qt5
+flatpak
+fpakman
 fwupd 
-octopi
+#octopi
 #octopi-cachecleaner
 #octopi-repoeditor
 #octopi-notifier-frameworks

manjaro/xfce/Packages-Desktop

@@ -82,10 +82,12 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 >extra steam-manjaro
 
 ## Package management
-gnome-software-snap
-pamac
-flatpak
 apparmor
+#gnome-software-snap
+flatpak
+fpakman
+pamac
+snapd
 
 ## Java
 >extra jdk8-openjdk
@@ -210,8 +212,8 @@ htop
 qpdfview
 inxi
 #>extra libreoffice-still
-#ms-office-online
-freeoffice
+microsoft-office-online-jak
+>extra freeoffice
 manjaro-hello
 manjaro-application-utility
 manjaro-settings-manager
@@ -278,5 +280,9 @@ xdg-su
 gtkhash-thunar
 manjaro-hotfixes
 
-## Workarounds
-boost-libs # needed to fix systemd-journal on live-boot
+## Handshake tools
+#faucet-tool
+#hnsd-git
+#hsd-git
+#veracrypt
+#cryptoseed

shared/Packages-Mhwd

@@ -16,15 +16,15 @@ mesa-vdpau
 >multilib lib32-mesa-vdpau
 >multilib lib32-libxvmc
 >multilib lib32-primus
->nonfree_default catalyst-utils
->nonfree_default KERNEL-catalyst
+#>nonfree_default catalyst-utils
+#>nonfree_default KERNEL-catalyst
 >nonfree_default KERNEL-nvidia
 >nonfree_default KERNEL-nvidia-340xx
 >nonfree_default KERNEL-nvidia-390xx
 >nonfree_default nvidia-340xx-utils
 >nonfree_default nvidia-390xx-utils
 >nonfree_default nvidia-utils
->nonfree_multilib lib32-catalyst-utils
+#>nonfree_multilib lib32-catalyst-utils
 >nonfree_multilib lib32-nvidia-utils
 >nonfree_multilib lib32-nvidia-340xx-utils
 >nonfree_multilib lib32-nvidia-390xx-utils