Merge branch 'master' of ssh://gitlab.manjaro.org:22277/profiles-and-settings/iso-profiles

community/awesome/Packages-Desktop

@@ -1,150 +1,267 @@
-###################################
 ## Network
-###################################
+>extra avahi
-avahi
-network-manager-applet
 networkmanager
-networkmanager-openconnect
+>extra networkmanager-openconnect
-networkmanager-openvpn
+>extra networkmanager-openvpn
-networkmanager-pptp
+>extra networkmanager-pptp
-networkmanager-vpnc
+>extra networkmanager-vpnc
-nss-mdns
+>extra nss-mdns # NSS support for mDNS (optdepend for avahi)
-modemmanager
+>extra ntp
-usb_modeswitch
+>extra mobile-broadband-provider-info
-openresolv
+>extra modemmanager
+>extra openresolv
+>extra openssh
+>extra samba
+>extra usb_modeswitch
 
-###################################
 ## Libraries for Sound/Audio/Video
-###################################
+>extra alsa-firmware
-alsa-firmware
+>extra alsa-utils
-alsa-utils
+>extra ffmpeg
-ffmpeg
+>extra gst-libav
-gst-libav
+>extra gst-plugins-bad
-gst-plugins-bad
+>extra gst-plugins-base
-gst-plugins-base
+>extra gst-plugins-good
-gst-plugins-good
+>extra gst-plugins-ugly
-gst-plugins-ugly
+>extra libdvdcss
-libdvdcss
+>extra >multilib manjaro-alsa
-manjaro-pulse
+>extra manjaro-pulse
-pulseaudio-ctl
+>extra pulseaudio-bluetooth
-pulseaudio-zeroconf
+>extra pulseaudio-ctl
+>extra pulseaudio-zeroconf
 
-###################################
 ## Connect Packages
-###################################
+>extra android-tools
-android-udev
+>extra android-udev
-gvfs
+>extra gvfs
-gvfs-afc
+>extra gvfs-afc
-gvfs-gphoto2
+>extra gvfs-gphoto2
-gvfs-mtp
+>extra gvfs-mtp
-gvfs-nfs
+>extra gvfs-nfs
-gvfs-smb
+>extra gvfs-smb
-mtpfs
+>extra mtpfs
-udiskie
+>extra udiskie
-udisks2
+>extra udisks2
 
-###################################
+## AUR Support/Development
-## Xorg
+# Missing base-devel packages
-###################################
+>extra base-devel
-xf86-input-elographics
+>extra autoconf
-xf86-input-evdev
+>extra automake
-xf86-input-keyboard
+>extra binutils
-xf86-input-libinput
+>extra bison
-xf86-input-mouse
+>extra fakeroot
-xf86-input-void
+>extra flex
-xorg-server
+>extra gcc
-xorg-xinit
+>extra >multilib gcc-libs-multilib
-xorg-xprop
+>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
-## Misc
+>extra cantarell-fonts
-###################################
+>extra noto-fonts               # default font
->basic ufw
+# >extra noto-fonts-cjk  # removed to reduce iso size (-184MB)
-gtk3-classic
+# >extra noto-fonts-emoji
+>extra 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  # removed to reduce iso size (-74MB)
+
+## Package management
+>extra gnome-software-snap
+pamac
+>extra flatpak
+>extra apparmor
+>extra appimagelauncher
+
+## Java
+# removed to reduce iso size (-36MB)
+# >extra jdk8-openjdk
+# >extra jre8-openjdk-headless
+# >extra jre8-openjdk
+
+## Printing
+>extra manjaro-printer
+>extra cups
+>extra cups-pdf
+>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
 lightdm-slick-greeter
-libappindicator-gtk3
+accountsservice  # Enhanced user accounts handling
-accountsservice  # Enhanced user accounts
-python-dbus
-gnome-keyring
-grub-theme-manjaro
-light-locker
-mate-polkit
-gksu-polkit
-perl-file-mimeinfo
-pavucontrol
-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
 
-###################################
+## GTK3
-## Apps and Optional dependencies
+gtk3-classic
-###################################
+>extra >multilib lib32-gtk3-classic
-appimagelauncher
+
-downgrade
+## XFCE Group
-inxi
+exo-gtk3
-i3-scrot
+>extra garcon-gtk3
-htop
-lxterminal
-firefox
-galculator
-mousepad
-pamac
-ristretto
 thunar-gtk3
