From 5ddaabbe5b00b62f992a89d4c32f88f5b1ffa436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Fri, 21 Jun 2019 09:33:09 +0200
Subject: [PATCH 01/18] [gnome] add snap support

---
 manjaro/gnome/Packages-Desktop | 2 +-
 manjaro/gnome/profile.conf     | 9 ++++++++-
 manjaro/xfce/profile.conf      | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 3d506d8..19fa4ed 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -100,6 +100,7 @@ networkmanager-vpnc
 nss-mdns
 numlockx
 openresolv
+snapd
 pamac
 flatpak
 polkit-gnome
@@ -128,7 +129,6 @@ ttf-inconsolata
 ttf-indic-otf
 ttf-liberation
 usb_modeswitch
-haveged
 vino
 xdg-su
 xdg-user-dirs
diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf
index 0085d41..8b77752 100644
--- a/manjaro/gnome/profile.conf
+++ b/manjaro/gnome/profile.conf
@@ -34,7 +34,7 @@ displaymanager="gdm"
 
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged')
+enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged' 'ufw'  'apparmor' 'snapd.apparmor' 'snapd')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values,
@@ -45,6 +45,13 @@ disable_systemd=('pacman-init')
 # unset defaults to given values
 # addgroups="lp,network,power,wheel"
 
+# 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="candidate"
+
 # the same workgroup name if samba is used
 # smb_workgroup=""
 
diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf
index 40a4847..4c4def1 100644
--- a/manjaro/xfce/profile.conf
+++ b/manjaro/xfce/profile.conf
@@ -32,7 +32,7 @@ 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' 'apparmor' 'snapd.apparmor' 'snapd')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' '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"
@@ -40,7 +40,7 @@ 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"
+snap_channel="candidate"
 
 # the same workgroup name if samba is used
 # smb_workgroup=""

From 11392879d0a0cd635b8e95ab58a4607e952b81be Mon Sep 17 00:00:00 2001
From: Frank Kusters <frank@spaceage.nl>
Date: Sun, 23 Jun 2019 10:10:23 +0200
Subject: [PATCH 02/18] [awesome] Reorder packages to match Xfce order

Matching the order of the Xfce edition will make it easier to see if
anything needs to be added or removed. Same for profile.conf.
---
 community/awesome/Packages-Desktop | 196 +++++++++++++++--------------
 community/awesome/profile.conf     |  32 ++---
 2 files changed, 120 insertions(+), 108 deletions(-)

diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop
index 40f5f1a..8e3dd5f 100644
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@@ -1,21 +1,16 @@
-###################################
 ## Network
-###################################
 avahi
-network-manager-applet
 networkmanager
 networkmanager-openconnect
 networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
-nss-mdns
+nss-mdns # NSS support for mDNS (optdepend for avahi)
 modemmanager
-usb_modeswitch
 openresolv
+usb_modeswitch
 
-###################################
 ## Libraries for Sound/Audio/Video
-###################################
 alsa-firmware
 alsa-utils
 ffmpeg
@@ -26,12 +21,11 @@ gst-plugins-good
 gst-plugins-ugly
 libdvdcss
 manjaro-pulse
+>extra pulseaudio-bluetooth
 pulseaudio-ctl
 pulseaudio-zeroconf
 
-###################################
 ## Connect Packages
-###################################
 android-udev
 gvfs
 gvfs-afc
@@ -43,108 +37,126 @@ mtpfs
 udiskie
 udisks2
 
-###################################
-## Xorg
-###################################
+## AUR Support/Development
+# Missing base-devel packages
+>extra base-devel
+# Extra packages for AUR support
+>extra git
+>extra yay
+
+## Fonts
+
+## Games
+
+## Package management
+pamac
+appimagelauncher
+
+## Java
+
+## Printing
+>extra manjaro-printer
+
+## Optional dependencies for hplip
+
+## Display manager
+lightdm
+lightdm-slick-greeter
+accountsservice  # Enhanced user accounts handling
+
+## GTK3
+gtk3-classic
+
+## XFCE Group
+thunar-gtk3
+thunar-volman-gtk3
+tumbler
+xfce4-power-manager-gtk3
+xfce4-settings-gtk3
+lxterminal
+
+## XFCE Extras
+>extra blueman
+ffmpegthumbnailer  # tumbler - for video thumbnails
+gksu-polkit
+gnome-keyring      # fix wlan segfault
+libgsf             # tumbler - for ODF thumbnails
+libopenraw         # tumbler - for RAW thumbnails
+light-locker
+network-manager-applet
+thunar-archive-plugin-gtk3
+>extra thunar-shares-plugin-gtk3
+file-roller
+i3-scrot           # instead of xfce4-screenshooter?
+pavucontrol
+
+## Themes
+>extra manjaro-wallpapers-18.0
+grub-theme-manjaro
+kvantum-manjaro
+
+## Applications
+catfish
+galculator
+firefox
+>extra gimp
+>extra gufw
+>extra mpv     # instead of audacious
+htop
+zathura-pdf-poppler
+zathura-djvu
+inxi
+>extra libreoffice-fresh
+manjaro-settings-manager
+>extra manjaro-settings-manager-notifier
+mousepad
+>extra thunderbird
+ristretto          # instead of viewnior
+
+# Optional dependencies engrampa
+p7zip  # 7Z and ARJ archive support
+unace  # ACE archive support
+unrar  # RAR archive support
+
+## Documentation
+
+## Settings packages
+manjaro-browser-settings
+>extra manjaro-settings-samba
+manjaro-awesome-settings-18.0
+
+## Xorg Input Drivers
 xf86-input-elographics
 xf86-input-evdev
 xf86-input-keyboard
 xf86-input-libinput
 xf86-input-mouse
 xf86-input-void
+
+## Xorg Server and Graphics
+xdg-user-dirs
 xorg-server
 xorg-xinit
 xorg-xprop
 
-###################################
-## Misc
-###################################
->basic ufw
-gtk3-classic
-lightdm
-lightdm-slick-greeter
-libappindicator-gtk3
-accountsservice  # Enhanced user accounts
-python-dbus
-gnome-keyring
-grub-theme-manjaro
-light-locker
-mate-polkit
-gksu-polkit
+## Desktop Utils
 perl-file-mimeinfo
-pavucontrol
+xdg-utils
+xdg-su
+
+## Misc
+>basic ufw
+libappindicator-gtk3
+python-dbus
+mate-polkit
 pa-applet
 rofi
 xcape
-xdg-su
-xdg-user-dirs
-xdg-utils
-xfce4-settings-gtk3
-xfce4-power-manager-gtk3
 manjaro-zsh-config
-manjaro-browser-settings
 manjaro-hotfixes
-manjaro-settings-manager
-manjaro-awesome-settings-18.0
 qt5ct
