Merge remote-tracking branch 'upstream/master'

community/cinnamon/Packages-Desktop

@@ -11,10 +11,10 @@ bison
 cinnamon-sounds
 cinnamon-translations
 >extra cinnamon-wallpapers
-dbus-x11
 >extra dconf-editor
 >extra deluge
 dmidecode
+>extra etcher
 fakeroot
 >extra ffmpegthumbnailer
 >extra firefox
@@ -50,7 +50,6 @@ htop
 >extra hexchat
 icon-naming-utils
 inxi
->extra isousb
 >extra jre8-openjdk
 >extra jre8-openjdk-headless
 kvantum-manjaro
@@ -80,7 +79,7 @@ manjaro-settings-manager-notifier
 >extra mousetweaks
 >extra mugshot
 >multilib lib32-mesa-demos
->extra nemo-bulk-rename
+# >extra nemo-bulk-rename
 >extra nemo-fileroller
 >extra nemo-preview
 >extra nemo-python
@@ -150,9 +149,9 @@ xorg-xinit
 >extra xplayer
 >extra xreader
 >extra xviewer-plugins
->extra yaourt
 xdg-user-dirs
 xorg-server
 xorg-xhost
 xorg-xkill
+>extra yay
 zensu

community/cinnamon/profile.conf

@@ -31,7 +31,7 @@ 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' 'add-autologin-group')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values

community/deepin/Packages-Desktop

@@ -28,6 +28,7 @@ deepin-turbo
 >extra deluge
 dmidecode
 >extra downgrade
+>extra etcher
 >extra evince
 >extra evolution
 fakeroot
@@ -56,7 +57,6 @@ gvfs-smb
 hexchat
 htop
 inxi
->extra isousb
 >extra jre8-openjdk
 >extra jre8-openjdk-headless
 >multilib lib32-flex
@@ -129,8 +129,8 @@ xorg-twm
 xorg-xinit
 >extra xsane
 >extra xsane-gimp
->extra yaourt
 xdg-user-dirs
 xorg-xhost
 xorg-server
+>extra yay
 zensu

community/deepin/Packages-Live

@@ -1,6 +1,6 @@
 calamares
 deepin-live
-grub-theme-live-manjaro-dev
+grub-theme-live-manjaro
 gsmartcontrol
 manjaro-architect
 manjaro-live-skel
@@ -8,4 +8,3 @@ manjaro-live-systemd
 mkinitcpio-nfs-utils
 nbd
 squashfs-tools
-clonezilla

community/deepin/desktop-overlay/etc/skel/.config/deepin/deepin-wm-switcher/config.json

@@ -1,4 +0,0 @@
-{
-    "allow_switch": true,
-    "last_wm": "deepin-wm"
-}

community/deepin/live-overlay/root/.config/deepin/qt-theme.ini

@@ -0,0 +1,5 @@
+[Theme]
+IconThemeName=Compass
+Font=Noto Sans
+MonoFont=Noto Mono
+FontSize=9.0

community/i3/Packages-Desktop

@@ -20,6 +20,7 @@ dfc
 dmidecode
 >extra downgrade
 epdfview
+>extra etcher
 fakeroot
 >extra ffmpeg
 >extra ffmpegthumbnailer
@@ -54,7 +55,6 @@ gvfs-smb
 >extra hexchat
 htop
 inxi
->extra isousb
 json-c
 kvantum-manjaro
 >multilib lib32-flex
@@ -161,6 +161,6 @@ xorg-xinit
 xorg-xkill
 xorg-xprop
 xterm
->extra yaourt
 xdg-user-dirs
 xorg-server
+>extra yay