-thunar-volman-gtk3
+>extra thunar-volman
-thunar-archive-plugin-gtk3
+>extra tumbler
-catfish
+>extra xfce4-power-manager-gtk3
-file-roller
+>extra xfce4-settings-gtk3
-p7zip
+lxterminal
-unrar
+>extra xfconf-gtk3
-unace
-tumbler
-ffmpegthumbnailer
-libgsf
-libopenraw
-zathura-pdf-poppler
-zathura-djvu
 
-###################################
+## XFCE Extras
-############## EXTRA ##############
+>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
+>extra menulibre
+>extra orage
+>extra poppler-glib       # tumbler - for PDF thumbnails
+>extra thunar-archive-plugin
+>extra thunar-shares-plugin
+>extra file-roller
+>extra thunar-media-tags-plugin
+>extra i3-scrot
+>extra xfce4-screenshooter
+>extra xfce4-taskmanager
+>extra pavucontrol
 
-###################################
+## Themes
-## AUR Support
+>extra manjaro-wallpapers-18.0
-## Missing base-devel packages
+# >extra wallpapers-2018  # removed to reduce iso size (-15MB)
-###################################
+>extra gnome-icon-theme
->extra base-devel
+>extra gnome-themes-standard
->extra git
+grub-theme-manjaro
->extra yay
+>extra matcha-gtk-theme
+>extra xcursor-simpleandsoft
+>extra xcursor-vanilla-dmz-aa
+>extra kvantum-manjaro
 
-###################################
+## Applications
-## Extra Misc and Apps
+>extra catfish
-###################################
+>extra dmidecode # optional dependency inxi
+# >extra engrampa  # redundant with file-roller
+>extra firefox
+# >extra flashplugin
+>extra galculator-gtk2
+>extra gcolor2
+>extra gimp
+>extra gparted
+>extra gufw
+>extra audacious
+>extra hexchat
+>extra htop
+>extra zathura-pdf-poppler
+>extra zathura-djvu
+>extra inxi
+>extra libreoffice-still
+>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
+>extra mugshot
+# >basic parole # no media player in minimal iso
+>extra pidgin
+>extra powertop
+>extra screenfetch
+>extra poppler-data  # CKJ support for pdf
+# >basic sylpheed # no mail client in minimal iso
+>extra thunderbird
+>extra mpv
+>extra ristretto
+>extra xfburn
+>extra yelp
+
+# Optional dependencies engrampa
+>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
+>extra manjaro-browser-settings
+>extra manjaro-settings-samba
+manjaro-zsh-config
+
+## Xorg Input Drivers
+>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
+>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
+>extra xorg-twm
+>extra xorg-xinit
+>extra xorg-xprop
+>extra xorg-xkill
+
+## Desktop Utils
+>extra perl-file-mimeinfo
+>extra xdg-utils
+>extra xdg-su
+
+## Misc
+>extra gtkhash-thunar
+manjaro-hotfixes
+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
->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

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="true"
+
+################ 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
+# use geoip for localization
-# geoip="true"
+# geoip='true'
 
 # default system shell is bash
 # use /etc/defaults/useradd by supplying a space " "
@@ -39,16 +39,20 @@ 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' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
 disable_systemd=('pacman-init')
 
-# unset defaults to given values
+# add strict snaps: strict_snaps="snapd core core18 gnome-3-28-1804 gtk-common-themes snap-store"
-# addgroups="lp,network,power,wheel"
+# strict_snaps=""
+# 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="Manjaro"
+# smb_workgroup=""
 
-################# live-session #################
+################# livecd #################
 
 # unset defaults to given value
 hostname="manjaro-awesome"
@@ -59,10 +63,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

community/cinnamon/Packages-Desktop

@@ -15,7 +15,6 @@ cinnamon-translations
 >extra dconf-editor
 >extra deluge
 dmidecode
->extra etcher
 fakeroot
 >extra ffmpegthumbnailer
 >extra firefox

community/deepin/Packages-Desktop

@@ -28,7 +28,6 @@ deepin-turbo
 >extra deluge
 dmidecode
 >extra downgrade
->extra etcher
 >extra evince
 >extra evolution
 fakeroot

community/i3/Packages-Desktop