-kvantum-manjaro
-
-###################################
-## Apps and Optional dependencies
-###################################
-appimagelauncher
 downgrade
-inxi
-i3-scrot
-htop
-lxterminal
-firefox
-galculator
-mousepad
-pamac
-ristretto
-thunar-gtk3
-thunar-volman-gtk3
-thunar-archive-plugin-gtk3
-catfish
-file-roller
-p7zip
-unrar
-unace
-tumbler
-ffmpegthumbnailer
-libgsf
-libopenraw
-zathura-pdf-poppler
-zathura-djvu
-
-###################################
-############## EXTRA ##############
-
-###################################
-## AUR Support
-## Missing base-devel packages
-###################################
->extra base-devel
->extra git
->extra yay
-
-###################################
-## Extra Misc and Apps
-###################################
 >extra bmenu
 >extra compton
 >extra compton-conf
->extra gimp
->extra gufw
->extra libreoffice-fresh
->extra mpv
->extra thunderbird
 >extra transmission-gtk
->extra manjaro-settings-samba
->extra thunar-shares-plugin-gtk3
->extra blueman
->extra pulseaudio-bluetooth
->extra manjaro-printer
->extra manjaro-settings-manager-notifier
->extra manjaro-wallpapers-18.0
\ No newline at end of file
diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf
index a6f8516..2cb3392 100644
--- a/community/awesome/profile.conf
+++ b/community/awesome/profile.conf
@@ -5,11 +5,6 @@
 # use multilib packages; x86_64 only
 # multilib="true"
 
-# use extra packages as defined in pkglist to activate a full profile
-extra="false"
-
-################ install ################
-
 # default displaymanager: none
 # supported; lightdm, sddm, gdm, lxdm, mdm
 displaymanager="lightdm"
@@ -17,20 +12,25 @@ displaymanager="lightdm"
 # Set to false to disable autologin in the livecd
 # autologin="true"
 
-# nonfree xorg drivers
+# nonfree mhwd drivers
 # nonfree_mhwd="true"
 
-# possible values: grub;systemd-boot
+# use extra packages as defined in pkglist to activate a full profile
+extra="false"
+
+################ install ################
+
+# unset defaults to given value
 # efi_boot_loader="grub"
 
 # configure calamares for netinstall
 # netinstall="false"
 
-# configure calamares to use chrootcfg instead of unpackfs; default: unpackfs
+# configure calamares to use chrootcfg instead of unpackfs
 # chrootcfg="false"
 
-# use geoip
-# geoip="true"
+# use geoip for localization
+# geoip='true'
 
 # default system shell is bash
 # use /etc/defaults/useradd by supplying a space " "
@@ -42,13 +42,10 @@ user_shell=/bin/zsh
 # enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
 disable_systemd=('pacman-init')
 
-# unset defaults to given values
-# addgroups="lp,network,power,wheel"
-
 # the same workgroup name if samba is used
-# smb_workgroup="Manjaro"
+# smb_workgroup=""
 
-################# live-session #################
+################# livecd #################
 
 # unset defaults to given value
 hostname="manjaro-awesome"
@@ -59,10 +56,13 @@ hostname="manjaro-awesome"
 # unset defaults to given value
 # password="manjaro"
 
-# the login shell for live image
+# the login shell
 # defaults to bash
 login_shell=/bin/zsh
 
+# unset defaults to given values
+# addgroups="lp,network,power,wheel"
+
 # unset defaults to given values
 # names must match systemd service names
 # services in enable_systemd array don't need to be listed here

From 6132aa543e64517a312d13b731e3af313b100c14 Mon Sep 17 00:00:00 2001
From: Frank Kusters <frank@spaceage.nl>
Date: Sun, 23 Jun 2019 16:43:39 +0200
Subject: [PATCH 03/18] [awesome] Explicitly add dependency packages

Even though not strictly necessary, this brings the Packages-Desktop
even more in line with the Xfce edition.
---
 community/awesome/Packages-Desktop | 46 ++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop
index 8e3dd5f..14afa6f 100644
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@@ -6,8 +6,11 @@ networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
 nss-mdns # NSS support for mDNS (optdepend for avahi)
+mobile-broadband-provider-info
 modemmanager
 openresolv
+openssh
+samba
 usb_modeswitch
 
 ## Libraries for Sound/Audio/Video
@@ -21,7 +24,7 @@ gst-plugins-good
 gst-plugins-ugly
 libdvdcss
 manjaro-pulse
->extra pulseaudio-bluetooth
+pulseaudio-bluetooth
 pulseaudio-ctl
 pulseaudio-zeroconf
 
@@ -40,11 +43,26 @@ udisks2
 ## AUR Support/Development
 # Missing base-devel packages
 >extra base-devel
+autoconf
+automake
+binutils
+bison
+fakeroot
+flex
+gcc
+libtool
+m4
+make
+patch
+pkg-config
 # Extra packages for AUR support
 >extra git
 >extra yay
 
 ## Fonts
+cantarell-fonts
+noto-fonts               # default font
+# >extra noto-fonts-emoji
 
 ## Games
 
@@ -56,8 +74,18 @@ appimagelauncher
 
 ## Printing
 >extra manjaro-printer
+>extra cups
+>extra cups-pdf
+>extra cups-pk-helper
+>extra ghostscript
+>extra gsfonts
+>extra hplip
+>extra splix
+>extra system-config-printer
 
 ## Optional dependencies for hplip
+>extra pyqt5-common # For hplip
+>extra python-pyqt5  # For hplip gui
 
 ## Display manager
 lightdm
@@ -68,22 +96,27 @@ accountsservice  # Enhanced user accounts handling
 gtk3-classic
 
 ## XFCE Group
+exo-gtk3
+garcon-gtk3
 thunar-gtk3
 thunar-volman-gtk3
 tumbler
 xfce4-power-manager-gtk3
 xfce4-settings-gtk3
 lxterminal
+xfconf-gtk3
 
 ## XFCE Extras
->extra blueman
+blueman
 ffmpegthumbnailer  # tumbler - for video thumbnails
+freetype2          # tumbler - for font thumbnails
 gksu-polkit
 gnome-keyring      # fix wlan segfault
 libgsf             # tumbler - for ODF thumbnails
 libopenraw         # tumbler - for RAW thumbnails
 light-locker
 network-manager-applet
+poppler-glib       # tumbler - for PDF thumbnails
 thunar-archive-plugin-gtk3
 >extra thunar-shares-plugin-gtk3
 file-roller
@@ -92,15 +125,18 @@ pavucontrol
 
 ## Themes
 >extra manjaro-wallpapers-18.0
+gnome-icon-theme
 grub-theme-manjaro
 kvantum-manjaro
 
 ## Applications
 catfish
-galculator
+dmidecode # optional dependency inxi
 firefox
+# >extra flashplugin
+galculator
 >extra gimp
