From cf1232f8893d94c540a3da115de927e3f477cd22 Mon Sep 17 00:00:00 2001
From: Bernhard Landauer <oberon@manjaro.org>
Date: Fri, 9 Aug 2019 00:00:54 +0200
Subject: [PATCH] [cinnamon, deepin, i3] 18.1.0-rc7

---
 community/cinnamon/Packages-Desktop |  6 +++---
 community/cinnamon/Packages-Live    |  2 +-
 community/cinnamon/profile.conf     |  4 +++-
 community/deepin/Packages-Desktop   |  1 -
 community/deepin/Packages-Live      |  2 +-
 community/i3/Packages-Desktop       |  2 ++
 community/i3/profile.conf           | 13 +++++++++++--
 7 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop
index 8e190b8..e2707ae 100644
--- a/community/cinnamon/Packages-Desktop
+++ b/community/cinnamon/Packages-Desktop
@@ -1,7 +1,7 @@
 adapta-maia-theme
 alsa-firmware
 alsa-utils
-apparmor
+>extra apparmor
 autoconf
 automake
 avahi
@@ -21,7 +21,7 @@ fakeroot
 flatpak
 flex
 fpakman
->extra freeoffice
+#>extra freeoffice
 >extra galculator
 >extra gcc
 >extra >multilib gcc-libs-multilib
@@ -118,7 +118,7 @@ python2-ptyprocess
 python-ptyprocess
 qt5-styleplugins
 screenfetch
-snapd
+>extra snapd
 >extra subversion
 >extra system-config-printer
 >extra terminus-font
diff --git a/community/cinnamon/Packages-Live b/community/cinnamon/Packages-Live
index 416c6b4..c7fa6cc 100644
--- a/community/cinnamon/Packages-Live
+++ b/community/cinnamon/Packages-Live
@@ -1,4 +1,4 @@
-calamares
+calamares-git
 cinnamon-live
 clonezilla
 grub-theme-live-manjaro
diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf
index f2d3171..39eafc9 100644
--- a/community/cinnamon/profile.conf
+++ b/community/cinnamon/profile.conf
@@ -35,7 +35,9 @@ enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManag
 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"
+
+#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
diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop
index 92febcc..22f65b0 100644
--- a/community/deepin/Packages-Desktop
+++ b/community/deepin/Packages-Desktop
@@ -61,7 +61,6 @@ inxi
 >multilib lib32-flex
 >extra libdvdcss
 >extra libimobiledevice
->extra libreoffice-fresh
 libtool
 KERNEL-headers # needed for deepin-anything and its vfs_monitor dkms-module...
 m4
diff --git a/community/deepin/Packages-Live b/community/deepin/Packages-Live
index 1cba988..8311b7b 100644
--- a/community/deepin/Packages-Live
+++ b/community/deepin/Packages-Live
@@ -1,4 +1,4 @@
-calamares
+calamares-git
 deepin-live
 grub-theme-live-manjaro
 gsmartcontrol
diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop
index 13d5812..3054a57 100644
--- a/community/i3/Packages-Desktop
+++ b/community/i3/Packages-Desktop
@@ -2,6 +2,7 @@ accountsservice
 alsa-firmware
 alsa-plugins
 alsa-utils
+>extra apparmor
 arandr
 >basic i3-default-artwork
 >extra artwork-i3
@@ -118,6 +119,7 @@ qt5-styleplugins
 ranger
 sbxkb
 screenfetch
+>extra snapd
 speedtest-cli
 >extra subversion
 syslog-ng
diff --git a/community/i3/profile.conf b/community/i3/profile.conf
index f5a31ca..94dcb0e 100644
--- a/community/i3/profile.conf
+++ b/community/i3/profile.conf
@@ -15,7 +15,7 @@ displaymanager="lightdm"
 # autologin="true"
 
 # nonfree xorg drivers
-# nonfree_mhwd="true"
+nonfree_mhwd="true"
 
 # possible values: grub;systemd-boot
 # efi_boot_loader="grub"
@@ -31,9 +31,18 @@ displaymanager="lightdm"
 
 # 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"