@@ -20,7 +20,6 @@ dfc
 dmidecode
 >extra downgrade
 epdfview
->extra etcher
 fakeroot
 >extra ffmpeg
 >extra ffmpegthumbnailer

manjaro/gnome/Packages-Desktop

@@ -1,5 +1,6 @@
 adwaita-icon-theme
 alsa-firmware
+apparmor
 baobab
 dconf-editor
 dmidecode
@@ -9,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
@@ -100,8 +101,11 @@ networkmanager-vpnc
 nss-mdns
 numlockx
 openresolv
-pamac
+#gnome-software-snap
 flatpak
+fpakman
+pamac
+snapd
 polkit-gnome
 powertop
 pulseaudio-bluetooth
@@ -128,7 +132,6 @@ ttf-inconsolata
 ttf-indic-otf
 ttf-liberation
 usb_modeswitch
-haveged
 vino
 xdg-su
 xdg-user-dirs
@@ -147,6 +150,7 @@ xorg-xinit
 yelp
 
 ms-office-online
+freeoffice
 
 #extra depends for file-roller
 >extra gnome-getting-started-docs
@@ -155,7 +159,7 @@ ms-office-online
 >extra unace
 >extra lrzip
 >extra gtk3-print-backends
->extra libreoffice-still
+#>extra libreoffice-still
 >extra evolution
 >extra lollypop
 >extra empathy

manjaro/gnome/live-overlay/root/.config/Kvantum/kvantum.kvconfig

@@ -1,2 +1,2 @@
 [General]
-theme=KvArcMaia
+theme=Matcha

manjaro/gnome/live-overlay/usr/share

@@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/usr/share

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=""
+# 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=""
 

manjaro/kde-dev/live-overlay/usr

@@ -1 +0,0 @@
-../../../shared/manjaro/live-overlay/usr

manjaro/kde/Packages-Desktop

@@ -91,16 +91,22 @@ terminus-font
 >extra steam-manjaro
 
 ## Package management
-appimagelauncher
+#appimagelauncher
-#packagekit-qt5
+pamac
+#pamac-cli
+apparmor
+snapd
+#discover-snap
 #discover
+#packagekit-qt5
 flatpak
-#fwupd 
+fpakman
+fwupd 
 #octopi
 #octopi-cachecleaner
 #octopi-repoeditor
 #octopi-notifier-frameworks
-pamac-qt
+#pamac-qt
 #manjaro-application-utility
 
 ## Printing
@@ -255,9 +261,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
@@ -319,6 +326,6 @@ xdg-su
 manjaro-hotfixes
 
 ## Flatpak support
-#>extra flatpak
+>extra flatpak
-#>extra xdg-desktop-portal
+>extra xdg-desktop-portal
-#>extra xdg-desktop-portal-kde
+>extra xdg-desktop-portal-kde

manjaro/kde/live-overlay/usr

@@ -1 +0,0 @@
-../../../shared/manjaro/live-overlay/usr

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=""
+# 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,

manjaro/xfce/Packages-Desktop

@@ -82,8 +82,11 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 >extra steam-manjaro
 
 ## Package management
-pamac
+apparmor
+#gnome-software-snap
 flatpak
+fpakman
+pamac
 snapd
 
 ## Java
@@ -208,8 +211,9 @@ gufw
 htop
 qpdfview
 inxi
->extra libreoffice-still
+#>extra libreoffice-still
-ms-office-online
+microsoft-office-online-jak
+>extra freeoffice
 manjaro-hello
 manjaro-application-utility
 manjaro-settings-manager
@@ -275,3 +279,10 @@ xdg-su
 ## Misc
 gtkhash-thunar
 manjaro-hotfixes
+
+## Handshake tools
+#faucet-tool
+#hnsd-git
+#hsd-git
+#veracrypt
+#cryptoseed

manjaro/xfce/live-overlay/usr

@@ -1 +0,0 @@
-../../../shared/manjaro/live-overlay/usr

manjaro/xfce/profile.conf

@@ -32,15 +32,15 @@ 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"
+# add strict snaps: strict_snaps="snapd 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="stable"
+# snap_channel="candidate"
 
 # the same workgroup name if samba is used
 # smb_workgroup=""

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 catalyst-utils
->nonfree_default KERNEL-catalyst
+#>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

shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc

@@ -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"