->extra gufw
+gufw
 >extra mpv     # instead of audacious
 htop
 zathura-pdf-poppler
@@ -108,7 +144,7 @@ zathura-djvu
 inxi
 >extra libreoffice-fresh
 manjaro-settings-manager
->extra manjaro-settings-manager-notifier
+manjaro-settings-manager-notifier
 mousepad
 >extra thunderbird
 ristretto          # instead of viewnior

From ab2bf26aea14cf64f8ef87bfeeb28b8cc2410778 Mon Sep 17 00:00:00 2001
From: Frank Kusters <frank@spaceage.nl>
Date: Tue, 25 Jun 2019 22:15:50 +0200
Subject: [PATCH 04/18] [awesome] Expand with packages from Xfce release

The added packages are those that should not affect the rest of the
distro. All packages that do not make sense in an Awesome context have
not been added (such as all Xfce panel plugins).
---
 community/awesome/Packages-Desktop | 77 ++++++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 4 deletions(-)

diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop
index 14afa6f..4fe195e 100644
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@@ -6,6 +6,7 @@ networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
 nss-mdns # NSS support for mDNS (optdepend for avahi)
+ntp
 mobile-broadband-provider-info
 modemmanager
 openresolv
@@ -23,12 +24,14 @@ gst-plugins-base
 gst-plugins-good
 gst-plugins-ugly
 libdvdcss
+>multilib manjaro-alsa
 manjaro-pulse
 pulseaudio-bluetooth
 pulseaudio-ctl
 pulseaudio-zeroconf
 
 ## Connect Packages
+android-tools
 android-udev
 gvfs
 gvfs-afc
@@ -50,27 +53,46 @@ bison
 fakeroot
 flex
 gcc
+>multilib gcc-libs-multilib
+>multilib gcc-multilib
 libtool
 m4
 make
 patch
 pkg-config
+>multilib lib32-flex
 # Extra packages for AUR support
 >extra git
+>extra patchutils
+>extra subversion
 >extra yay
 
 ## Fonts
 cantarell-fonts
 noto-fonts               # default font
+noto-fonts-cjk           # asian fonts - needed big package, ~76 mb compressed
 # >extra noto-fonts-emoji
+terminus-font
+ttf-bitstream-vera       # xfce4-terminal default Monospace
+# ttf-dejavu             # Installed as gnome-themes-standard dependency
+>extra ttf-inconsolata
+>extra ttf-indic-otf
+>extra ttf-liberation
+>extra ttf-droid
 
 ## Games
+>extra steam-manjaro
 
 ## Package management
 pamac
+flatpak
+snapd
 appimagelauncher
 
 ## Java
+>extra jdk8-openjdk
+>extra jre8-openjdk-headless
+>extra jre8-openjdk
 
 ## Printing
 >extra manjaro-printer
@@ -79,13 +101,17 @@ appimagelauncher
 >extra cups-pk-helper
 >extra ghostscript
 >extra gsfonts
+>extra gtk3-print-backends
 >extra hplip
 >extra splix
 >extra system-config-printer
 
 ## Optional dependencies for hplip
 >extra pyqt5-common # For hplip
+>extra python-pillow # For hplip
+>extra python-pip # For hplip
 >extra python-pyqt5  # For hplip gui
+>extra python-reportlab # For hplip
 
 ## Display manager
 lightdm
@@ -94,6 +120,7 @@ accountsservice  # Enhanced user accounts handling
 
 ## GTK3
 gtk3-classic
+>multilib lib32-gtk3-classic
 
 ## XFCE Group
 exo-gtk3
@@ -116,38 +143,67 @@ libgsf             # tumbler - for ODF thumbnails
 libopenraw         # tumbler - for RAW thumbnails
 light-locker
 network-manager-applet
+menulibre
+orage
 poppler-glib       # tumbler - for PDF thumbnails
 thunar-archive-plugin-gtk3
 >extra thunar-shares-plugin-gtk3
 file-roller
+thunar-media-tags-plugin
 i3-scrot           # instead of xfce4-screenshooter?
+xfce4-taskmanager
 pavucontrol
 
 ## Themes
 >extra manjaro-wallpapers-18.0
+>extra wallpapers-2018
 gnome-icon-theme
+gnome-themes-standard
 grub-theme-manjaro
+matcha-gtk-theme
+xcursor-simpleandsoft
+xcursor-vanilla-dmz-aa
 kvantum-manjaro
 
 ## Applications
 catfish
 dmidecode # optional dependency inxi
+engrampa
 firefox
 # >extra flashplugin
 galculator
+gcolor2
 >extra gimp
+gparted
 gufw
->extra mpv     # instead of audacious
+>extra audacious
+>extra mpv
+>extra hexchat
 htop
 zathura-pdf-poppler
 zathura-djvu
 inxi
 >extra libreoffice-fresh
+ms-office-online
+manjaro-hello
+manjaro-application-utility
 manjaro-settings-manager
 manjaro-settings-manager-notifier
+>basic midori
+>extra mlocate
 mousepad
+mugshot
+>basic parole # media player
+>extra pidgin
+powertop
+screenfetch
+>extra poppler-data  # CKJ support for pdf
+>basic sylpheed # mail client
 >extra thunderbird
-ristretto          # instead of viewnior
+>extra vlc
+ristretto
+>extra xfburn
+>extra yelp
 
 # Optional dependencies engrampa
 p7zip  # 7Z and ARJ archive support
@@ -155,11 +211,12 @@ unace  # ACE archive support
 unrar  # RAR archive support
 
 ## Documentation
+manjaro-documentation-en
 
 ## Settings packages
+manjaro-awesome-settings-18.0
 manjaro-browser-settings
 >extra manjaro-settings-samba
-manjaro-awesome-settings-18.0
 
 ## Xorg Input Drivers
 xf86-input-elographics
@@ -170,10 +227,21 @@ xf86-input-mouse
 xf86-input-void
 
 ## Xorg Server and Graphics
+>multilib lib32-libva-intel-driver
+>multilib lib32-libva-mesa-driver
+>multilib lib32-libva-vdpau-driver
+libva-intel-driver
+libva-mesa-driver
+libva-vdpau-driver
+mesa-demos
+>multilib lib32-mesa-demos
+numlockx
 xdg-user-dirs
 xorg-server
+xorg-twm
 xorg-xinit
 xorg-xprop
+xorg-xkill
 
 ## Desktop Utils
 perl-file-mimeinfo
@@ -181,6 +249,8 @@ xdg-utils
 xdg-su
 
 ## Misc
+gtkhash-thunar
+manjaro-hotfixes
 >basic ufw
 libappindicator-gtk3
 python-dbus
@@ -189,7 +259,6 @@ pa-applet
 rofi
 xcape
 manjaro-zsh-config
-manjaro-hotfixes
 qt5ct
 downgrade
 >extra bmenu

