From 38f1c865efb9fc6d8d7fb0a9b3b2bc60a8f5b141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Mon, 29 Jul 2019 07:51:10 +0200
Subject: [PATCH] [profiles] use fpakman for snap and flatpak

---
 manjaro/gnome/Packages-Desktop |  8 +++++---
 manjaro/kde/Packages-Desktop   | 14 ++++++++------
 manjaro/xfce/Packages-Desktop  | 10 ++++++----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 9cd06e8..ef9fb97 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/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
diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index 3c0cde1..16403c2 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/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
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index a1acbef..f1d8117 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/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,7 +212,7 @@ htop
 qpdfview
 inxi
 #>extra libreoffice-still
-#microsoft-office-online-jak
+microsoft-office-online-jak
 >extra freeoffice
 manjaro-hello
 manjaro-application-utility