From cc0ee7384b9bd1874d3959b494f81d9cc54340d7 Mon Sep 17 00:00:00 2001
From: Frank Kusters <frank@spaceage.nl>
Date: Tue, 25 Jun 2019 23:08:42 +0200
Subject: [PATCH 05/18] [awesome] Packages and services 'equal' to Xfce

Modify profile.conf and Packages-Desktop so that they are as equal as
possible to the Xfce release. Most important are ufw and snapd.
---
 community/awesome/Packages-Desktop | 20 ++++++++++----------
 community/awesome/profile.conf     | 11 +++++++++--
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop
index 4fe195e..eef9ce2 100644
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@@ -126,7 +126,7 @@ gtk3-classic
 exo-gtk3
 garcon-gtk3
 thunar-gtk3
-thunar-volman-gtk3
+thunar-volman
 tumbler
 xfce4-power-manager-gtk3
 xfce4-settings-gtk3
@@ -137,7 +137,7 @@ xfconf-gtk3
 blueman
 ffmpegthumbnailer  # tumbler - for video thumbnails
 freetype2          # tumbler - for font thumbnails
-gksu-polkit
+gksu
 gnome-keyring      # fix wlan segfault
 libgsf             # tumbler - for ODF thumbnails
 libopenraw         # tumbler - for RAW thumbnails
@@ -146,11 +146,12 @@ network-manager-applet
 menulibre
 orage
 poppler-glib       # tumbler - for PDF thumbnails
-thunar-archive-plugin-gtk3
->extra thunar-shares-plugin-gtk3
+thunar-archive-plugin
+>extra thunar-shares-plugin
 file-roller
 thunar-media-tags-plugin
-i3-scrot           # instead of xfce4-screenshooter?
+i3-scrot
+xfce4-screenshooter
 xfce4-taskmanager
 pavucontrol
 
@@ -169,9 +170,9 @@ kvantum-manjaro
 catfish
 dmidecode # optional dependency inxi
 engrampa
-firefox
+>extra firefox
 # >extra flashplugin
-galculator
+>extra galculator-gtk2
 gcolor2
 >extra gimp
 gparted
@@ -183,7 +184,7 @@ htop
 zathura-pdf-poppler
 zathura-djvu
 inxi
->extra libreoffice-fresh
+>extra libreoffice-still
 ms-office-online
 manjaro-hello
 manjaro-application-utility
@@ -217,6 +218,7 @@ manjaro-documentation-en
 manjaro-awesome-settings-18.0
 manjaro-browser-settings
 >extra manjaro-settings-samba
+manjaro-zsh-config
 
 ## Xorg Input Drivers
 xf86-input-elographics
@@ -253,12 +255,10 @@ gtkhash-thunar
 manjaro-hotfixes
 >basic ufw
 libappindicator-gtk3
-python-dbus
 mate-polkit
 pa-applet
 rofi
 xcape
-manjaro-zsh-config
 qt5ct
 downgrade
 >extra bmenu
diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf
index 2cb3392..9c9c233 100644
--- a/community/awesome/profile.conf
+++ b/community/awesome/profile.conf
@@ -16,7 +16,7 @@ displaymanager="lightdm"
 # nonfree_mhwd="true"
 
 # use extra packages as defined in pkglist to activate a full profile
-extra="false"
+#extra="true"
 
 ################ install ################
 
@@ -39,9 +39,16 @@ user_shell=/bin/zsh
 
 # unset defaults to given values
 # names must match systemd service names
-# enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
+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"
+
 # the same workgroup name if samba is used
 # smb_workgroup=""
 

From c1b69b9d3eb220c92b1a006f0c733e8da06915b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Fri, 28 Jun 2019 17:11:00 +0200
Subject: [PATCH 06/18] [snaps] more work in regard of snap support

---
 manjaro/kde/Packages-Desktop  | 16 +++++++++-------
 manjaro/kde/profile.conf      |  9 ++++++++-
 manjaro/xfce/Packages-Desktop |  1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index 713b34f..ce0562f 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -92,15 +92,17 @@ terminus-font
 
 ## Package management
 appimagelauncher
-#packagekit-qt5
+packagekit-qt5
+snapd
+discover-snap
 #discover
-flatpak
-#fwupd 
+#flatpak
+fwupd 
 #octopi
 #octopi-cachecleaner
 #octopi-repoeditor
 #octopi-notifier-frameworks
-pamac-qt
+#pamac-qt
 #manjaro-application-utility
 
 ## Printing
@@ -319,6 +321,6 @@ xdg-su
 manjaro-hotfixes
 
 ## Flatpak support
-#>extra flatpak
-#>extra xdg-desktop-portal
-#>extra xdg-desktop-portal-kde
+>extra flatpak
+>extra xdg-desktop-portal
+>extra xdg-desktop-portal-kde
diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf
index 7fa44c3..71d762a 100644
--- a/manjaro/kde/profile.conf
+++ b/manjaro/kde/profile.conf
@@ -31,9 +31,16 @@ extra="true"
 # use geoip for localization
 # geoip='true'
 
+# 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="candidate"
+
 # 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')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'apparmor' 'snapd.apparmor' 'snapd')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values,
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index 9ab4071..ba48c66 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -85,6 +85,7 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 pamac
 flatpak
 snapd
+apparmor-profiles
 
 ## Java
 >extra jdk8-openjdk

From 88984d7ffe341b8923d04e673e1a97183941b6b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 30 Jun 2019 07:10:09 +0200
Subject: [PATCH 07/18] [snaps] add apparmor

---
 manjaro/gnome/Packages-Desktop | 1 +
 manjaro/xfce/Packages-Desktop  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 19fa4ed..3e556df 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -1,5 +1,6 @@
 adwaita-icon-theme
 alsa-firmware
+apparmor
 baobab
 dconf-editor
 dmidecode
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index ba48c66..aaa1ba4 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -85,7 +85,7 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 pamac
 flatpak
 snapd
-apparmor-profiles
+apparmor
 
 ## Java
 >extra jdk8-openjdk

From 24f70ced000e82df6f2beca1c1a840f6ecb6a84e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 30 Jun 2019 22:58:09 +0200
Subject: [PATCH 08/18] [snaps] make snap support enabled but don't install any
 snap

---
 manjaro/gnome/Packages-Desktop | 2 +-
 manjaro/gnome/profile.conf     | 4 ++--
 manjaro/kde/Packages-Desktop   | 4 +++-
 manjaro/kde/profile.conf       | 2 +-
 manjaro/xfce/Packages-Desktop  | 2 +-
 manjaro/xfce/profile.conf      | 6 +++---
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 3e556df..2046e13 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -101,7 +101,7 @@ networkmanager-vpnc
 nss-mdns
 numlockx
 openresolv
-snapd
+gnome-software-snap
 pamac
 flatpak
 polkit-gnome
diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf
index 8b77752..0b619f9 100644
--- a/manjaro/gnome/profile.conf
+++ b/manjaro/gnome/profile.conf
@@ -46,11 +46,11 @@ disable_systemd=('pacman-init')
 # addgroups="lp,network,power,wheel"
 
 # 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=""
 # add classic snaps: classic_snaps="code"
 # classic_snaps=""
 # choose the snap channel. Possible options are: stable, candidate, beta, edge
-snap_channel="candidate"
+# snap_channel="candidate"
 
 # the same workgroup name if samba is used
 # smb_workgroup=""
diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index ce0562f..92fdcaa 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -92,13 +92,15 @@ terminus-font
 
 ## Package management
 appimagelauncher
+pamac-cli
 packagekit-qt5
+apparmor
 snapd
 discover-snap
 #discover
 #flatpak
 fwupd 
-#octopi
+octopi
 #octopi-cachecleaner
 #octopi-repoeditor
 #octopi-notifier-frameworks
diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf
index 71d762a..3b364e5 100644
--- a/manjaro/kde/profile.conf
+++ b/manjaro/kde/profile.conf
@@ -32,7 +32,7 @@ extra="true"
 # geoip='true'
 
 # 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=""
 # add classic snaps: classic_snaps="code"
 # classic_snaps=""
 # choose the snap channel. Possible options are: stable, candidate, beta, edge
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index aaa1ba4..fde369e 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -82,9 +82,9 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 >extra steam-manjaro
 
 ## Package management
+gnome-software-snap
 pamac
 flatpak
-snapd
 apparmor
 
 ## Java
diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf
index 4c4def1..d0558ef 100644
--- a/manjaro/xfce/profile.conf
+++ b/manjaro/xfce/profile.conf
@@ -35,12 +35,12 @@ displaymanager="lightdm"
 enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' '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 strict snaps: strict_snaps="snapd core core18 gnome-3-28-1804 gtk-common-themes snap-store"
+# strict_snaps=""
 # add classic snaps: classic_snaps="code"
 # classic_snaps=""
 # choose the snap channel. Possible options are: stable, candidate, beta, edge
-snap_channel="candidate"
+# snap_channel="candidate"
 
 # the same workgroup name if samba is used
 # smb_workgroup=""

From cd84fdb6e841787a8ceca558485dfb4a6d25a7ef Mon Sep 17 00:00:00 2001
From: Chrysostomus <matti@manjaro.org>
Date: Mon, 1 Jul 2019 00:43:47 +0300
Subject: [PATCH 09/18] Re-add gdm workaround

---
 manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100755 manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default

diff --git a/manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default b/manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default
new file mode 100755
index 0000000..23a2394
--- /dev/null
+++ b/manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default
@@ -0,0 +1,2 @@
+#!/bin/sh
+grep -q "^AutomaticLoginEnable=True" /etc/gdm/custom.conf || pkill -KILL -u gdm

From 9e1ddb06089fd2ff64329c9a44480fd7215ea42f Mon Sep 17 00:00:00 2001
From: Frank Kusters <frank@spaceage.nl>
Date: Fri, 5 Jul 2019 20:42:00 +0200
Subject: [PATCH 10/18] [awesome] bring in line with Xfce changes

---
 community/awesome/Packages-Desktop | 3 ++-
 community/awesome/profile.conf     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop
index eef9ce2..9b1b039 100644
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@@ -84,9 +84,10 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 >extra steam-manjaro
 
 ## Package management
+gnome-software-snap
 pamac
 flatpak
-snapd
+apparmor
 appimagelauncher
 
 ## Java
diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf
index 9c9c233..9b6490c 100644
--- a/community/awesome/profile.conf
+++ b/community/awesome/profile.conf
@@ -39,15 +39,15 @@ user_shell=/bin/zsh
 
 # 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' 'apparmor' 'snapd.apparmor' 'snapd')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' '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 strict snaps: strict_snaps="snapd core core18 gnome-3-28-1804 gtk-common-themes snap-store"
+# strict_snaps=""
 # add classic snaps: classic_snaps="code"
 # classic_snaps=""
 # choose the snap channel. Possible options are: stable, candidate, beta, edge
-# snap_channel="stable"
+# snap_channel="candidate"
 
 # the same workgroup name if samba is used
 # smb_workgroup=""

From 89966d31cea165b48ffb0e7cf4aaf1ae470b1b7c Mon Sep 17 00:00:00 2001
From: Frank Kusters <frank@spaceage.nl>
Date: Fri, 5 Jul 2019 20:43:13 +0200
Subject: [PATCH 11/18] [awesome] Streamline package selection

Yay is replaced by pamac, vlc by mpv.
---
 community/awesome/Packages-Desktop | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop
index 9b1b039..df12c29 100644
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@@ -65,7 +65,6 @@ pkg-config
 >extra git
 >extra patchutils
 >extra subversion
->extra yay
 
 ## Fonts
 cantarell-fonts
@@ -179,7 +178,6 @@ gcolor2
 gparted
 gufw
 >extra audacious
->extra mpv
 >extra hexchat
 htop
 zathura-pdf-poppler
@@ -202,7 +200,7 @@ screenfetch
 >extra poppler-data  # CKJ support for pdf
 >basic sylpheed # mail client
 >extra thunderbird
->extra vlc
+>extra mpv
 ristretto
 >extra xfburn
 >extra yelp
@@ -213,7 +211,7 @@ unace  # ACE archive support
 unrar  # RAR archive support
 
 ## Documentation
-manjaro-documentation-en
+# manjaro-documentation-en  # no use for Awesome edition
 
 ## Settings packages
 manjaro-awesome-settings-18.0

From ab7e9b494f45a1e47aa4032bc80e5d374847680a Mon Sep 17 00:00:00 2001
From: Bernhard Landauer <oberon@manjaro.org>
Date: Sat, 6 Jul 2019 10:48:45 +0200
Subject: [PATCH 12/18] [i3, cinnamon, deepin] remove etcher

---
 community/cinnamon/Packages-Desktop | 1 -
 community/deepin/Packages-Desktop   | 1 -
 community/i3/Packages-Desktop       | 1 -
 3 files changed, 3 deletions(-)

diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop
index a4f2057..96b33a2 100644
--- a/community/cinnamon/Packages-Desktop
+++ b/community/cinnamon/Packages-Desktop
@@ -14,7 +14,6 @@ cinnamon-translations
 >extra dconf-editor
 >extra deluge
 dmidecode
->extra etcher
 fakeroot
 >extra ffmpegthumbnailer
 >extra firefox
diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop
index 63ee776..92febcc 100644
--- a/community/deepin/Packages-Desktop
+++ b/community/deepin/Packages-Desktop
@@ -28,7 +28,6 @@ deepin-turbo
 >extra deluge
 dmidecode
 >extra downgrade
->extra etcher
 >extra evince
 >extra evolution
 fakeroot
diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop
index 51c1c88..13d5812 100644
--- a/community/i3/Packages-Desktop
+++ b/community/i3/Packages-Desktop
@@ -20,7 +20,6 @@ dfc
 dmidecode
 >extra downgrade
 epdfview
->extra etcher
 fakeroot
 >extra ffmpeg
 >extra ffmpegthumbnailer

From c9b99db5bf64ee551159388e8e3111dab215b2b7 Mon Sep 17 00:00:00 2001
From: Ste74 <stefano@manjaro.org>
Date: Thu, 11 Jul 2019 22:58:33 +0200
Subject: [PATCH 13/18] Removed gdm check for nvidia driver ( now upstream
 check via gdm ) and added manjaro-gdm-tweak so not need the Default file here

Signed-off-by: Ste74 <stefano@manjaro.org>
---
 manjaro/gnome/Packages-Desktop                          | 2 +-
 manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100755 manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default

diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 2046e13..b55ff13 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -10,7 +10,7 @@ evince
 >basic epiphany
 >extra firefox
 gdm
-manjaro-gdm-check #this check if nvidia closed drivers are installed and disable wayland session
+manjaro-gdm-tweak
 manjaro-gdm-theme #branding theme for GDM: 18.0 
 gedit 
 gtksourceview-pkgbuild #highlight for PKGBUILD
diff --git a/manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default b/manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default
deleted file mode 100755
index 23a2394..0000000
--- a/manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-grep -q "^AutomaticLoginEnable=True" /etc/gdm/custom.conf || pkill -KILL -u gdm

From 25637fbcb4ff8f7d683cf0ae1972a024a40dd364 Mon Sep 17 00:00:00 2001
From: Frank Kusters <frank@spaceage.nl>
Date: Fri, 12 Jul 2019 22:19:38 +0200
Subject: [PATCH 14/18] [awesome] Reduce minimal iso to 1.2GB

This is the absolute minimum, even without a browser.
---
 community/awesome/Packages-Desktop | 300 ++++++++++++++---------------
 1 file changed, 150 insertions(+), 150 deletions(-)

diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop
index df12c29..d6a7e74 100644
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@@ -1,77 +1,77 @@
 ## Network
-avahi
+>extra avahi
 networkmanager
-networkmanager-openconnect
-networkmanager-openvpn
-networkmanager-pptp
-networkmanager-vpnc
-nss-mdns # NSS support for mDNS (optdepend for avahi)
-ntp
-mobile-broadband-provider-info
-modemmanager
-openresolv
-openssh
-samba
-usb_modeswitch
+>extra networkmanager-openconnect
+>extra networkmanager-openvpn
+>extra networkmanager-pptp
+>extra networkmanager-vpnc
+>extra nss-mdns # NSS support for mDNS (optdepend for avahi)
+>extra ntp
+>extra mobile-broadband-provider-info
+>extra modemmanager
+>extra openresolv
+>extra openssh
+>extra samba
+>extra usb_modeswitch
 
 ## Libraries for Sound/Audio/Video
-alsa-firmware
-alsa-utils
-ffmpeg
-gst-libav
-gst-plugins-bad
-gst-plugins-base
-gst-plugins-good
-gst-plugins-ugly
-libdvdcss
->multilib manjaro-alsa
-manjaro-pulse
-pulseaudio-bluetooth
-pulseaudio-ctl
-pulseaudio-zeroconf
+>extra alsa-firmware
+>extra alsa-utils
+>extra ffmpeg
+>extra gst-libav
+>extra gst-plugins-bad
+>extra gst-plugins-base
+>extra gst-plugins-good
+>extra gst-plugins-ugly
+>extra libdvdcss
+>extra >multilib manjaro-alsa
+>extra manjaro-pulse
+>extra pulseaudio-bluetooth
+>extra pulseaudio-ctl
+>extra pulseaudio-zeroconf
 
 ## Connect Packages
-android-tools
-android-udev
-gvfs
-gvfs-afc
-gvfs-gphoto2
-gvfs-mtp
-gvfs-nfs
-gvfs-smb
-mtpfs
-udiskie
-udisks2
+>extra android-tools
+>extra android-udev
+>extra gvfs
+>extra gvfs-afc
+>extra gvfs-gphoto2
+>extra gvfs-mtp
+>extra gvfs-nfs
+>extra gvfs-smb
+>extra mtpfs
+>extra udiskie
+>extra udisks2
 
 ## AUR Support/Development
 # Missing base-devel packages
 >extra base-devel
-autoconf
-automake
-binutils
-bison
-fakeroot
-flex
-gcc
->multilib gcc-libs-multilib
->multilib gcc-multilib
-libtool
-m4
-make
-patch
-pkg-config
->multilib lib32-flex
+>extra autoconf
+>extra automake
+>extra binutils
+>extra bison
+>extra fakeroot
+>extra flex
+>extra gcc
+>extra >multilib gcc-libs-multilib
+>extra >multilib gcc-multilib
+>extra libtool
+>extra m4
+>extra make
+>extra patch
+>extra pkg-config
+>extra >multilib lib32-flex
 # Extra packages for AUR support
 >extra git
 >extra patchutils
 >extra subversion
 
 ## Fonts
-cantarell-fonts
-noto-fonts               # default font
-noto-fonts-cjk           # asian fonts - needed big package, ~76 mb compressed
+>extra cantarell-fonts
+>extra noto-fonts               # default font
+>extra noto-fonts-cjk           # asian fonts - needed big package, ~76 mb compressed
 # >extra noto-fonts-emoji
-terminus-font
+>extra terminus-font
 ttf-bitstream-vera       # xfce4-terminal default Monospace
 # ttf-dejavu             # Installed as gnome-themes-standard dependency
 >extra ttf-inconsolata
@@ -83,11 +83,11 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 >extra steam-manjaro
 
 ## Package management
-gnome-software-snap
+>extra gnome-software-snap
 pamac
-flatpak
-apparmor
-appimagelauncher
+>extra flatpak
+>extra apparmor
+>extra appimagelauncher
 
 ## Java
 >extra jdk8-openjdk
@@ -120,146 +120,146 @@ accountsservice  # Enhanced user accounts handling
 
 ## GTK3
 gtk3-classic
->multilib lib32-gtk3-classic
+>extra >multilib lib32-gtk3-classic
 
 ## XFCE Group
 exo-gtk3
-garcon-gtk3
+>extra garcon-gtk3
 thunar-gtk3
-thunar-volman
-tumbler
-xfce4-power-manager-gtk3
-xfce4-settings-gtk3
+>extra thunar-volman
+>extra tumbler
+>extra xfce4-power-manager-gtk3
+>extra xfce4-settings-gtk3
 lxterminal
-xfconf-gtk3
+>extra xfconf-gtk3
 
 ## XFCE Extras
-blueman
-ffmpegthumbnailer  # tumbler - for video thumbnails
-freetype2          # tumbler - for font thumbnails
-gksu
-gnome-keyring      # fix wlan segfault
-libgsf             # tumbler - for ODF thumbnails
-libopenraw         # tumbler - for RAW thumbnails
-light-locker
+>extra blueman
+>extra ffmpegthumbnailer  # tumbler - for video thumbnails
+>extra freetype2          # tumbler - for font thumbnails
+>extra gksu
+>extra gnome-keyring      # fix wlan segfault
+>extra libgsf             # tumbler - for ODF thumbnails
+>extra libopenraw         # tumbler - for RAW thumbnails
+>extra light-locker
 network-manager-applet
-menulibre
-orage
-poppler-glib       # tumbler - for PDF thumbnails
-thunar-archive-plugin
+>extra menulibre
+>extra orage
+>extra poppler-glib       # tumbler - for PDF thumbnails
+>extra thunar-archive-plugin
 >extra thunar-shares-plugin
-file-roller
-thunar-media-tags-plugin
-i3-scrot
-xfce4-screenshooter
-xfce4-taskmanager
-pavucontrol
+>extra file-roller
+>extra thunar-media-tags-plugin
+>extra i3-scrot
+>extra xfce4-screenshooter
+>extra xfce4-taskmanager
+>extra pavucontrol
 
 ## Themes
 >extra manjaro-wallpapers-18.0
 >extra wallpapers-2018
-gnome-icon-theme
-gnome-themes-standard
+>extra gnome-icon-theme
+>extra gnome-themes-standard
 grub-theme-manjaro
-matcha-gtk-theme
-xcursor-simpleandsoft
-xcursor-vanilla-dmz-aa
-kvantum-manjaro
+>extra matcha-gtk-theme
+>extra xcursor-simpleandsoft
+>extra xcursor-vanilla-dmz-aa
+>extra kvantum-manjaro
 
 ## Applications
-catfish
-dmidecode # optional dependency inxi
-engrampa
+>extra catfish
+>extra dmidecode # optional dependency inxi
+>extra engrampa
 >extra firefox
 # >extra flashplugin
 >extra galculator-gtk2
-gcolor2
+>extra gcolor2
 >extra gimp
-gparted
-gufw
+>extra gparted
+>extra gufw
 >extra audacious
 >extra hexchat
-htop
-zathura-pdf-poppler
-zathura-djvu
-inxi
+>extra htop
+>extra zathura-pdf-poppler
+>extra zathura-djvu
+>extra inxi
 >extra libreoffice-still
-ms-office-online
-manjaro-hello
-manjaro-application-utility
-manjaro-settings-manager
-manjaro-settings-manager-notifier
->basic midori
+>extra ms-office-online
+>extra manjaro-hello
+>extra manjaro-application-utility
+>extra manjaro-settings-manager
+>extra manjaro-settings-manager-notifier
+# >basic midori  # no browser in minimal iso
 >extra mlocate
 mousepad
-mugshot
->basic parole # media player
+>extra mugshot
+# >basic parole # no media player in minimal iso
 >extra pidgin
-powertop
-screenfetch
+>extra powertop
+>extra screenfetch
 >extra poppler-data  # CKJ support for pdf
->basic sylpheed # mail client
+# >basic sylpheed # no mail client in minimal iso
 >extra thunderbird
 >extra mpv
-ristretto
+>extra ristretto
 >extra xfburn
 >extra yelp
 
 # Optional dependencies engrampa
-p7zip  # 7Z and ARJ archive support
-unace  # ACE archive support
-unrar  # RAR archive support
+>extra p7zip  # 7Z and ARJ archive support
+>extra unace  # ACE archive support
+>extra unrar  # RAR archive support
 
 ## Documentation
 # manjaro-documentation-en  # no use for Awesome edition
 
 ## Settings packages
 manjaro-awesome-settings-18.0
-manjaro-browser-settings
+>extra manjaro-browser-settings
 >extra manjaro-settings-samba
 manjaro-zsh-config
 
 ## Xorg Input Drivers
-xf86-input-elographics
-xf86-input-evdev
-xf86-input-keyboard
-xf86-input-libinput
-xf86-input-mouse
-xf86-input-void
+>extra xf86-input-elographics
+>extra xf86-input-evdev
+>extra xf86-input-keyboard
+>extra xf86-input-libinput
+>extra xf86-input-mouse
+>extra xf86-input-void
 
 ## Xorg Server and Graphics
->multilib lib32-libva-intel-driver
->multilib lib32-libva-mesa-driver
->multilib lib32-libva-vdpau-driver
-libva-intel-driver
-libva-mesa-driver
-libva-vdpau-driver
-mesa-demos
->multilib lib32-mesa-demos
-numlockx
-xdg-user-dirs
+>extra >multilib lib32-libva-intel-driver
+>extra >multilib lib32-libva-mesa-driver
+>extra >multilib lib32-libva-vdpau-driver
+>extra libva-intel-driver
+>extra libva-mesa-driver
+>extra libva-vdpau-driver
+>extra mesa-demos
+>extra >multilib lib32-mesa-demos
+>extra numlockx
+>extra xdg-user-dirs
 xorg-server
-xorg-twm
-xorg-xinit
-xorg-xprop
-xorg-xkill
+>extra xorg-twm
+>extra xorg-xinit
+>extra xorg-xprop
+>extra xorg-xkill
 
 ## Desktop Utils
-perl-file-mimeinfo
-xdg-utils
-xdg-su
+>extra perl-file-mimeinfo
+>extra xdg-utils
+>extra xdg-su
 
 ## Misc
-gtkhash-thunar
+>extra gtkhash-thunar
 manjaro-hotfixes
->basic ufw
-libappindicator-gtk3
-mate-polkit
-pa-applet
-rofi
-xcape
-qt5ct
-downgrade
+ufw  # firewall needs to be in every iso
+>extra libappindicator-gtk3
+>extra mate-polkit
+>extra pa-applet
+>extra rofi
+>extra xcape
+>extra qt5ct
+>extra downgrade
 >extra bmenu
 >extra compton
 >extra compton-conf

From d84fb53aace75ec29dfa626accbf6d169661aab0 Mon Sep 17 00:00:00 2001
From: Frank Kusters <frank@spaceage.nl>
Date: Fri, 12 Jul 2019 22:54:14 +0200
Subject: [PATCH 15/18] [awesome] bring full iso size under 1.99GB

---
 community/awesome/Packages-Desktop | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop
index d6a7e74..16234bf 100644
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@@ -69,7 +69,7 @@ networkmanager
 ## Fonts
 >extra cantarell-fonts
 >extra noto-fonts               # default font
->extra noto-fonts-cjk           # asian fonts - needed big package, ~76 mb compressed
+# >extra noto-fonts-cjk  # removed to reduce iso size (-184MB)
 # >extra noto-fonts-emoji
 >extra terminus-font
 ttf-bitstream-vera       # xfce4-terminal default Monospace
@@ -80,7 +80,7 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 >extra ttf-droid
 
 ## Games
->extra steam-manjaro
+# >extra steam-manjaro  # removed to reduce iso size (-74MB)
 
 ## Package management
 >extra gnome-software-snap
@@ -90,9 +90,10 @@ pamac
 >extra appimagelauncher
 
 ## Java
->extra jdk8-openjdk
->extra jre8-openjdk-headless
->extra jre8-openjdk
+# removed to reduce iso size (-36MB)
+# >extra jdk8-openjdk
+# >extra jre8-openjdk-headless
+# >extra jre8-openjdk
 
 ## Printing
 >extra manjaro-printer
@@ -157,7 +158,7 @@ network-manager-applet
 
 ## Themes
 >extra manjaro-wallpapers-18.0
->extra wallpapers-2018
+# >extra wallpapers-2018  # removed to reduce iso size (-15MB)
 >extra gnome-icon-theme
 >extra gnome-themes-standard
 grub-theme-manjaro
@@ -169,7 +170,7 @@ grub-theme-manjaro
 ## Applications
 >extra catfish
 >extra dmidecode # optional dependency inxi
->extra engrampa
+# >extra engrampa  # redundant with file-roller
 >extra firefox
 # >extra flashplugin
 >extra galculator-gtk2

From 135862e5f506d6a89623e6004fed07f9f132a468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sat, 20 Jul 2019 09:57:04 +0200
Subject: [PATCH 16/18] [prepare] 18.1.0-rc5

---
 manjaro/gnome/Packages-Desktop                |  5 ++--
 .../root/.config/Kvantum/kvantum.kvconfig     |  2 +-
 manjaro/gnome/live-overlay/usr/share          |  1 -
 manjaro/kde-dev/live-overlay/usr              |  1 -
 manjaro/kde/Packages-Desktop                  |  5 ++--
 manjaro/kde/live-overlay/usr                  |  1 -
 manjaro/xfce/Packages-Desktop                 |  8 +++++--
 manjaro/xfce/live-overlay/usr                 |  1 -
 .../calamares/branding/manjaro/branding.desc  | 23 -------------------
 9 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 120000 manjaro/gnome/live-overlay/usr/share
 delete mode 120000 manjaro/kde-dev/live-overlay/usr
 delete mode 120000 manjaro/kde/live-overlay/usr
 delete mode 120000 manjaro/xfce/live-overlay/usr
 delete mode 100644 shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc

diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index b55ff13..9cd06e8 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -147,7 +147,8 @@ 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
 >extra gnome-getting-started-docs
@@ -156,7 +157,7 @@ ms-office-online
 >extra unace
 >extra lrzip
 >extra gtk3-print-backends
->extra libreoffice-still
+#>extra libreoffice-still
 >extra evolution
 >extra lollypop
 >extra empathy
diff --git a/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig b/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig
index c1615a1..41beaf1 100644
--- a/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig
+++ b/manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig
@@ -1,2 +1,2 @@
 [General]
-theme=KvArcMaia
+theme=Matcha
diff --git a/manjaro/gnome/live-overlay/usr/share b/manjaro/gnome/live-overlay/usr/share
deleted file mode 120000
index 6adfc9d..0000000
--- a/manjaro/gnome/live-overlay/usr/share
+++ /dev/null
@@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/usr/share
\ No newline at end of file
diff --git a/manjaro/kde-dev/live-overlay/usr b/manjaro/kde-dev/live-overlay/usr
deleted file mode 120000
index b56c83d..0000000
--- a/manjaro/kde-dev/live-overlay/usr
+++ /dev/null
@@ -1 +0,0 @@
-../../../shared/manjaro/live-overlay/usr
\ No newline at end of file
diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index 92fdcaa..3c0cde1 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -259,9 +259,10 @@ inxi
 #>extra krita
 >extra firefox
 >basic falkon
-ms-office-online
+#ms-office-online
+freeoffice
 #>extra libreoffice-fresh
->extra calligra
+#>extra calligra
 manjaro-hello
 manjaro-settings-manager-kcm
 manjaro-settings-manager-knotifier
diff --git a/manjaro/kde/live-overlay/usr b/manjaro/kde/live-overlay/usr
deleted file mode 120000
index b56c83d..0000000
--- a/manjaro/kde/live-overlay/usr
+++ /dev/null
@@ -1 +0,0 @@
-../../../shared/manjaro/live-overlay/usr
\ No newline at end of file
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index fde369e..81a8266 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -209,8 +209,9 @@ gufw
 htop
 qpdfview
 inxi
->extra libreoffice-still
-ms-office-online
+#>extra libreoffice-still
+#ms-office-online
+freeoffice
 manjaro-hello
 manjaro-application-utility
 manjaro-settings-manager
@@ -276,3 +277,6 @@ xdg-su
 ## Misc
 gtkhash-thunar
 manjaro-hotfixes
+
+## Workarounds
+boost-libs # needed to fix systemd-journal on live-boot
diff --git a/manjaro/xfce/live-overlay/usr b/manjaro/xfce/live-overlay/usr
deleted file mode 120000
index b56c83d..0000000
--- a/manjaro/xfce/live-overlay/usr
+++ /dev/null
@@ -1 +0,0 @@
-../../../shared/manjaro/live-overlay/usr
\ No newline at end of file
diff --git a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
deleted file mode 100644
index 8bb438a..0000000
--- a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc
+++ /dev/null
@@ -1,23 +0,0 @@
----
-componentName:  manjaro
-
-strings:
-    productName:         Manjaro Linux
-    shortProductName:    Manjaro
-    version:             18.0.4
-    shortVersion:        18.0.4
-    versionedName:       Manjaro Linux 18.0.4 "Illyria"
-    shortVersionedName:  Manjaro 18.0.4
-    bootloaderEntryName: Manjaro
-
-images:
-    productLogo:         "logo.png"
-    productIcon:         "logo.png"
-    productWelcome:      "languages.png"
-
-slideshow:               "show.qml"
-
-style:
-   sidebarBackground:    "#454948"
-   sidebarText:          "#efefef"
-   sidebarTextSelect:    "#9E4F5D"

From 8e4e193460e2b9c1197713d75ec2a02ffef779c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 28 Jul 2019 19:36:36 +0200
Subject: [PATCH 17/18] [shared] disable catalyst

---
 manjaro/xfce/Packages-Desktop | 12 ++++++++----
 shared/Packages-Mhwd          |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index 81a8266..a1acbef 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -210,8 +210,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 +278,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
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index 56f360c..3d1cfba 100644
--- a/shared/Packages-Mhwd
+++ b/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

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 18/18] [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