Update Packages-Root

update
update profiles
2022-10-14 02:02:53 +00:00 · 2022-09-12 21:42:39 +03:00 · 2022-09-12 21:28:10 +03:00 · 2022-09-12 18:15:53 +00:00 · 2022-04-06 12:57:58 +02:00 · 2022-04-06 12:55:29 +02:00
859 changed files with 39986 additions and 10737 deletions
--- a/README.md
+++ b/README.md
@ -1,123 +1,179 @@
-iso-profiles
-==========================
+## iso-profiles

-###### * profile.conf
+
+### profile.conf

 ~~~
 ##########################################
 ###### use this file in the profile ######
 ##########################################

-# use multilib packages; x86_64 only
+## use multilib packages; x86_64 only
 # multilib="true"

-# use extra packages as defined in pkglist to activate a full profile
+## use extra packages as defined in pkglist to activate a full profile
 # extra="false"

 ################ install ################

-# default displaymanager: none
-# supported; lightdm, sddm, gdm, lxdm, mdm
+## default displaymanager: none
+## supported; lightdm, sddm, gdm, lxdm, mdm
 # displaymanager="none"

-# Set to false to disable autologin in the livecd
+## Set to false to disable autologin in the livecd
 # autologin="true"

-# nonfree xorg drivers
+## nonfree xorg drivers
 # nonfree_mhwd="true"

-# possible values: grub;systemd-boot
+## possible values: grub;systemd-boot
 # efi_boot_loader="grub"

-# configure calamares for netinstall
+## configure calamares for netinstall
 # netinstall="false"

-# configure calamares to use chrootcfg instead of unpackfs; default: unpackfs
+## configure calamares for mhwd
+# mhwd_used="true"
+
+## configure calamares for oem
+# oem_used="false"
+
+## configure calamares to use chrootcfg instead of unpackfs; default: unpackfs
 # chrootcfg="false"

-# use geoip
+## use geoip
 # geoip="true"

-# unset defaults to given values
-# names must match systemd service names
+## unset defaults to given values
+## names must match systemd service names
 # enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
 # disable_systemd=()

-# unset defaults to given values,
-# names must match openrc service names
-# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
-# disable_openrc=()
-
-# unset defaults to given values
+## unset defaults to given values
 # addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel"

-# the same workgroup name if samba is used
+## the same workgroup name if samba is used
 # smb_workgroup="Manjaro"

+## default system shell is bash
+## '/etc/defaults/useradd': " "
+## userShell              : "/bin/zsh"
+## empty value will not be used
+# user_shell=" "
+
+## use calamares office installer
+## supported: true,false
+# office_installer="false"
+
+## 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.
+## supported:: stable,candidate,beta,edge
+# snap_channel="candidate"
+
+########## calamares preferences ##########
+# See /etc/manjaro-tools/branding.desc.d for reference
+# These settings will override settings from manjaro-tools.conf
+
+## welcome style for calamares
+## true="Welcome to the %1 installer."
+## false="Welcome to the Calamares installer for %1." (default)
+# welcomestyle=false
+
+## welcome image scaled (productWelcome)
+# welcomelogo=true
+
+## size and expansion policy for Calamares
+## supported: normal,fullscreen,noexpand
+# windowexp=noexpand
+
+## size of Calamares window, expressed as w,h
+## supported: pixel (px) or font-units (em))
+# windowsize="800px,520px"
+
+## placement of Calamares window
+## supported: center,free
+# windowplacement="center"
+
+## colors for text and background components:
+
+## background of the sidebar
+# sidebarbackground=#454948
+
+## text color
+# sidebartext=#efefef
+
+## background of the selected step
+# sidebartextselect=#4d915e
+
+## text color of the selected step
+# sidebartexthighlight=#1a1c1b
+
 ################# live-session #################

-# unset defaults to given value
+## unset defaults to given value
 # hostname="manjaro"

-# unset defaults to given value
+## unset defaults to given value
 # username="manjaro"

-# unset defaults to given value
+## unset defaults to given value
 # password="manjaro"

-# the login shell
-# defaults to bash
+## the login shell
+## defaults to bash
 # login_shell=/bin/bash

-# unset defaults to given values
-# names must match systemd service names
-# services in enable_systemd array don't need to be listed here
+## unset defaults to given values
+## names must match systemd service names
+## services in enable_systemd array don't need to be listed here
 # enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-
-# unset defaults to given values,
-# names must match openrc service names
-# services in enable_openrc array don't need to be listed here
-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
-~~~
-
-###### * New Packagelist tags
+disable_systemd_live=('tlp' 'tlp-sleep')
+
+~~~
+
+### Packagelist tags

 ~~~
->openrc
 >systemd

->i686
 >x86_64
 >multilib

 >nonfree_default
->nonfree_i686
 >nonfree_x86_64
 >nonfree_multilib

 >manjaro
->sonar

 >basic
 >extra
 ~~~

-###### * Packages-Root
+### Packages-Root
+
 * Contains root image packages
 * ideally no xorg

-###### * Packages-Desktop
+### Packages-Desktop
+
 * Contains the desktop image packages
 * desktop environment packages go here

-###### * Packages-Mhwd
+### Packages-Mhwd
+
 * Contains the MHWD driver packages repo

-###### * Packages-Live
+### Packages-Live
+
 * Contains packages you only want in live session but not installed on the target system with installer
 * default files are in shared folder and can be symlinked or defined in a real file

-###### * buildiso can be configured to use custom repos.
+### buildiso can be configured to use custom repos

 * create a user-repos.conf

@ -125,7 +181,10 @@ iso-profiles
 ${profile_dir}/user-repos.conf
 ~~~

-Add only your repos to user-repos.conf!
+**Add only your repos to user-repos.conf!**

-###### * Calamares
-* netgroups definitions go in [this](https://github.com/manjaro/calamares-netgroups) repo please
+**Important**: Only online repos is allowed in the user-repos.conf. Buildiso will fail on file-based repos.
+
+
+### Calamares
+netgroups definitions go in [this](https://github.com/manjaro/calamares-netgroups) repo please
--- a/community/architect/Packages-Live
+++ b/community/architect/Packages-Live
@ -1,23 +0,0 @@
-KERNEL-broadcom-wl
-KERNEL-ndiswrapper
-KERNEL-r8168
-KERNEL-rt3562sta
-KERNEL-virtualbox-guest-modules
-maia-console
-manjaro-architect-launcher
-manjaro-hotfixes
-mkinitcpio-nfs-utils
-nbd
-open-vm-tools
-manjaro-live-systemd
-networkmanager
-terminus-font
-virtualbox-guest-utils
-xf86-input-elographics
-xf86-input-evdev
-xf86-input-keyboard
-xf86-input-libinput
-xf86-input-mouse
-xf86-input-vmmouse
-xf86-input-void
->manjaro grub-theme-live-manjaro
--- a/community/architect/Packages-Root
+++ b/community/architect/Packages-Root
@ -1 +0,0 @@
-../../shared/Packages-Root
--- a/community/architect/live-overlay/etc/default
+++ b/community/architect/live-overlay/etc/default
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/default
--- a/community/architect/live-overlay/etc/fstab
+++ b/community/architect/live-overlay/etc/fstab
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/fstab
--- a/community/architect/live-overlay/etc/issue
+++ b/community/architect/live-overlay/etc/issue
@ -1,30 +0,0 @@
-[H[2J
-Manjaro Live ISO (\l) - \s-\r \m
-
-
-                 \e[0m# Welcome to Manjaro #
-
-
-              \e[34m██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ████████            ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████\e[0m
-
-
-                         login:
-
-                   \e[34muser\e[0m     \e[1m\e[36mmanjaro\e[0m
-                   \e[34mpassword\e[0m \e[1m\e[36mmanjaro\e[0m
-
-          To launch the installer type: \e[1m\e[36msetup\e[0m
-
--- a/community/architect/live-overlay/etc/pam.d
+++ b/community/architect/live-overlay/etc/pam.d
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/pam.d
--- a/community/architect/live-overlay/etc/sudoers.d
+++ b/community/architect/live-overlay/etc/sudoers.d
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/sudoers.d
--- a/community/architect/profile.conf
+++ b/community/architect/profile.conf
@ -1,13 +0,0 @@
-multilib='false'
-
-nonfree_mhwd="false"
-
-addgroups="power,disk,storage,network,lp,wheel"
-
-hostname="manjaro-architect"
-
-enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep')
-
-enable_systemd_live=('manjaro-live' 'mirrors-live' 'pacman-init')
-
-# login_shell=/bin/bash
--- a/community/architect/root-overlay/etc/vconsole.conf
+++ b/community/architect/root-overlay/etc/vconsole.conf
@ -1,3 +0,0 @@
-FONT=ter-116n
-FONT_MAP=
-KEYMAP=
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@ -1,165 +1,263 @@
-adwaita-maia-gtk3
-alsa-firmware
-alsa-plugins
-alsa-utils
-atool
-bc
-bmenu
-brandr
-breeze-maia-icon-themes
-chromium
-links
-clonezilla
-compton
-dash
-dbus-x11
-dconf
-delayed-hibernation
-desktop-file-utils
-dfc
-downgrade
-dunstify
-feh
-file-roller
-mousepad
-micro-manjaro
-gnome-disk-utility
-gtk3-classic
-gtk-theme-breath
-grub-theme-manjaro-dev
-gufw
-gvfs
-hibernator
-htop
-light-locker
-lightdm-slick-greeter
-inxi
-libdnet
->basic lxappearance-gtk3
-mate-polkit
-maia-console
-manjaro-architect
-manjaro-browser-settings-native
-manjaro-awesome-settings
-manjaro-pulse
-manjaro-zsh-config
-mhwd-tui
-moc
->basic mpv
-ncdu
-nerd-fonts-terminus
+## Network
+>extra avahi
 networkmanager
-networkmanager-dmenu
-networkmanager-openconnect
-networkmanager-openvpn
-networkmanager-pptp
-networkmanager-vpnc
-openresolv
-yay
-pacui
-pavucontrol
-perl-file-mimeinfo
-poppler
-ps_mem
-pulseaudio-ctl
-ranger
-rofi
-rofi-scripts
-rootmenu
-thunar-gtk3
-thunar-archive-plugin-gtk3
-thunar-media-tags-plugin
-thunar-shares-plugin-manjaro
-thunar-volman-gtk3
-tumbler
-ffmpegthumbnailer
-speedtest-cli
-sterminal
-terminus-font
-thermald
-tree
-w3m
-xcape
-xcursor-breeze
-xdg-su
-xdg-user-dirs
-xdg-utils
-xf86-input-elographics
-xf86-input-evdev
-xf86-input-keyboard
-xf86-input-libinput
-xf86-input-mouse
-xf86-input-void
-xlogin
-light
-xorg-server
-xorg-xinit
-xorg-xprop
-xorg-xsetroot
-zathura-pdf-poppler
-gksu
-zsh-completions
+>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

-gvfs
-gvfs-afc
-gvfs-gphoto2
-gvfs-mtp
-gvfs-nfs
-gvfs-smb
-mtpfs
-udiskie
-udisks2
-lightdm-settings
-accountsservice
+## Libraries for Sound/Audio/Video
+>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
+>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
+>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
+>extra cantarell-fonts
+>extra noto-fonts               # default font
+# >extra noto-fonts-cjk  # removed to reduce iso size (-184MB)
+# >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
+
+## Package management
+>extra apparmor
+#>extra gnome-software-snap
+>extra flatpak
 pamac
-xcursor-breeze
-adwaita-maia-gtk3
-breeze-maia-icon-themes
-gtk-theme-breath
-kvantum-manjaro
-qt5ct
-manjaro-backgrounds
+>extra snapd
+>extra snapd-glib
+>extra pamac-snap-plugin
+>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 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
+accountsservice  # Enhanced user accounts handling
+
+## XFCE Group
+exo
+>extra garcon
+thunar
+>extra thunar-volman
+>extra tumbler
+>extra xfce4-power-manager
+>extra xfce4-settings
+lxterminal
+>extra xfconf
+
+## XFCE Extras
+>extra blueman
+>extra ffmpegthumbnailer  # tumbler - for video thumbnails
+>extra freetype2          # tumbler - for font thumbnails
+>extra gnome-keyring      # fix wlan segfault
+>extra libgsf             # tumbler - for ODF thumbnails
+>extra libopenraw         # tumbler - for RAW thumbnails
+>extra light-locker
 network-manager-applet
-manjaro-wallpapers-17.0
-lemonpanel
-xfce4-notifyd
-libnotify
-pa-applet
-xfce4-power-manager-gtk3
-gnome-keyring
-rxvt-unicode
-rxvt-unicode-terminfo
-highlight
+>extra menulibre
+>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

->extra compton-conf
->extra xfce4-settings-gtk3
->extra vlc-nightly
->extra manjaro-settings-manager
->extra libreoffice-fresh
->extra gparted
+## Themes
+>extra manjaro-wallpapers-18.0
+# >extra wallpapers-2018  # removed to reduce iso size (-15MB)
+# >extra wallpapers-juhraya  # removed to reduce iso size (~20MB)
+>extra gnome-themes-standard
+grub-theme-manjaro
+>extra matcha-gtk-theme
+>extra xcursor-simpleandsoft
+>extra xcursor-vanilla-dmz-aa
+>extra kvantum-manjaro
+
+## Applications
+>extra catfish
+>extra dmidecode # optional dependency inxi
+# >extra engrampa  # redundant with file-roller
+>extra firefox
+# >extra flashplugin
+>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 microsoft-office-online-jak
+#>extra freeoffice
+>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 cups
->extra cups-pdf
->extra cups-pk-helper
->extra ghostscript
->extra gsfonts
->extra gtk3-print-backends
->extra hplip
->extra splix
->extra gtk3-print-backends
->extra avahi
->extra manjaro-settings-samba
->extra blueman
->extra cups
->extra cups-pdf
->extra cups-pk-helper
->extra ghostscript
->extra gsfonts
->extra hplip
->extra splix
->extra gtk3-print-backends
->extra avahi
->extra manjaro-settings-samba
->extra blueman
+>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
+>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-libinput
+>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
+>extra timeshift
+#>extra kernel-alive
+
+## Misc
+>extra gtkhash-thunar
+manjaro-hotfixes
+>basic squashfs-tools
+>extra xiccd # enable color profile settings
+ufw  # firewall needs to be in every iso
+>extra mate-polkit
+>extra pa-applet
+>extra rofi
+>extra xcape
+>extra qt5ct
+>extra downgrade
+>extra bmenu
+>extra compton
+>extra transmission-gtk

--- a/community/awesome/Packages-Live
+++ b/community/awesome/Packages-Live
@ -1,11 +0,0 @@
-manjaro-live-skel
-mkinitcpio-nfs-utils
-nbd
->sonar sonar-calamares-branding
-squashfs-tools
-manjaro-live-systemd
->sonar thus
->manjaro grub-theme-live-manjaro
->sonar grub-theme-live-sonar
-calamares
-gparted
--- a/community/awesome/Packages-Mhwd
+++ b/community/awesome/Packages-Mhwd
@ -1,50 +0,0 @@
-#KERNEL-bbswitch
-#KERNEL-broadcom-wl
-#KERNEL-r8168
-#KERNEL-rt3562sta
-KERNEL-virtualbox-guest-modules
-libva-intel-driver
-libva-mesa-driver
-#libva-vdpau-driver
-#>multilib lib32-libva-vdpau-driver 
-libxaw
-libxpm
-libxvmc
-mesa-vdpau
-#>multilib lib32-mesa-vdpau
-#>multilib lib32-libxvmc
-#>multilib lib32-primus
-#>nonfree_default catalyst-utils
-#>nonfree_default KERNEL-catalyst
-#>nonfree_default KERNEL-nvidia
-#>nonfree_default KERNEL-nvidia-304xx
-#>nonfree_default KERNEL-nvidia-340xx
-#>nonfree_default nvidia-304xx-utils
-#>nonfree_default nvidia-340xx-utils
-#>nonfree_default nvidia-utils
-#>nonfree_multilib lib32-catalyst-utils
-#>nonfree_multilib lib32-nvidia-304xx-utils
-#>nonfree_multilib lib32-nvidia-340xx-utils
-#>nonfree_multilib lib32-nvidia-utils
-opencl-mesa
-open-vm-tools
-pangox-compat
-#primus
-#bumblebee
-virtualbox-guest-utils
-#vulkan-radeon
-#>multilib lib32-vulkan-radeon
-vulkan-intel
-#>multilib lib32-vulkan-intel
-xf86-input-vmmouse
-#xf86-video-amdgpu
-#xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-#xf86-video-nouveau
-#xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-#xf86-video-voodoo
--- a/community/awesome/Packages-Root
+++ b/community/awesome/Packages-Root
@ -1,92 +0,0 @@
-acpi
-b43-fwcutter
-bash
-btrfs-progs
-bzip2
-coreutils
-crda
-dbus-x11
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
->x86_64 efibootmgr
-exfat-utils
-f2fs-tools
-file
-filesystem
-findutils
-gawk
-gcc-libs
->multilib gcc-libs-multilib
-gettext
-glibc
-grep
-grub
-gzip
-inetutils
-intel-ucode
-iproute2
-iptables
-iputils
-ipw2100-fw
-ipw2200-fw
-jfsutils
-KERNEL
-less
-licenses
-linux-firmware
-logrotate
-lsb-release
-man-db
-manjaro-firmware
->manjaro manjaro-release
-manjaro-system
-man-pages
-memtest86+
-mhwd
-mhwd-db
-mkinitcpio-openswap
-nano
-ntfs-3g
-os-prober
-pacman
-pciutils
-pcmciautils
-perl
-procps-ng
-psmisc
-reiserfsprogs
-sed
-shadow
-s-nail
->sonar sonar-release
-sudo
-sysfsutils
-acpid
-cpupower
-cronie
-cryptsetup
-device-mapper
-dhcpcd
-haveged
-lvm2
-mdadm
-nfs-utils
-rsync
-systemd-sysvcompat
-tlp
-wpa_supplicant
-tar
-texinfo
-usbutils
-util-linux
-vi
-wget
-which
-xfsprogs
-zd1211-firmware
-zsh
--- a/community/awesome/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
+++ b/community/awesome/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
@ -1,10 +0,0 @@
-
-Section "InputClass"
-        Identifier "libinput touchpad catchall"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-        Option "AccelSpeed" "0.3"
-		Option "Tapping" "on"
-EndSection
-
--- a/community/awesome/desktop-overlay/etc/default/useradd
+++ b/community/awesome/desktop-overlay/etc/default/useradd
@ -1,6 +1,6 @@
 # useradd defaults file for ArchLinux
 # original changes by TomK
-GROUP=100
+GROUP=users
 HOME=/home
 INACTIVE=-1
 EXPIRE=
--- a/community/awesome/desktop-overlay/etc/issue
+++ b/community/awesome/desktop-overlay/etc/issue
@ -1,26 +0,0 @@
-[H[2J
-Manjaro Live ISO (\l) - \s-\r \m
-
-
-                 \e[0m# Welcome to Manjaro #
-
-
-              \e[34m██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ████████            ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████\e[0m
-
-
-
-
--- a/community/awesome/desktop-overlay/etc/lightdm/slick-greeter.conf
+++ b/community/awesome/desktop-overlay/etc/lightdm/slick-greeter.conf
@ -1,5 +1,5 @@
 [Greeter]
-background=/usr/share/backgrounds/manjarowall17_07.jpg
-theme-name=Arc-Maia-Darker
-icon-theme-name=Arc-Maia
+background=/usr/share/backgrounds/awesome-new5.png
+theme-name=Matcha-dark-sea
+icon-theme-name=Papirus-Dark-Maia
 draw-grid=false
--- a/community/awesome/desktop-overlay/etc/profile
+++ b/community/awesome/desktop-overlay/etc/profile
@ -1,31 +0,0 @@
-# /etc/profile
-
-#Set our umask
-umask 022
-
-# Set our default path
-PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.config/bspwm:$HOME/.config/bspwm/panel:$HOME/.bin"
-export PATH
-export XDG_CONFIG_HOME="$HOME/.config"
-export BSPWM_SOCKET="/tmp/bspwm-socket"
-export XDG_CONFIG_DIRS=/usr/etc/xdg:/etc/xdg
-
-# Load profiles from /etc/profile.d
-if test -d /etc/profile.d/; then
-	for profile in /etc/profile.d/*.sh; do
-		test -r "$profile" && . "$profile"
-	done
-	unset profile
-fi
-
-# Source global bash config
-if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
-	. /etc/bash.bashrc
-fi
-
-# Termcap is outdated, old, and crusty, kill it.
-unset TERMCAP
-
-# Man is much better than us at figuring this out
-unset MANPATH
-BROWSER=/usr/bin/xdg-open
--- a/community/awesome/desktop-overlay/etc/skel/.zshrc
+++ b/community/awesome/desktop-overlay/etc/skel/.zshrc
@ -1,223 +0,0 @@
-## Options section
-setopt correct                                                  # Auto correct mistakes
-setopt extendedglob                                             # Extended globbing. Allows using regular expressions with *
-setopt nocaseglob                                               # Case insensitive globbing
-setopt rcexpandparam                                            # Array expension with parameters
-setopt nocheckjobs                                              # Don't warn about running processes when exiting
-setopt numericglobsort                                          # Sort filenames numerically when it makes sense
-setopt nobeep                                                   # No beep
-setopt appendhistory                                            # Immediately append history instead of overwriting
-setopt histignorealldups                                        # If a new command is a duplicate, remove the older one
-setopt autocd                                                   # if only directory path is entered, cd there.
-
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'       # Case insensitive tab completion
-zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"         # Colored completion (different colors for dirs/files/etc)
-zstyle ':completion:*' rehash true                              # automatically find new executables in path 
-# Speed up completions
-zstyle ':completion:*' accept-exact '*(N)'
-zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path ~/.zsh/cache
-HISTFILE=~/.zhistory
-HISTSIZE=1000
-SAVEHIST=500
-WORDCHARS=${WORDCHARS//\/[&.;]}                                 # Don't consider certain characters part of the word
-
-
-## Keybindings section
-bindkey -e
-bindkey '^[[7~' beginning-of-line                               # Home key
-bindkey '^[[H' beginning-of-line                                # Home key
-if [[ "${terminfo[khome]}" != "" ]]; then
-  bindkey "${terminfo[khome]}" beginning-of-line                # [Home] - Go to beginning of line
-fi
-bindkey '^[[8~' end-of-line                                     # End key
-bindkey '^[[F' end-of-line                                     # End key
-if [[ "${terminfo[kend]}" != "" ]]; then
-  bindkey "${terminfo[kend]}" end-of-line                       # [End] - Go to end of line
-fi
-bindkey '^[[2~' overwrite-mode                                  # Insert key
-bindkey '^[[3~' delete-char                                     # Delete key
-bindkey '^[[C'  forward-char                                    # Right key
-bindkey '^[[D'  backward-char                                   # Left key
-bindkey '^[[5~' history-beginning-search-backward               # Page up key
-bindkey '^[[6~' history-beginning-search-forward                # Page down key
-
-# Navigate words with ctrl+arrow keys
-bindkey '^[Oc' forward-word                                     #
-bindkey '^[Od' backward-word                                    #
-bindkey '^[[1;5D' backward-word                                 #
-bindkey '^[[1;5C' forward-word                                  #
-bindkey '^H' backward-kill-word                                 # delete previous word with ctrl+backspace
-bindkey '^[[Z' undo                                             # Shift+tab undo last action
-
-## Alias section 
-alias cp="cp -i"                                                # Confirm before overwriting something
-alias df='df -h'                                                # Human-readable sizes
-alias free='free -m'                                            # Show sizes in MB
-alias gitu='git add . && git commit && git push'
-
-# Theming section  
-autoload -U compinit colors zcalc
-compinit -d
-colors
-
-# enable substitution for prompt
-setopt prompt_subst
-
-# Prompt (on left side) similar to default bash prompt, or redhat zsh prompt with colors
- #PROMPT="%(!.%{$fg[red]%}[%n@%m %1~]%{$reset_color%}# .%{$fg[green]%}[%n@%m %1~]%{$reset_color%}$ "
-# Maia prompt
-PROMPT="%B%{$fg[cyan]%}%(4~|%-1~/.../%2~|%~)%u%b >%{$fg[cyan]%}>%B%(?.%{$fg[cyan]%}.%{$fg[red]%})>%{$reset_color%}%b " # Print some system information when the shell is first started
-# Print a greeting message when shell is started
-echo $USER@$HOST  $(uname -srm) $(lsb_release -rcs)
-## Prompt on right side:
-#  - shows status of git when in git repository (code adapted from https://techanic.net/2012/12/30/my_git_prompt_for_zsh.html)
-#  - shows exit status of previous command (if previous command finished with an error)
-#  - is invisible, if neither is the case
-
-# Modify the colors and symbols in these variables as desired.
-GIT_PROMPT_SYMBOL="%{$fg[blue]%}±"                              # plus/minus     - clean repo
-GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$reset_color%}"
-GIT_PROMPT_SUFFIX="%{$fg[green]%}]%{$reset_color%}"
-GIT_PROMPT_AHEAD="%{$fg[red]%}ANUM%{$reset_color%}"             # A"NUM"         - ahead by "NUM" commits
-GIT_PROMPT_BEHIND="%{$fg[cyan]%}BNUM%{$reset_color%}"           # B"NUM"         - behind by "NUM" commits
-GIT_PROMPT_MERGING="%{$fg_bold[magenta]%}⚡︎%{$reset_color%}"     # lightning bolt - merge conflict
-GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"       # red circle     - untracked files
-GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%}●%{$reset_color%}"     # yellow circle  - tracked files modified
-GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}"        # green circle   - staged changes present = ready for "git push"
-
-parse_git_branch() {
-  # Show Git branch/tag, or name-rev if on detached head
-  ( git symbolic-ref -q HEAD || git name-rev --name-only --no-undefined --always HEAD ) 2> /dev/null
-}
-
-parse_git_state() {
-  # Show different symbols as appropriate for various Git repository states
-  # Compose this value via multiple conditional appends.
-  local GIT_STATE=""
-  local NUM_AHEAD="$(git log --oneline @{u}.. 2> /dev/null | wc -l | tr -d ' ')"
-  if [ "$NUM_AHEAD" -gt 0 ]; then
-    GIT_STATE=$GIT_STATE${GIT_PROMPT_AHEAD//NUM/$NUM_AHEAD}
-  fi
-  local NUM_BEHIND="$(git log --oneline ..@{u} 2> /dev/null | wc -l | tr -d ' ')"
-  if [ "$NUM_BEHIND" -gt 0 ]; then
-    GIT_STATE=$GIT_STATE${GIT_PROMPT_BEHIND//NUM/$NUM_BEHIND}
-  fi
-  local GIT_DIR="$(git rev-parse --git-dir 2> /dev/null)"
-  if [ -n $GIT_DIR ] && test -r $GIT_DIR/MERGE_HEAD; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_MERGING
-  fi
-  if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_UNTRACKED
-  fi
-  if ! git diff --quiet 2> /dev/null; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_MODIFIED
-  fi
-  if ! git diff --cached --quiet 2> /dev/null; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_STAGED
-  fi
-  if [[ -n $GIT_STATE ]]; then
-    echo "$GIT_PROMPT_PREFIX$GIT_STATE$GIT_PROMPT_SUFFIX"
-  fi
-}
-
-git_prompt_string() {
-  local git_where="$(parse_git_branch)"
-  
-  # If inside a Git repository, print its branch and state
-  [ -n "$git_where" ] && echo "$GIT_PROMPT_SYMBOL$(parse_git_state)$GIT_PROMPT_PREFIX%{$fg[yellow]%}${git_where#(refs/heads/|tags/)}$GIT_PROMPT_SUFFIX"
-  
-  # If not inside the Git repo, print exit codes of last command (only if it failed)
-  [ ! -n "$git_where" ] && echo "%{$fg[red]%} %(?..[%?])"
-}
-
-# Right prompt with exit status of previous command if not successful
- #RPROMPT="%{$fg[red]%} %(?..[%?])" 
-# Right prompt with exit status of previous command marked with ✓ or ✗
- #RPROMPT="%(?.%{$fg[green]%}✓ %{$reset_color%}.%{$fg[red]%}✗ %{$reset_color%})"
-
-
-# Color man pages
-export LESS_TERMCAP_mb=$'\E[01;32m'
-export LESS_TERMCAP_md=$'\E[01;32m'
-export LESS_TERMCAP_me=$'\E[0m'
-export LESS_TERMCAP_se=$'\E[0m'
-export LESS_TERMCAP_so=$'\E[01;47;34m'
-export LESS_TERMCAP_ue=$'\E[0m'
-export LESS_TERMCAP_us=$'\E[01;36m'
-export LESS=-r
-
-
-## Plugins section: Enable fish style features
-# Use syntax highlighting
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-# Use history substring search
-source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
-# bind UP and DOWN arrow keys to history substring search
-zmodload zsh/terminfo
-bindkey "$terminfo[kcuu1]" history-substring-search-up
-bindkey "$terminfo[kcud1]" history-substring-search-down
-bindkey '^[[A' history-substring-search-up			
-bindkey '^[[B' history-substring-search-down
-
-case $(basename "$(cat "/proc/$PPID/comm")") in
-  login)
-    	RPROMPT="%{$fg[red]%} %(?..[%?])" 
-    	alias x='startx ~/.xinitrc'      # Type name of desired desktop after x, xinitrc is configured for it
-    ;;
-  urxvt)
-    	RPROMPT='$(git_prompt_string)'
-    	# Use autosuggestion
-    	source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-    	ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-    	ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-    ;;
-  konsole|qterminal)
-    	RPROMPT='$(git_prompt_string)'
-    ;;   
-  'tmux: server')
-  	if $(ps -p$PPID| grep -q -e konsole -e qterminal); then
-    	RPROMPT='$(git_prompt_string)'
-    else
-        RPROMPT='$(git_prompt_string)'
-		## Base16 Shell color themes.
-		#possible themes: 3024, apathy, ashes, atelierdune, atelierforest, atelierhearth,
-		#atelierseaside, bespin, brewer, chalk, codeschool, colors, default, eighties, 
-		#embers, flat, google, grayscale, greenscreen, harmonic16, isotope, londontube,
-		#marrakesh, mocha, monokai, ocean, paraiso, pop (dark only), railscasts, shapesifter,
-		#solarized, summerfruit, tomorrow, twilight
-		theme="eighties"
-		#Possible variants: dark and light
-		shade="dark"
-		BASE16_SHELL="/usr/share/zsh/scripts/base16-shell/base16-$theme.$shade.sh"
-		[[ -s $BASE16_SHELL ]] && source $BASE16_SHELL
-		# Use autosuggestion
-		source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-		ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-  		ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-  	fi
-    ;;
-  *)
-  	if $(ps -p$PPID| grep -q -e konsole -e qterminal); then
-    	RPROMPT='$(git_prompt_string)'
-    else
-        RPROMPT='$(git_prompt_string)'
-		# Use autosuggestion
-		source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-		ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-  		ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-  	fi
-    ;;
-esac
-
-
-#if [[ -z "$TMUX" ]] ;then
-#    ID="$( tmux ls | grep -vm1 attached | cut -d: -f1 )" # get the id of a deattached session
-#        if [[ -z "$ID" ]] ;then # if not available create a new one
-#           tmux new-session
-#        else
-#           tmux attach-session -t "$ID" # if available attach to it
-#        fi
-#fi
-
-                                  
--- a/community/awesome/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf
+++ b/community/awesome/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf
@ -1 +0,0 @@
-kernel.printk = 3 3 3 3
--- a/community/awesome/desktop-overlay/root/.bin/scripts.txt
+++ b/community/awesome/desktop-overlay/root/.bin/scripts.txt
@ -1 +0,0 @@
-You can put your scripts in this directory and they become available to use in dmenu and command line without specifying the full path.
--- a/community/awesome/desktop-overlay/root/.config/Kvantum/kvantum.kvconfig
+++ b/community/awesome/desktop-overlay/root/.config/Kvantum/kvantum.kvconfig
@ -1,5 +0,0 @@
-[General]
-theme=KvAdaptaBreathDark
-
-[Applications]
-KvAdaptaBreath=calamares, Calamares
--- a/community/awesome/desktop-overlay/root/.config/gtk-3.0/gtk.css
+++ b/community/awesome/desktop-overlay/root/.config/gtk-3.0/gtk.css
@ -1,10 +0,0 @@
-.window-frame, .window-frame:backdrop {
-  box-shadow: 0 0 0 black;
-  border-style: none;
-  margin: 0;
-  border-radius: 0;
-}
-    
-.titlebar {
-  border-radius: 0;
-}
--- a/community/awesome/desktop-overlay/root/.config/gtk-3.0/settings.ini
+++ b/community/awesome/desktop-overlay/root/.config/gtk-3.0/settings.ini
@ -1,18 +0,0 @@
-[Settings]
-gtk-theme-name=Arc-Maia-Darker
-gtk-icon-theme-name=Arc-Maia
-gtk-font-name=xos4 Terminus 13
-gtk-cursor-theme-name=xcursor-breeze
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=0
-gtk-xft-hinting=0
-gtk-xft-hintstyle=hintmedium
-gtk-application-prefer-dark-theme=1
-gtk-decoration-layout=:menu,appmenu,close
-gtk-xft-rgba=rgb
--- a/community/awesome/desktop-overlay/root/.config/qt5ct/qt5ct.conf
+++ b/community/awesome/desktop-overlay/root/.config/qt5ct/qt5ct.conf
@ -1,25 +0,0 @@
-[Appearance]
-color_scheme_path=
-custom_palette=false
-icon_theme=Breeze-Maia-Dark
-style=kvantum
-
-[Fonts]
-fixed=@Variant(\0\0\0@\0\0\0\x1a\0x\0o\0s\0\x34\0 \0T\0\x65\0r\0m\0i\0n\0u\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0K\x10)
-general=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-
-[Interface]
-activate_item_on_single_click=1
-buttonbox_layout=3
-cursor_flash_time=1000
-dialog_buttons_have_icons=1
-double_click_interval=400
-gui_effects=General, AnimateMenu, AnimateTooltip
-menus_have_icons=true
-stylesheets=@Invalid()
-toolbutton_style=4
-underline_shortcut=1
-wheel_scroll_lines=3
-
-[SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\0\0\0\0\0\x19\0\0\x3\xde\0\0\x4\x37\0\0\0\x2\0\0\0\x1b\0\0\x3\xdc\0\0\x4\x35\0\0\0\0\0\0\0\0\a\x80)
--- a/community/awesome/desktop-overlay/usr/share/gtk-3.0/gtk.css
+++ b/community/awesome/desktop-overlay/usr/share/gtk-3.0/gtk.css
@ -1,10 +0,0 @@
-.window-frame, .window-frame:backdrop {
-  box-shadow: 0 0 0 black;
-  border-style: none;
-  margin: 0;
-  border-radius: 0;
-}
-    
-.titlebar {
-  border-radius: 0;
-}
--- a/community/awesome/desktop-overlay/usr/share/gtk-3.0/settings.ini
+++ b/community/awesome/desktop-overlay/usr/share/gtk-3.0/settings.ini
@ -1,18 +0,0 @@
-[Settings]
-gtk-theme-name=Arc-Maia-Darker
-gtk-icon-theme-name=Arc-Maia
-gtk-font-name=xos4 Terminus 13
-gtk-cursor-theme-name=xcursor-breeze
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=0
-gtk-xft-hinting=0
-gtk-xft-hintstyle=hintmedium
-gtk-application-prefer-dark-theme=1
-gtk-decoration-layout=:menu,appmenu,close
-gtk-xft-rgba=rgb
--- a/community/webdad/desktop-overlay/etc/usr/share/icons/default/index.theme
+++ b/community/webdad/desktop-overlay/etc/usr/share/icons/default/index.theme
--- a/community/awesome/live-overlay/etc/default
+++ b/community/awesome/live-overlay/etc/default
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/default
--- a/community/awesome/live-overlay/etc/fstab
+++ b/community/awesome/live-overlay/etc/fstab
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/fstab
--- a/community/awesome/live-overlay/etc/issue
+++ b/community/awesome/live-overlay/etc/issue
@ -1,31 +0,0 @@
-[H[2J
-Manjaro Live ISO (\l) - \s-\r \m
-
-
-                 \e[0m# Welcome to Manjaro #
-
-
-              \e[34m██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ████████            ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████\e[0m
-
-
-                         login:
-
-                   \e[34muser\e[0m     \e[1m\e[36mmanjaro\e[0m
-                   \e[34mpassword\e[0m \e[1m\e[36mmanjaro\e[0m
-
-          To launch the installer run: \e[1m\e[36msudo setup\e[0m
-
--- a/community/awesome/live-overlay/etc/pam.d
+++ b/community/awesome/live-overlay/etc/pam.d
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/pam.d
--- a/community/awesome/live-overlay/etc/sudoers.d
+++ b/community/awesome/live-overlay/etc/sudoers.d
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/sudoers.d
--- a/community/awesome/profile.conf
+++ b/community/awesome/profile.conf
@ -2,35 +2,52 @@
 ###### use this file in the profile ######
 ##########################################

+# use multilib packages; x86_64 only
+# multilib="true"
+
+# default displaymanager: none
+# supported; lightdm, sddm, gdm, lxdm, mdm
 displaymanager="lightdm"

-nonfree_mhwd="false"
+# Set to false to disable autologin in the livecd
+# autologin="true"

-multilib="false"
+# nonfree mhwd drivers
+# nonfree_mhwd="true"

 # use extra packages as defined in pkglist to activate a full profile
-extra="false"
+#extra="true"

 ################ install ################

+# unset defaults to given value
+# efi_boot_loader="grub"
+
 # configure calamares for netinstall
-netinstall="false"
+# netinstall="false"

 # configure calamares to use chrootcfg instead of unpackfs
-chrootcfg="false"
+# chrootcfg="false"

 # use geoip for localization
 # geoip='true'

+# default system shell is bash
+# use /etc/defaults/useradd by supplying a space " "
+# use the full path e.g. "/bin/zsh"
+user_shell=/bin/zsh
+
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'avahi-daemon' 'add-autologin-group')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'cups' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
 disable_systemd=('pacman-init')

-# unset defaults to given values,
-# names must match openrc service names
-# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager' 'tlp' 'tlp-sleep' 'xdm')
-# disable_openrc=()
+# 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"

 # the same workgroup name if samba is used
 # smb_workgroup=""
@ -51,14 +68,11 @@ hostname="manjaro-awesome"
 login_shell=/bin/zsh

 # unset defaults to given values
-# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel"
+# 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
-# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'pacman-boot')
+# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
+disable_systemd_live=('tlp' 'tlp-sleep')

-# unset defaults to given values,
-# names must match openrc service names
-# services in enable_openrc array don't need to be listed here
-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'pacman-boot')
--- a/community/bspwm-mate/Packages-Desktop
+++ b/community/bspwm-mate/Packages-Desktop
@ -1,172 +0,0 @@
-# Applications
-#thunar-gtk3
-#thunar-archive-plugin-gtk3
-#thunar-media-tags-plugin
-#thunar-shares-plugin-manjaro
-#thunar-volman-gtk3
-#tumbler
-ffmpegthumbnailer
-highlight
-#mousepad
-#xreader
-#eom
-eog
-evince
-nautilus-typeahead
-gedit
-gedit-plugins
-gedit-code-assistance
-gnome-disk-utility
-vlc-nightly
-transmission-gtk
-sterminal
-pavucontrol
-chromium
-gufw
-gnome-screenshot
->extra libreoffice-fresh
->extra gparted
->extra gimp
->extra thunderbird
-# Desktop
-alsa-firmware
-alsa-plugins
-alsa-utils
-bspwm-manjaro
-bspwm-ruler
-bspwm-scripts
-bspwm-wallpapers
-compton
-compton-conf
-dbus-x11
-dunstify
-desktop-file-utils
-dconf-editor
-feh
-gnome-keyring
-gksu
-gtk3-classic
-android-tools
-android-udev
-gvfs
-gvfs-afc
-gvfs-gphoto2
-gvfs-mtp
-gvfs-nfs
-gvfs-smb
-mtpfs
-udiskie
-udisks2
-light
-lightdm-slick-greeter
-light-locker
-lightdm-settings
-accountsservice
-libgsf
-manjaro-hello
-manjaro-settings-manager
-mate-control-center
-mate-tweak
-manjaro-mate-panel-layout
-mate-polkit
-mate-applets
-mate-notification-daemon
-mate-session-manager
-mate-power-manager
-mate-netbook
-mate-menus
-manjaro-bspwm-mate-settings
-manjaro-browser-settings-native
-mygtkmenui
-mozo
-network-manager-applet
-pa-applet
-pamac
-pulseaudio-ctl
-rofi-scripts
-rootmenu
-sxhkd
-terminus-font
-thermald
-xcape
-xdg-su
-xdg-user-dirs
-xdg-utils
-xf86-input-elographics
-xf86-input-evdev
-xf86-input-keyboard
-xf86-input-libinput
-xf86-input-mouse
-xf86-input-void
-xorg-server
-xorg-xinit
-xorg-xprop
-xorg-xsetroot
-xdg-user-dirs-gtk
-py-corners
-skippy-xd
-
-
-# Terminal
-dash
-atool
-bc
-bmenu
-brandr
-links
-clonezilla
-dconf
-delayed-hibernation
-dfc
-downgrade
-hibernator
-htop
-inxi
-libdnet
-limepanel
-maia-console
-manjaro-architect
-manjaro-zsh-config
-moc
-ncdu
-nerd-fonts-terminus
-yay
-pacui
-perl-file-mimeinfo
-poppler
-ps_mem
-ranger
-speedtest-cli
-tree
-w3m
-
-# Printing, drivers and networking
->extra cups
->extra cups-pdf
->extra cups-pk-helper
->extra ghostscript
->extra gsfonts
->extra gtk3-print-backends
->extra hplip
->extra splix
->extra gtk3-print-backends
->extra avahi
->extra manjaro-settings-samba
->extra blueman
-networkmanager
-networkmanager-dmenu
-networkmanager-openconnect
-networkmanager-openvpn
-networkmanager-pptp
-networkmanager-vpnc
-openresolv
-manjaro-pulse
-
-# Themes
-xcursor-breeze
-adwaita-maia-gtk3
-breeze-maia-icon-themes
-gtk-theme-breath
-kvantum-manjaro
-qt5ct
-
--- a/community/bspwm-mate/Packages-Live
+++ b/community/bspwm-mate/Packages-Live
@ -1,12 +0,0 @@
-gparted
-manjaro-live-skel
-mkinitcpio-nfs-utils
-nbd
->sonar sonar-calamares-branding
-squashfs-tools
-manjaro-live-systemd
->sonar thus
->manjaro grub-theme-live-manjaro
->sonar grub-theme-live-sonar
-gsmartcontrol
-calamares
--- a/community/bspwm-mate/Packages-Mhwd
+++ b/community/bspwm-mate/Packages-Mhwd
@ -1,50 +0,0 @@
-#KERNEL-bbswitch
-#KERNEL-broadcom-wl
-#KERNEL-r8168
-#KERNEL-rt3562sta
-KERNEL-virtualbox-guest-modules
-libva-intel-driver
-libva-mesa-driver
-#libva-vdpau-driver
-#>multilib lib32-libva-vdpau-driver 
-libxaw
-libxpm
-libxvmc
-mesa-vdpau
-#>multilib lib32-mesa-vdpau
-#>multilib lib32-libxvmc
-#>multilib lib32-primus
-#>nonfree_default catalyst-utils
-#>nonfree_default KERNEL-catalyst
-#>nonfree_default KERNEL-nvidia
-#>nonfree_default KERNEL-nvidia-304xx
-#>nonfree_default KERNEL-nvidia-340xx
-#>nonfree_default nvidia-304xx-utils
-#>nonfree_default nvidia-340xx-utils
-#>nonfree_default nvidia-utils
-#>nonfree_multilib lib32-catalyst-utils
-#>nonfree_multilib lib32-nvidia-304xx-utils
-#>nonfree_multilib lib32-nvidia-340xx-utils
-#>nonfree_multilib lib32-nvidia-utils
-opencl-mesa
-open-vm-tools
-pangox-compat
-#primus
-#bumblebee
-virtualbox-guest-utils
-#vulkan-radeon
-#>multilib lib32-vulkan-radeon
-vulkan-intel
-#>multilib lib32-vulkan-intel
-xf86-input-vmmouse
-#xf86-video-amdgpu
-#xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-#xf86-video-nouveau
-#xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-#xf86-video-voodoo
--- a/community/bspwm-mate/Packages-Root
+++ b/community/bspwm-mate/Packages-Root
@ -1,92 +0,0 @@
-acpi
-b43-fwcutter
-bash
-btrfs-progs
-bzip2
-coreutils
-crda
-dbus-x11
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
->x86_64 efibootmgr
-exfat-utils
-f2fs-tools
-file
-filesystem
-findutils
-gawk
-gcc-libs
->multilib gcc-libs-multilib
-gettext
-glibc
-grep
-grub
-gzip
-inetutils
-intel-ucode
-iproute2
-iptables
-iputils
-ipw2100-fw
-ipw2200-fw
-jfsutils
-KERNEL
-less
-licenses
-linux-firmware
-logrotate
-lsb-release
-man-db
-manjaro-firmware
->manjaro manjaro-release
-manjaro-system
-man-pages
-memtest86+
-mhwd
-mhwd-db
-mkinitcpio-openswap
-nano
-ntfs-3g
-os-prober
-pacman
-pciutils
-pcmciautils
-perl
-procps-ng
-psmisc
-reiserfsprogs
-sed
-shadow
-s-nail
->sonar sonar-release
-sudo
-sysfsutils
-acpid
-cpupower
-cronie
-cryptsetup
-device-mapper
-dhcpcd
-haveged
-lvm2
-mdadm
-nfs-utils
-rsync
-systemd-sysvcompat
-tlp
-wpa_supplicant
-tar
-texinfo
-usbutils
-util-linux
-vi
-wget
-which
-xfsprogs
-zd1211-firmware
-zsh
--- a/community/bspwm-mate/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
+++ b/community/bspwm-mate/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
@ -1,10 +0,0 @@
-
-Section "InputClass"
-        Identifier "libinput touchpad catchall"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-        Option "AccelSpeed" "0.3"
-		Option "Tapping" "on"
-EndSection
-
--- a/community/bspwm-mate/desktop-overlay/etc/issue
+++ b/community/bspwm-mate/desktop-overlay/etc/issue
@ -1,26 +0,0 @@
-[H[2J
-Manjaro Live ISO (\l) - \s-\r \m
-
-
-                 \e[0m# Welcome to Manjaro #
-
-
-              \e[34m██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ████████            ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████\e[0m
-
-
-
-
--- a/community/bspwm-mate/desktop-overlay/etc/lightdm/lightdm.conf
+++ b/community/bspwm-mate/desktop-overlay/etc/lightdm/lightdm.conf
@ -1,169 +0,0 @@
-#
-# General configuration
-#
-# start-default-seat = True to always start one seat if none are defined in the configuration
-# greeter-user = User to run greeter as
-# minimum-display-number = Minimum display number to use for X servers
-# minimum-vt = First VT to run displays on
-# lock-memory = True to prevent memory from being paged to disk
-# user-authority-in-system-dir = True if session authority should be in the system location
-# guest-account-script = Script to be run to setup guest account
-# logind-check-graphical = True to on start seats that are marked as graphical by logind
-# log-directory = Directory to log information to
-# run-directory = Directory to put running state in
-# cache-directory = Directory to cache to
-# sessions-directory = Directory to find sessions
-# remote-sessions-directory = Directory to find remote sessions
-# greeters-directory = Directory to find greeters
-# backup-logs = True to move add a .old suffix to old log files when opening new ones
-# dbus-service = True if LightDM provides a D-Bus service to control it
-#
-[LightDM]
-#start-default-seat=true
-#greeter-user=lightdm
-#minimum-display-number=0
-#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799
-#lock-memory=true
-#user-authority-in-system-dir=false
-#guest-account-script=guest-account
-#logind-check-graphical=false
-#log-directory=/var/log/lightdm
-run-directory=/run/lightdm
-#cache-directory=/var/cache/lightdm
-#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
-#remote-sessions-directory=/usr/share/lightdm/remote-sessions
-#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters
-#backup-logs=true
-#dbus-service=true
-
-#
-# Seat configuration
-#
-# Seat configuration is matched against the seat name glob in the section, for example:
-# [Seat:*] matches all seats and is applied first.
-# [Seat:seat0] matches the seat named "seat0".
-# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
-#
-# type = Seat type (local, xremote, unity)
-# pam-service = PAM service to use for login
-# pam-autologin-service = PAM service to use for autologin
-# pam-greeter-service = PAM service to use for greeters
-# xserver-backend = X backend to use (mir)
-# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
-# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
-# xserver-config = Config file to pass to X server
-# xserver-layout = Layout to pass to X server
-# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
-# xserver-share = True if the X server is shared for both greeter and session
-# xserver-hostname = Hostname of X server (only for type=xremote)
-# xserver-display-number = Display number of X server (only for type=xremote)
-# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
-# xdmcp-port = XDMCP UDP/IP port to communicate on
-# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
-# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
-# unity-compositor-timeout = Number of seconds to wait for compositor to start
-# greeter-session = Session to load for greeter
-# greeter-hide-users = True to hide the user list
-# greeter-allow-guest = True if the greeter should show a guest login option
-# greeter-show-manual-login = True if the greeter should offer a manual login option
-# greeter-show-remote-login = True if the greeter should offer a remote login option
-# user-session = Session to load for users
-# allow-user-switching = True if allowed to switch users
-# allow-guest = True if guest login is allowed
-# guest-session = Session to load for guests (overrides user-session)
-# session-wrapper = Wrapper script to run session with
-# greeter-wrapper = Wrapper script to run greeter with
-# guest-wrapper = Wrapper script to run guest sessions with
-# display-setup-script = Script to run when starting a greeter session (runs as root)
-# display-stopped-script = Script to run after stopping the display server (runs as root)
-# greeter-setup-script = Script to run when starting a greeter (runs as root)
-# session-setup-script = Script to run when starting a user session (runs as root)
-# session-cleanup-script = Script to run when quitting a user session (runs as root)
-# autologin-guest = True to log in as guest by default
-# autologin-user = User to log in with by default (overrides autologin-guest)
-# autologin-user-timeout = Number of seconds to wait before loading default user
-# autologin-session = Session to load for automatic login (overrides user-session)
-# autologin-in-background = True if autologin session should not be immediately activated
-# exit-on-failure = True if the daemon should exit if this seat fails
-#
-[Seat:*]
-#type=local
-#pam-service=lightdm
-#pam-autologin-service=lightdm-autologin
-#pam-greeter-service=lightdm-greeter
-#xserver-backend=
-#xserver-command=X
-#xmir-command=Xmir
-#xserver-config=
-#xserver-layout=
-#xserver-allow-tcp=false
-#xserver-share=true
-#xserver-hostname=
-#xserver-display-number=
-#xdmcp-manager=
-#xdmcp-port=177
-#xdmcp-key=
-#unity-compositor-command=unity-system-compositor
-#unity-compositor-timeout=60
-greeter-session=lightdm-slick-greeter
-#greeter-hide-users=false
-#greeter-allow-guest=true
-#greeter-show-manual-login=false
-#greeter-show-remote-login=true
-#user-session=default
-#allow-user-switching=true
-#allow-guest=true
-#guest-session=
-session-wrapper=/etc/lightdm/Xsession
-#greeter-wrapper=
-#guest-wrapper=
-#display-setup-script=
-#display-stopped-script=
-#greeter-setup-script=
-#session-setup-script=
-#session-cleanup-script=
-#autologin-guest=false
-#autologin-user=
-#autologin-user-timeout=0
-#autologin-in-background=false
-#autologin-session=
-#exit-on-failure=false
-
-#
-# XDMCP Server configuration
-#
-# enabled = True if XDMCP connections should be allowed
-# port = UDP/IP port to listen for connections on
-# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
-# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
-# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
-#
-# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
-# it can be a word and the first 7 characters are used as the key.
-#
-[XDMCPServer]
-#enabled=false
-#port=177
-#listen-address=
-#key=
-#hostname=
-
-#
-# VNC Server configuration
-#
-# enabled = True if VNC connections should be allowed
-# command = Command to run Xvnc server with
-# port = TCP/IP port to listen for connections on
-# listen-address = Host/address to listen for VNC connections (use all addresses if not present)
-# width = Width of display to use
-# height = Height of display to use
-# depth = Color depth of display to use
-#
-[VNCServer]
-#enabled=false
-#command=Xvnc
-#port=5900
-#listen-address=
-#width=1024
-#height=768
-#depth=8
--- a/community/bspwm-mate/desktop-overlay/etc/lightdm/slick-greeter.conf
+++ b/community/bspwm-mate/desktop-overlay/etc/lightdm/slick-greeter.conf
@ -1,11 +0,0 @@
-[Greeter]
-background=/usr/share/backgrounds/manjarowall17_07.jpg
-background-color=#2e3d44
-draw-grid=false
-theme-name=Breath-Dark
-icon-theme-name=Breeze_maia-Dark
-cursor-theme-name=xcursor-breeze
-font-name='Noto Sans 12'
-xft-antialias=true
-xft-hintstyle=hintfull
-enable-hidpi=auto
--- a/community/bspwm-mate/desktop-overlay/etc/profile
+++ b/community/bspwm-mate/desktop-overlay/etc/profile
@ -1,31 +0,0 @@
-# /etc/profile
-
-#Set our umask
-umask 022
-
-# Set our default path
-PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.config/bspwm:$HOME/.config/bspwm/panel:$HOME/.bin"
-export PATH
-export XDG_CONFIG_HOME="$HOME/.config"
-export BSPWM_SOCKET="/tmp/bspwm-socket"
-export XDG_CONFIG_DIRS=/usr/etc/xdg:/etc/xdg
-
-# Load profiles from /etc/profile.d
-if test -d /etc/profile.d/; then
-	for profile in /etc/profile.d/*.sh; do
-		test -r "$profile" && . "$profile"
-	done
-	unset profile
-fi
-
-# Source global bash config
-if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
-	. /etc/bash.bashrc
-fi
-
-# Termcap is outdated, old, and crusty, kill it.
-unset TERMCAP
-
-# Man is much better than us at figuring this out
-unset MANPATH
-BROWSER=/usr/bin/xdg-open
--- a/community/bspwm-mate/desktop-overlay/etc/skel/.config/bspwm/bspwmrc
+++ b/community/bspwm-mate/desktop-overlay/etc/skel/.config/bspwm/bspwmrc
@ -1,114 +0,0 @@
-#! /bin/sh
-gap=10
-PANEL_HEIGHT=25
-export gap
-export PANEL_HEIGHT
-
-#This creates negative padding equal to window gap so that gaps are shown only between windows and not on desktop edges.
-bspc config window_gap $gap;
-bspc config top_padding $(($PANEL_HEIGHT-$gap))
-bspc config left_padding -$gap
-bspc config right_padding -$gap
-bspc config bottom_padding -$gap
-
-#Various settings
-bspc config gapless_monocle     false #Default setup uses negative padding, and gapless monocle looks really weird like that
-bspc config borderless_monocle  true
-bspc config single_monocle true
-bspc config paddingless_monocle false
-#bspc config ignore_ewmh_focus      true
-#bspc config initial_polarity second_child
-bspc config remove_disabled_monitors true
-bspc config remove_unplugged_monitors true
-## Honor size hints: do not make windows smaller than they wish to be
-#bspc config honor_size_hints true 
-
-##Color settings
-bspc config focused_border_color "#1ABB9B"
-bspc config normal_border_color "#2D2D2D"
-#"#000000"
-bspc config presel_feedback_color "#1ABB9B"
-#"#8F3724"
-bspc config border_width 2
-
-bspc config focus_follows_pointer true
-#bspc config pointer_follows_focus true #Some keybindings automatically enable and disable this setting
-
-#Settings for manual splitting
-bspc config split_ratio         0.52
-
-#bspc monitor -d i ii iii iv v vi vii viii ix x
-#bspc monitor -d One Two Three Four Five Six Seven Eight Nine Ten
-#bspc monitor -d I II III IV V VI VII VIII IX X
-#bspc monitor -d • • • • • • • • • •
-bspc monitor -d I II III IV V VI
-
-###This creates and names desktops for multiple monitors.
-#workspaces_multimonitor &
-
-bspc rule -a screenkey --unmanage
-bspc rule -a gcolor2 state=floating center=true
-bspc rule -a lxappearance state=floating center=true
-bspc rule -a gmrun state=floating center=true
-bspc rule -a lxterminal state=floating center=true sticky=true
-bspc rule -a Manjaro-hello state=floating center=true
-#bspc rule -a urxvt state=floating center=true
-bspc rule -a viewnior state=floating center=true
-bspc rule -a file-roller state=floating center=true
-bspc rule -a floaterm state=floating center=true
-bspc rule -a spotify state=pseudo_tiled
-#bspc rule -a nautilus state=pseudo_tiled
-#bspc rule -a skype state=pseudo_tiled
-bspc rule -a file-roller state=pseudo_tiled
-bspc rule -a transmission-gtk state=pseudo_tiled
-bspc rule -a conky sticky=on manage=off lower=on
-bspc rule -a astime sticky=on
-bspc rule -a yad state=floating
-bspc rule -a Docky layer=above border=off manage=on
-bspc rule -a Plank layer=above border=off manage=on
-bspc rule -a wbar layer=above
-bspc rule -a dockbarx layer=above
-bspc rule -a google-chrome-unstable private=on
-bspc rule -a google-chrome-stable private=on
-bspc rule -a chromium private=on
-bspc rule -a firefox private=on
-bspc rule -a midori private=on
-bspc rule -a gnome-pie border=off manage=off
-bspc rule -a wpa_gui state=pseudo_tiled
-bspc rule -a libreoffice state=tiled
-bspc rule -a '*:libreofficedev' state=tiled
-bspc rule -a '*:soffice' state=tiled
-#bspc rule -a firefox desktop=I
-#bspc rule -a calibre desktop=II
-#bspc rule -a geany desktop=II
-#bspc rule -a deluge desktop=III
-bspc rule -a 9menu border=off manage=off
-bspc rule -a tint2 border=off manage=off
-#bspc desktop I --layout monocle
-#bspc desktop II --layout monocle
-
-
-##  Autogap adjusts windowgap automatically according to the number of
-##  windows on the desktop. Using it disables negative window gap.
-#autogap &
-
-##  This script balances all windows when new one is spawned 
-#euclid_balancer &
-
-##Edge-switcher switches to next workspace when moves moves to the 
-##edge of the monitor (behavior similar to enlightenment)
-#edge-switcher &
-
-###External rules
-##Pseudo automatic mode: always splits focused window when opening new window
-bspc config external_rules_command /usr/bin/pseudo_automatic_mode
-##Adjust new window: splits biggest windows to keep windows about the same size
-#bspc config external_rules_command /usr/bin/adjust-new-window
-
-##Autostart apps
-#Keybindings daemon
-#sxhkd &
-#Source autostartfile. Uncomment this if you use bspwm-git
-#. $HOME/.config/bspwm/autostart
-xsetroot -cursor_name left_ptr &
-bspc config top_padding 16 &
--- a/community/bspwm-mate/desktop-overlay/etc/skel/.config/sxhkd/sxhkdrc
+++ b/community/bspwm-mate/desktop-overlay/etc/skel/.config/sxhkd/sxhkdrc
@ -1,327 +0,0 @@
-# bspwm hotkeys
-#
-# Cleanly quit bspwm
-#super + shift + q
-#	bspc quit 1 && pkill lemonpanel && pkill lemonbar
-
-# Show keybindings
-super + F1
-	$TERMINAL -e keybindings.sh
-#
-# Window manipulation
-# ______________
-
-# Close window
-super + x
-	bspc  node -c
-
-# Kill window
-super + shift + x
-	bspc  node -k
-
-# Toggle tiling mode of window
-super + shift + t
-	bspc node -t {pseudo_tiled,tiled}
-super + t
-	{bspc node -t floating && window-placer $(bspc query -T -d | grep -o '"state":"floating"' | wc -l),bspc node -t tiled}
-# Force all windows of the desktop to tile
-#super + ctrl + t
-#	bspcp tile
-# Force all windows of the desktop to float and arrange them
-#super + ctrl + shift + t
-#	bspcp float
-	
-# Toggle fullscreen
-super + shift + f 
-	bspc node -t {fullscreen,tiled}	
-
-# Try to keep size and position of the selected window
-super + o
-	bspc node -g private
-
-# Make window sticky
-super + i
-	bspc node -g sticky
-
-# Lock a window from closing
-super + Escape
-	bspc node -g locked 
-
-### Map or unmap windows (functional equivalent of "minimize")
-#super + c
-#    whid dmenu
-
-#super + shift + c
-#    whid hide
-
-#super + ctrl + c
-#    whid last
-
-#
-# Window moving and splitting
-# ______________    
-
-# Autopresel (split window in its largest dimension)
-super + ctrl + Return
-	auto-presel
-
-#ctrl + space
-#	auto-presel
-	
-# Presel window for splitting in certain direction
-alt + ctrl + {a,s,w,d}
-	bspc node -p \~{west,south,north,east} -i
-
-alt + ctrl + {h,j,k,l}
-	bspc node -p \~{west,south,north,east}
-
-alt + ctrl + {Left,Down,Up,Right}
-	bspc node -p \~{west,south,north,east}
-
-# Presel the desktop for splitting in certain direction
-#alt + shift + {a,s,w,d}
-#	bspc node @/ -p \~{west,south,north,east}
-
-#alt + shift + {h,j,k,l}
-#	bspc node @/ -p \~{west,south,north,east}
-
-#alt + shift + {Left,Down,Up,Right}
-#	bspc node @/ -p \~{west,south,north,east}
-# Set splitting ratio of windows
-alt + ctrl + {1-9}
-	bspc node -o 0.{1-9}
-		
-# Move current window to largest space or preselected area if there is one.
-super + Return
-    windowpromoter
-
-# Create a new "master area", splitting the whole desktop instead of just windows.
-#alt + Return
-#	bspc node -n @/
-	
-# go (Shift=move) to desktop (and focus the monitor that the desktop is located on. Bspwm style)
-super + {_,shift + }{1-9,0}
-    bspc {desktop -f,node -d} ^{1-9,10}
-
-## Alternative: i3 style behavior (focus nth, desktop of the focused monitor)
-#super + {1-9,0}
-#	focusdesktopofthismonitor {1-9}
-#super + shift + {1-9,0}
-#	movetodesktopofthismonitor {1-9,10}
-
-## Another alternative: xmonad style desktops. You have 10 desktops shared between all monitors,
-## and focusing a desktop focuses it on the currently focused monitor
-#super + {1-9,0}
-#	summondesktop.sh {1-9,10}
-#super + shift + {1-9,0}
-#	bspc node -d ^{1-9,10}
-
-# Select previous / next desktop
-super + {m,n}
-	bspc desktop -f {prev.occupied,next.occupied} 
-
-# cycle windows
-alt + {_,shift + }Tab
-    bspc node -f {next,prev}
-
-# Go to specific window
-#super + Tab
-#	WindowSelector
-	
-#Focus windows by direction, works with multihead
-super +  {a,s,w,d}
-    focusmover {west,south,north,east}
-
-super +  {h,j,k,l}
-    focusmover {west,south,north,east}
-
-super +  {Left,Down,Up,Right}
-    focusmover {west,south,north,east}
-        	
-# Move tiled windows. Moving a tiled window to 
-# preselected one moves into preselection instead. 
-# Moving out of the screen should move the window to next monitor if possible
-super + shift + {a,s,w,d}
-	windowgrabber {west,south,north,east}
-
-super + shift + {h,j,k,l}
-	windowgrabber {west,south,north,east}
-	
-# Different style of movement: transplant into window in chosen direction
-super + shift + {Left,Down,Up,Right}
-	euclid_mover {west,south,north,east}
-
-#resize windows
-super + ctrl + {a,s,w,d}
-	bspwm_resize.sh {west,south,north,east}
-
-super + ctrl + {h,j,k,l}
-	bspwm_resize.sh {west,south,north,east}
-	
-super + ctrl + {Left,Down,Up,Right}
-	bspwm_resize.sh {west,south,north,east}
-
-#
-# Layout manipulation/desktop level controls
-# ______________    
-
-# Toggle monocle mode
-super + f 
-	bspc desktop -l next
-	
-# Balance tree
-super + b
-	bspc node @/ -B
-
-# Balance brother node. If you do this on biggest window of the desktop, it usually means balancing all windows with except the biggest.
-super + alt + b
-	bspc node @brother -B
-	
-# Undo balancing (equalize windows)
-super + ctrl + b
-	bspc node @/ -E
-
-# Toggle automatic balancing of windows
-alt + b
-	euclid_balancer
-
-# Mirror and flip leaves of tree
-super + {comma,period}
-	bspc node @/ -F {horizontal,vertical}
-	
-# Rotate leaves of tree
-super + shift + {comma,period}
-	bspc node @/ -R {90,270}
-
-# Change window gap
-
-#super + g
-#	bspc config -d focused window_gap {$gap,$(($gap+$gap)),$(($gap+$gap+$gap))}
-
-super + button{4,5}
-	bspc config -d focused window_gap $((`bspc config -d focused window_gap` {+,-} 2 ))
-#
-# mouse bindings
-# __________________
-
-~button1
-	DidIClickDesktop.sh && mygtkmenui -- .config/GTKmenu/LaunchMenu
-
-~button2
-	DidIClickDesktop.sh && mygtkmenui -- .config/GTKmenu/BspwmWindowMenui
-		
-~button3
-	DidIClickDesktop.sh && mygtkmenui -- .config/GTKmenu/BspwmDesktopMenui
-
-# Switch workspace by scrolling on the desktop. Causes scrolling issues on some systems.
-~button4
-	DidIClickDesktop.sh && bspc desktop -f next
-~button5
-	DidIClickDesktop.sh && bspc desktop -f prev
-	
-### Add or remove desktops by scrolling
-super + ctrl + button5
-    bspcp dsktp rm
-
-super + ctrl + button4
-    bspcp dsktp add
-
-# Spawn applications popup menu and manually tile selected 
-# app where your mouse was when you opened the menu. Smartsplit only chooses
-# biggest dimension of the window, MouseLaunch only cares which edge is closer.
-# mod5 is alt_gr (first key right from space) on most keyboards. 
-mod5 + @button1
-    MouseLaunch ; mygtkmenui -- .config/GTKmenu/LaunchMenu
-#	smartsplit ; dboxmenu
-
-# Spawn window manipulation menu
-# Mod1 is alt
-#    BspwmWindowMenu
-#mod1 + @button1
-#    mygtkmenui -- .config/GTKmenu/BspwmWindowMenui
-
-    
-#
-# spawn programs
-#
-
-# run applications
-super + space
-	dmenu_recent -fn 'xos4 Terminus:size=15' -i -l 14 -w 600 -y $PANEL_HEIGHT
-
-super + shift + space
-	rofi -show
-
-super + p
-	dmenu_recent -h $PANEL_HEIGHT -fn 'xos4 Terminus:size=15' -i
-
-super + shift + Return
-	default-terminal
-super + z
-	default-terminal
-
-super + shift + z
-	open-terminal-here
-	
-super + r
-	rofi-finder.sh
-
-super + shift + b
-	$BROWSER
-    		
-super + e
-	nautilus -w
-
-super + shift + e
-	$TERMINAL -e ranger
-
-Print
-	scrot
-
-	
-#
-# Media keys
-#
-
-XF86AudioRaiseVolume
-	pulseaudio-ctl up && \ 
-	volnoti-show $(pulseaudio-ctl full-status | cut -d" " -f1)
-
-XF86AudioLowerVolume
-	pulseaudio-ctl down && \ 
-	volnoti-show $(pulseaudio-ctl full-status | cut -d" " -f1)
-
-XF86AudioMute
-	pulseaudio-ctl mute && \ 
-	[ "$(pulseaudio-ctl full-status | cut -d" " -f2)" = no ] && volnoti-show $(pulseaudio-ctl full-status | cut -d" " -f1) || volnoti-show -m
-	
-XF86MonBrightnessDown
- light -U 5 && \
- volnoti-show -s /usr/share/pixmaps/volnoti/display-brightness-symbolic.svg $(light -G | sed 's/\..*//')
-
-XF86MonBrightnessUp
- light -A 5 && \
- volnoti-show -s /usr/share/pixmaps/volnoti/display-brightness-symbolic.svg $(light -G | sed 's/\..*//')
- 
-
-XF86Sleep
-	systemctl suspend
-
-# make sxhkd reload its configuration files:
-super + shift + Escape
-	pkill -USR1 -x sxhkd
-
-# In case bspwmrc fails to execute/you wish have plugged in a new monitor
-super + shift + r
-	bspwmrc
-#edit this file
-alt + ctrl + space
-	$GUI_EDITOR ~/.config/sxhkd/sxhkdrc
-# Toggle compositing
-super + ctrl + space
-	{pkill compton ,\
-	compton -b }
-
-# Remove receptacles
-super + BackSpace
-  for i in $(bspc query -N -n .leaf.!window.local); do bspc node $i -k; done
--- a/community/bspwm-mate/desktop-overlay/etc/skel/.zshrc
+++ b/community/bspwm-mate/desktop-overlay/etc/skel/.zshrc
@ -1,223 +0,0 @@
-## Options section
-setopt correct                                                  # Auto correct mistakes
-setopt extendedglob                                             # Extended globbing. Allows using regular expressions with *
-setopt nocaseglob                                               # Case insensitive globbing
-setopt rcexpandparam                                            # Array expension with parameters
-setopt nocheckjobs                                              # Don't warn about running processes when exiting
-setopt numericglobsort                                          # Sort filenames numerically when it makes sense
-setopt nobeep                                                   # No beep
-setopt appendhistory                                            # Immediately append history instead of overwriting
-setopt histignorealldups                                        # If a new command is a duplicate, remove the older one
-setopt autocd                                                   # if only directory path is entered, cd there.
-
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'       # Case insensitive tab completion
-zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"         # Colored completion (different colors for dirs/files/etc)
-zstyle ':completion:*' rehash true                              # automatically find new executables in path 
-# Speed up completions
-zstyle ':completion:*' accept-exact '*(N)'
-zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path ~/.zsh/cache
-HISTFILE=~/.zhistory
-HISTSIZE=1000
-SAVEHIST=500
-WORDCHARS=${WORDCHARS//\/[&.;]}                                 # Don't consider certain characters part of the word
-
-
-## Keybindings section
-bindkey -e
-bindkey '^[[7~' beginning-of-line                               # Home key
-bindkey '^[[H' beginning-of-line                                # Home key
-if [[ "${terminfo[khome]}" != "" ]]; then
-  bindkey "${terminfo[khome]}" beginning-of-line                # [Home] - Go to beginning of line
-fi
-bindkey '^[[8~' end-of-line                                     # End key
-bindkey '^[[F' end-of-line                                     # End key
-if [[ "${terminfo[kend]}" != "" ]]; then
-  bindkey "${terminfo[kend]}" end-of-line                       # [End] - Go to end of line
-fi
-bindkey '^[[2~' overwrite-mode                                  # Insert key
-bindkey '^[[3~' delete-char                                     # Delete key
-bindkey '^[[C'  forward-char                                    # Right key
-bindkey '^[[D'  backward-char                                   # Left key
-bindkey '^[[5~' history-beginning-search-backward               # Page up key
-bindkey '^[[6~' history-beginning-search-forward                # Page down key
-
-# Navigate words with ctrl+arrow keys
-bindkey '^[Oc' forward-word                                     #
-bindkey '^[Od' backward-word                                    #
-bindkey '^[[1;5D' backward-word                                 #
-bindkey '^[[1;5C' forward-word                                  #
-bindkey '^H' backward-kill-word                                 # delete previous word with ctrl+backspace
-bindkey '^[[Z' undo                                             # Shift+tab undo last action
-
-## Alias section 
-alias cp="cp -i"                                                # Confirm before overwriting something
-alias df='df -h'                                                # Human-readable sizes
-alias free='free -m'                                            # Show sizes in MB
-alias gitu='git add . && git commit && git push'
-
-# Theming section  
-autoload -U compinit colors zcalc
-compinit -d
-colors
-
-# enable substitution for prompt
-setopt prompt_subst
-
-# Prompt (on left side) similar to default bash prompt, or redhat zsh prompt with colors
- #PROMPT="%(!.%{$fg[red]%}[%n@%m %1~]%{$reset_color%}# .%{$fg[green]%}[%n@%m %1~]%{$reset_color%}$ "
-# Maia prompt
-PROMPT="%B%{$fg[cyan]%}%(4~|%-1~/.../%2~|%~)%u%b >%{$fg[cyan]%}>%B%(?.%{$fg[cyan]%}.%{$fg[red]%})>%{$reset_color%}%b " # Print some system information when the shell is first started
-# Print a greeting message when shell is started
-echo $USER@$HOST  $(uname -srm) $(lsb_release -rcs)
-## Prompt on right side:
-#  - shows status of git when in git repository (code adapted from https://techanic.net/2012/12/30/my_git_prompt_for_zsh.html)
-#  - shows exit status of previous command (if previous command finished with an error)
-#  - is invisible, if neither is the case
-
-# Modify the colors and symbols in these variables as desired.
-GIT_PROMPT_SYMBOL="%{$fg[blue]%}±"                              # plus/minus     - clean repo
-GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$reset_color%}"
-GIT_PROMPT_SUFFIX="%{$fg[green]%}]%{$reset_color%}"
-GIT_PROMPT_AHEAD="%{$fg[red]%}ANUM%{$reset_color%}"             # A"NUM"         - ahead by "NUM" commits
-GIT_PROMPT_BEHIND="%{$fg[cyan]%}BNUM%{$reset_color%}"           # B"NUM"         - behind by "NUM" commits
-GIT_PROMPT_MERGING="%{$fg_bold[magenta]%}⚡︎%{$reset_color%}"     # lightning bolt - merge conflict
-GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"       # red circle     - untracked files
-GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%}●%{$reset_color%}"     # yellow circle  - tracked files modified
-GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}"        # green circle   - staged changes present = ready for "git push"
-
-parse_git_branch() {
-  # Show Git branch/tag, or name-rev if on detached head
-  ( git symbolic-ref -q HEAD || git name-rev --name-only --no-undefined --always HEAD ) 2> /dev/null
-}
-
-parse_git_state() {
-  # Show different symbols as appropriate for various Git repository states
-  # Compose this value via multiple conditional appends.
-  local GIT_STATE=""
-  local NUM_AHEAD="$(git log --oneline @{u}.. 2> /dev/null | wc -l | tr -d ' ')"
-  if [ "$NUM_AHEAD" -gt 0 ]; then
-    GIT_STATE=$GIT_STATE${GIT_PROMPT_AHEAD//NUM/$NUM_AHEAD}
-  fi
-  local NUM_BEHIND="$(git log --oneline ..@{u} 2> /dev/null | wc -l | tr -d ' ')"
-  if [ "$NUM_BEHIND" -gt 0 ]; then
-    GIT_STATE=$GIT_STATE${GIT_PROMPT_BEHIND//NUM/$NUM_BEHIND}
-  fi
-  local GIT_DIR="$(git rev-parse --git-dir 2> /dev/null)"
-  if [ -n $GIT_DIR ] && test -r $GIT_DIR/MERGE_HEAD; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_MERGING
-  fi
-  if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_UNTRACKED
-  fi
-  if ! git diff --quiet 2> /dev/null; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_MODIFIED
-  fi
-  if ! git diff --cached --quiet 2> /dev/null; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_STAGED
-  fi
-  if [[ -n $GIT_STATE ]]; then
-    echo "$GIT_PROMPT_PREFIX$GIT_STATE$GIT_PROMPT_SUFFIX"
-  fi
-}
-
-git_prompt_string() {
-  local git_where="$(parse_git_branch)"
-  
-  # If inside a Git repository, print its branch and state
-  [ -n "$git_where" ] && echo "$GIT_PROMPT_SYMBOL$(parse_git_state)$GIT_PROMPT_PREFIX%{$fg[yellow]%}${git_where#(refs/heads/|tags/)}$GIT_PROMPT_SUFFIX"
-  
-  # If not inside the Git repo, print exit codes of last command (only if it failed)
-  [ ! -n "$git_where" ] && echo "%{$fg[red]%} %(?..[%?])"
-}
-
-# Right prompt with exit status of previous command if not successful
- #RPROMPT="%{$fg[red]%} %(?..[%?])" 
-# Right prompt with exit status of previous command marked with ✓ or ✗
- #RPROMPT="%(?.%{$fg[green]%}✓ %{$reset_color%}.%{$fg[red]%}✗ %{$reset_color%})"
-
-
-# Color man pages
-export LESS_TERMCAP_mb=$'\E[01;32m'
-export LESS_TERMCAP_md=$'\E[01;32m'
-export LESS_TERMCAP_me=$'\E[0m'
-export LESS_TERMCAP_se=$'\E[0m'
-export LESS_TERMCAP_so=$'\E[01;47;34m'
-export LESS_TERMCAP_ue=$'\E[0m'
-export LESS_TERMCAP_us=$'\E[01;36m'
-export LESS=-r
-
-
-## Plugins section: Enable fish style features
-# Use syntax highlighting
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-# Use history substring search
-source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
-# bind UP and DOWN arrow keys to history substring search
-zmodload zsh/terminfo
-bindkey "$terminfo[kcuu1]" history-substring-search-up
-bindkey "$terminfo[kcud1]" history-substring-search-down
-bindkey '^[[A' history-substring-search-up			
-bindkey '^[[B' history-substring-search-down
-
-case $(basename "$(cat "/proc/$PPID/comm")") in
-  login)
-    	RPROMPT="%{$fg[red]%} %(?..[%?])" 
-    	alias x='startx ~/.xinitrc'      # Type name of desired desktop after x, xinitrc is configured for it
-    ;;
-  urxvt)
-    	RPROMPT='$(git_prompt_string)'
-    	# Use autosuggestion
-    	source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-    	ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-    	ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-    ;;
-  konsole|qterminal)
-    	RPROMPT='$(git_prompt_string)'
-    ;;   
-  'tmux: server')
-  	if $(ps -p$PPID| grep -q -e konsole -e qterminal); then
-    	RPROMPT='$(git_prompt_string)'
-    else
-        RPROMPT='$(git_prompt_string)'
-		## Base16 Shell color themes.
-		#possible themes: 3024, apathy, ashes, atelierdune, atelierforest, atelierhearth,
-		#atelierseaside, bespin, brewer, chalk, codeschool, colors, default, eighties, 
-		#embers, flat, google, grayscale, greenscreen, harmonic16, isotope, londontube,
-		#marrakesh, mocha, monokai, ocean, paraiso, pop (dark only), railscasts, shapesifter,
-		#solarized, summerfruit, tomorrow, twilight
-		theme="eighties"
-		#Possible variants: dark and light
-		shade="dark"
-		BASE16_SHELL="/usr/share/zsh/scripts/base16-shell/base16-$theme.$shade.sh"
-		[[ -s $BASE16_SHELL ]] && source $BASE16_SHELL
-		# Use autosuggestion
-		source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-		ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-  		ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-  	fi
-    ;;
-  *)
-  	if $(ps -p$PPID| grep -q -e konsole -e qterminal); then
-    	RPROMPT='$(git_prompt_string)'
-    else
-        RPROMPT='$(git_prompt_string)'
-		# Use autosuggestion
-		source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-		ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-  		ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-  	fi
-    ;;
-esac
-
-
-#if [[ -z "$TMUX" ]] ;then
-#    ID="$( tmux ls | grep -vm1 attached | cut -d: -f1 )" # get the id of a deattached session
-#        if [[ -z "$ID" ]] ;then # if not available create a new one
-#           tmux new-session
-#        else
-#           tmux attach-session -t "$ID" # if available attach to it
-#        fi
-#fi
-
-                                  
--- a/community/bspwm-mate/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf
+++ b/community/bspwm-mate/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf
@ -1 +0,0 @@
-kernel.printk = 3 3 3 3
--- a/community/bspwm-mate/desktop-overlay/root/.config/Kvantum/kvantum.kvconfig
+++ b/community/bspwm-mate/desktop-overlay/root/.config/Kvantum/kvantum.kvconfig
@ -1,5 +0,0 @@
-[General]
-theme=KvAdaptaBreathDark
-
-[Applications]
-KvAdaptaBreath=calamares, Calamares
--- a/community/bspwm-mate/desktop-overlay/root/.config/gtk-3.0/gtk.css
+++ b/community/bspwm-mate/desktop-overlay/root/.config/gtk-3.0/gtk.css
@ -1,10 +0,0 @@
-.window-frame, .window-frame:backdrop {
-  box-shadow: 0 0 0 black;
-  border-style: none;
-  margin: 0;
-  border-radius: 0;
-}
-    
-.titlebar {
-  border-radius: 0;
-}
--- a/community/bspwm-mate/desktop-overlay/root/.config/gtk-3.0/settings.ini
+++ b/community/bspwm-mate/desktop-overlay/root/.config/gtk-3.0/settings.ini
@ -1,17 +0,0 @@
-[Settings]
-gtk-theme-name=Breath-Dark
-gtk-icon-theme-name=Breeze-Maia-Dark
-gtk-font-name=xos4 Terminus 13
-gtk-cursor-theme-name=xcursor-breeze
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=0
-gtk-xft-hinting=0
-gtk-xft-hintstyle=hintmedium
-gtk-application-prefer-dark-theme=1
-gtk-decoration-layout=:menu,appmenu,close
--- a/community/bspwm-mate/desktop-overlay/root/.config/qt5ct/qt5ct.conf
+++ b/community/bspwm-mate/desktop-overlay/root/.config/qt5ct/qt5ct.conf
@ -1,25 +0,0 @@
-[Appearance]
-color_scheme_path=
-custom_palette=false
-icon_theme=Breeze-Maia-Dark
-style=kvantum
-
-[Fonts]
-fixed=@Variant(\0\0\0@\0\0\0\x1a\0x\0o\0s\0\x34\0 \0T\0\x65\0r\0m\0i\0n\0u\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0K\x10)
-general=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-
-[Interface]
-activate_item_on_single_click=1
-buttonbox_layout=3
-cursor_flash_time=1000
-dialog_buttons_have_icons=1
-double_click_interval=400
-gui_effects=General, AnimateMenu, AnimateTooltip
-menus_have_icons=true
-stylesheets=@Invalid()
-toolbutton_style=4
-underline_shortcut=1
-wheel_scroll_lines=3
-
-[SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\0\0\0\0\0\x19\0\0\x3\xde\0\0\x4\x37\0\0\0\x2\0\0\0\x1b\0\0\x3\xdc\0\0\x4\x35\0\0\0\0\0\0\0\0\a\x80)
--- a/community/bspwm-mate/desktop-overlay/usr/share/default/index.theme
+++ b/community/bspwm-mate/desktop-overlay/usr/share/default/index.theme
@ -1,5 +0,0 @@
-# This file is written by LXAppearance. Do not edit.
-[Icon Theme]
-Name=Default
-Comment=Default Cursor Theme
-Inherits=xcursor-breeze
--- a/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.layout
+++ b/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.layout
@ -1,62 +0,0 @@
-[Toplevel top]
-orientation=top
-expand=true
-size=25
-
-[Object workspaceswitcherapplet]
-locked=false
-position=1674
-panel-right-stick=false
-toplevel-id=top
-applet-iid=WnckletFactory::WorkspaceSwitcherApplet
-object-type=applet
-
-[Object notificationarea]
-locked=false
-position=1739
-panel-right-stick=false
-toplevel-id=top
-applet-iid=NotificationAreaAppletFactory::NotificationArea
-object-type=applet
-
-[Object logout]
-action-type=logout
-locked=false
-position=26
-panel-right-stick=true
-toplevel-id=top
-object-type=action
-
-[Object launcher]
-locked=false
-position=263
-launcher-location=bspc-zen.desktop
-panel-right-stick=false
-toplevel-id=top
-object-type=launcher
-menu-path=applications:/
-
-[Object menu-bar]
-locked=false
-position=0
-panel-right-stick=false
-toplevel-id=top
-applet-iid=
-object-type=menu-bar
-
-[Object matewindowpicker]
-locked=false
-position=219
-panel-right-stick=false
-toplevel-id=top
-applet-iid=MateWindowPickerFactory::MateWindowPicker
-object-type=applet
-
-[Object clockapplet]
-locked=false
-position=1852
-panel-right-stick=false
-toplevel-id=top
-applet-iid=ClockAppletFactory::ClockApplet
-object-type=applet
-
--- a/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.panel
+++ b/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.panel
@ -1,80 +0,0 @@
-[general]
-default-layout='bspwm-tweak'
-object-id-list=['workspaceswitcherapplet', 'notificationarea', 'logout', 'launcher', 'object-0', 'object-2', 'object-1']
-toplevel-id-list=['top']
-
-[toplevels/top]
-expand=true
-orientation='top'
-screen=0
-size=25
-
-[objects/workspaceswitcherapplet]
-applet-iid='WnckletFactory::WorkspaceSwitcherApplet'
-locked=false
-toplevel-id='top'
-position=1674
-object-type='applet'
-panel-right-stick=false
-
-[objects/workspaceswitcherapplet/prefs]
-num-rows=2
-
-[objects/clockapplet/prefs]
-show-temperature=true
-show-weather=true
-
-[objects/object-0]
-toplevel-id='top'
-position=0
-object-type='menu-bar'
-panel-right-stick=false
-
-[objects/notificationarea]
-applet-iid='NotificationAreaAppletFactory::NotificationArea'
-locked=false
-toplevel-id='top'
-position=1739
-object-type='applet'
-panel-right-stick=false
-
-[objects/object-1]
-applet-iid='ClockAppletFactory::ClockApplet'
-toplevel-id='top'
-position=1852
-object-type='applet'
-panel-right-stick=false
-
-[objects/object-1/prefs]
-show-temperature=false
-show-date=false
-format='24-hour'
-custom-format=''
-show-weather=false
-
-[objects/logout]
-locked=false
-toplevel-id='top'
-action-type='logout'
-position=26
-object-type='action'
-panel-right-stick=true
-
-[objects/launcher]
-locked=false
-launcher-location='bspc-zen.desktop'
-menu-path='applications:/'
-position=263
-object-type='launcher'
-panel-right-stick=false
-toplevel-id='top'
-
-[objects/object-2]
-applet-iid='MateWindowPickerFactory::MateWindowPicker'
-toplevel-id='top'
-position=219
-object-type='applet'
-panel-right-stick=false
-
-[objects/object-2/prefs]
-show-all-windows=false
--- a/community/bspwm-mate/desktop-overlay/usr/share/pixmaps/start-here.png
+++ b/community/bspwm-mate/desktop-overlay/usr/share/pixmaps/start-here.png
--- a/community/bspwm-mate/live-overlay/etc/default
+++ b/community/bspwm-mate/live-overlay/etc/default
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/default
--- a/community/bspwm-mate/live-overlay/etc/fstab
+++ b/community/bspwm-mate/live-overlay/etc/fstab
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/fstab
--- a/community/bspwm-mate/live-overlay/etc/issue
+++ b/community/bspwm-mate/live-overlay/etc/issue
@ -1,31 +0,0 @@
-[H[2J
-Manjaro Live ISO (\l) - \s-\r \m
-
-
-                 \e[0m# Welcome to Manjaro #
-
-
-              \e[34m██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ████████            ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████\e[0m
-
-
-                         login:
-
-                   \e[34muser\e[0m     \e[1m\e[36mmanjaro\e[0m
-                   \e[34mpassword\e[0m \e[1m\e[36mmanjaro\e[0m
-
-          To launch the installer run: \e[1m\e[36msudo setup\e[0m
-
--- a/community/bspwm-mate/live-overlay/etc/pam.d
+++ b/community/bspwm-mate/live-overlay/etc/pam.d
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/pam.d
--- a/community/bspwm-mate/live-overlay/etc/sudoers.d
+++ b/community/bspwm-mate/live-overlay/etc/sudoers.d
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/sudoers.d
--- a/community/bspwm-mate/live-overlay/usr/share/applications/calamares.desktop
+++ b/community/bspwm-mate/live-overlay/usr/share/applications/calamares.desktop
@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Install Manjaro Linux
-GenericName=Live Installer
-Comment=Install the operating system to disk
-Comment[de]=Manjaro Linux installieren
-Exec=env QT_QPA_PLATFORMTHEME=fusion /usr/bin/calamares_polkit %f
-Icon=calamares
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=Qt;System;
--- a/community/bspwm-mate/profile.conf
+++ b/community/bspwm-mate/profile.conf
@ -1,64 +0,0 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
-displaymanager="lightdm"
-
-nonfree_mhwd="true"
-
-multilib="true"
-
-# use extra packages as defined in pkglist to activate a full profile
-extra="true"
-
-################ install ################
-
-# configure calamares for netinstall
-netinstall="false"
-
-# configure calamares to use chrootcfg instead of unpackfs
-chrootcfg="false"
-
-# use geoip for localization
-# geoip='true'
-
-# unset defaults to given values
-# names must match systemd service names
-enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group')
-disable_systemd=('pacman-init')
-
-# unset defaults to given values,
-# names must match openrc service names
-# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager' 'tlp' 'tlp-sleep' 'xdm')
-# disable_openrc=()
-
-# the same workgroup name if samba is used
-# smb_workgroup=""
-
-################# livecd #################
-
-# unset defaults to given value
-hostname="manjaro-bspwm"
-
-# unset defaults to given value
-# username="manjaro"
-
-# unset defaults to given value
-# password="manjaro"
-
-# the login shell
-# defaults to bash
-login_shell=/bin/zsh
-
-# unset defaults to given values
-# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel"
-
-# unset defaults to given values
-# names must match systemd service names
-# services in enable_systemd array don't need to be listed here
-# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'pacman-boot')
-
-# unset defaults to given values,
-# names must match openrc service names
-# services in enable_openrc array don't need to be listed here
-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'pacman-boot')
--- a/community/bspwm/Packages-Desktop
+++ b/community/bspwm/Packages-Desktop
@ -1,114 +0,0 @@
->extra adwaita-maia-gtk3
-alsa-firmware
-alsa-plugins
-alsa-utils
-atool
-bc
-bmenu
-brandr
-breeze-maia-icon-themes
-bspwm-manjaro
-bspwm-ruler
-bspwm-scripts
-bspwm-wallpapers
->extra chromium
->basic links
-clonezilla
->extra compton
-dash
-dbus-x11
->extra dconf
-delayed-hibernation
-desktop-file-utils
-dfc
-downgrade
-dunstify
-feh
->extra file-roller
->extra gedit
->basic micro-manjaro
->extra gnome-disk-utility
->extra gtk3-classic
->extra gtk2-compatibility
-gtk-theme-breath
-grub-theme-manjaro-dev
->extra gufw
->basic ufw
->extra gvfs
-hibernator
-htop
->extra i3lock
-inxi
-libdnet
-libnotify
-limepanel
->extra lxappearance-gtk3
->extra lxsession-gtk3
-maia-console
-manjaro-architect
->extra manjaro-browser-settings-native
->extra manjaro-bspwm-settings
->basic manjaro-bspwm-settings-minimal
->extra manjaro-pulse
->basic manjaro-alsa
-manjaro-zsh-config
->extra mate-notification-daemon
->basic dunst
-mhwd-tui
-moc
->extra morc_menu
-mpv
->multilib manjaro-alsa
->extra mygtkmenui
-ncdu
-nerd-fonts-terminus
-networkmanager
-networkmanager-dmenu
-networkmanager-openconnect
-networkmanager-openvpn
-networkmanager-pptp
-networkmanager-vpnc
-openresolv
-yay
-pacui
->extra pavucontrol
-perl-file-mimeinfo
-poppler
-ps_mem
->extra pulseaudio-ctl
-ranger
-rofi
-rofi-scripts
-rootmenu
->extra spacefm
-speedtest-cli
-sterminal
-sxhkd
-terminus-font
-thermald
-tree
-udevil
-w3m
-xcape
-xcursor-breeze
-xdg-su
-xdg-user-dirs
-xdg-utils
-xf86-input-elographics
-xf86-input-evdev
-xf86-input-keyboard
-xf86-input-libinput
-xf86-input-mouse
-xf86-input-void
-xlogin
-light
-xorg-server
-xorg-xinit
-xorg-xprop
-xorg-xsetroot
->extra zathura-pdf-poppler
-zensu
-zsh-completions
-ffmpegthumbnailer
-highlight
-
--- a/community/bspwm/Packages-Live
+++ b/community/bspwm/Packages-Live
@ -1,9 +0,0 @@
-manjaro-live-skel
-mkinitcpio-nfs-utils
-nbd
->sonar sonar-calamares-branding
-squashfs-tools
-manjaro-live-systemd
->sonar thus
->manjaro grub-theme-live-manjaro
->sonar grub-theme-live-sonar
--- a/community/bspwm/Packages-Mhwd
+++ b/community/bspwm/Packages-Mhwd
@ -1,50 +0,0 @@
-#KERNEL-bbswitch
-#KERNEL-broadcom-wl
-#KERNEL-r8168
-#KERNEL-rt3562sta
-KERNEL-virtualbox-guest-modules
-libva-intel-driver
-libva-mesa-driver
-#libva-vdpau-driver
-#>multilib lib32-libva-vdpau-driver 
-libxaw
-libxpm
-libxvmc
-mesa-vdpau
-#>multilib lib32-mesa-vdpau
-#>multilib lib32-libxvmc
-#>multilib lib32-primus
-#>nonfree_default catalyst-utils
-#>nonfree_default KERNEL-catalyst
-#>nonfree_default KERNEL-nvidia
-#>nonfree_default KERNEL-nvidia-304xx
-#>nonfree_default KERNEL-nvidia-340xx
-#>nonfree_default nvidia-304xx-utils
-#>nonfree_default nvidia-340xx-utils
-#>nonfree_default nvidia-utils
-#>nonfree_multilib lib32-catalyst-utils
-#>nonfree_multilib lib32-nvidia-304xx-utils
-#>nonfree_multilib lib32-nvidia-340xx-utils
-#>nonfree_multilib lib32-nvidia-utils
-opencl-mesa
-open-vm-tools
-pangox-compat
-#primus
-#bumblebee
-virtualbox-guest-utils
-#vulkan-radeon
-#>multilib lib32-vulkan-radeon
-vulkan-intel
-#>multilib lib32-vulkan-intel
-xf86-input-vmmouse
-#xf86-video-amdgpu
-#xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-#xf86-video-nouveau
-#xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-#xf86-video-voodoo
--- a/community/bspwm/Packages-Root
+++ b/community/bspwm/Packages-Root
@ -1,92 +0,0 @@
-acpi
-b43-fwcutter
-bash
-btrfs-progs
-bzip2
-coreutils
-crda
-dbus-x11
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
->x86_64 efibootmgr
-exfat-utils
-f2fs-tools
-file
-filesystem
-findutils
-gawk
-gcc-libs
->multilib gcc-libs-multilib
-gettext
-glibc
-grep
-grub
-gzip
-inetutils
-intel-ucode
-iproute2
-iptables
-iputils
-ipw2100-fw
-ipw2200-fw
-jfsutils
-KERNEL
-less
-licenses
-linux-firmware
-logrotate
-lsb-release
-man-db
-manjaro-firmware
->manjaro manjaro-release
-manjaro-system
-man-pages
-memtest86+
-mhwd
-mhwd-db
-mkinitcpio-openswap
-nano
-ntfs-3g
-os-prober
-pacman
-pciutils
-pcmciautils
-perl
-procps-ng
-psmisc
-reiserfsprogs
-sed
-shadow
-s-nail
->sonar sonar-release
-sudo
-sysfsutils
-acpid
-cpupower
-cronie
-cryptsetup
-device-mapper
-dhcpcd
-haveged
-lvm2
-mdadm
-nfs-utils
-rsync
-systemd-sysvcompat
-tlp
-wpa_supplicant
-tar
-texinfo
-usbutils
-util-linux
-vi
-wget
-which
-xfsprogs
-zd1211-firmware
-zsh
--- a/community/bspwm/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
+++ b/community/bspwm/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
@ -1,10 +0,0 @@
-
-Section "InputClass"
-        Identifier "libinput touchpad catchall"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "libinput"
-        Option "AccelSpeed" "0.3"
-		Option "Tapping" "on"
-EndSection
-
--- a/community/bspwm/desktop-overlay/etc/default/useradd
+++ b/community/bspwm/desktop-overlay/etc/default/useradd
@ -1,9 +0,0 @@
-# useradd defaults file for ArchLinux
-# original changes by TomK
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/zsh
-SKEL=/etc/skel
-CREATE_MAIL_SPOOL=no
--- a/community/bspwm/desktop-overlay/etc/environment
+++ b/community/bspwm/desktop-overlay/etc/environment
@ -1,6 +0,0 @@
-#
-# This file is parsed by pam_env module
-#
-# Syntax: simple "KEY=VAL" pairs on separate lines
-#
-GTK_CSD=1
--- a/community/bspwm/desktop-overlay/etc/issue
+++ b/community/bspwm/desktop-overlay/etc/issue
@ -1,26 +0,0 @@
-[H[2J
-Manjaro Live ISO (\l) - \s-\r \m
-
-
-                 \e[0m# Welcome to Manjaro #
-
-
-              \e[34m██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ████████            ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████\e[0m
-
-
-
-
--- a/community/bspwm/desktop-overlay/etc/profile
+++ b/community/bspwm/desktop-overlay/etc/profile
@ -1,31 +0,0 @@
-# /etc/profile
-
-#Set our umask
-umask 022
-
-# Set our default path
-PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/.config/bspwm:$HOME/.config/bspwm/panel:$HOME/.bin"
-export PATH
-export XDG_CONFIG_HOME="$HOME/.config"
-export BSPWM_SOCKET="/tmp/bspwm-socket"
-export XDG_CONFIG_DIRS=/usr/etc/xdg:/etc/xdg
-
-# Load profiles from /etc/profile.d
-if test -d /etc/profile.d/; then
-	for profile in /etc/profile.d/*.sh; do
-		test -r "$profile" && . "$profile"
-	done
-	unset profile
-fi
-
-# Source global bash config
-if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
-	. /etc/bash.bashrc
-fi
-
-# Termcap is outdated, old, and crusty, kill it.
-unset TERMCAP
-
-# Man is much better than us at figuring this out
-unset MANPATH
-BROWSER=/usr/bin/xdg-open
--- a/community/bspwm/desktop-overlay/etc/skel/.config/morc_menu/morc_menu_v1.conf
+++ b/community/bspwm/desktop-overlay/etc/skel/.config/morc_menu/morc_menu_v1.conf
@ -1,156 +0,0 @@
-# morc_menu_v1.conf
-# configuration file in support of morc_menu
-
-# To begin allowing you to customize the 'look' or 'skin' of the menu,
-# some explanation is called for: By default, the script uses a
-# low-resource front-end application called 'dmenu' to present its
-# menus. In this configuration file, you are be able to change the
-# parameters that the script uses to invoke 'dmenu', or you may
-# replace 'dmenu' with another front-end. The script has been tested
-# with front-ends 'rofi' and 'zenity', and may also work with 'yada'
-# and others. The script also allows you to import 'look' and 'skin'
-# data from definitions in other configuration files, to help you
-# maintain a consistent 'look' across different programs.
-
-# If you wish to import import 'look' and 'skin' data from definitions
-# in other configuration files, you must perform that first, before
-# defining how you wish to invoke your chosen front-end (sensible, as
-# in that situation, the invocation will be using definitions from
-# those files). You may define as many 'external_definition_file's as
-# you like. They will be read in the order you present them here, so
-# in a case of conflicting definitions, the last one wins. If the file
-# does not exist or can't be read, it is ignored, and the script
-# continues. The script will only read lines in the form 'foo=bar'. In
-# our default example we are reading a configuration file meant for
-# 'dmenu' usage.
-external_skin_definition_file=${HOME}/.dmenurc
-
-# Customize where on the screen you wish the menu to appear. If you
-# want the menu to appear at the wherever the mouse pointer is
-# resting, set the variable 'use_mouse_position' to 'TRUE', and you're
-# done - the script will figure out the correct x and y positions at
-# run-time. Otherwise, the script will always place the menu at the
-# 'x_position' and 'y_position' definitions you set below. All the
-# numeric values in this block are measured in pixels.
-# IMPORTANT:
-#   This only works when the 'menu_cmd' definition below correctly
-#   uses the string literals X_POSITION, Y_POSITION, as is the case in
-#   the default and in the examples below. Additionally, MENU_LINES
-#   and MENU_WIDTH must be correctly used, as in the examples below,
-#   in order for dynamically positioned menus not to try to display
-#   beyond the screen edge, and for there not to display unnecessary
-#   whitespace.
-x_position=300
-y_position=20
-# Until we learn how to directly measure font width and height, we
-# need to set 'line_height', 'avg_char_width', and 'menu_width'
-# manually by trial and error. If 'avg_char_width' is not zero, then
-# 'menu_width' will be ignored, and the value will be calculated at
-# run-time.
-line_height=22
-avg_char_width=13
-menu_width=350
-# use_mouse_position=TRUE
-use_mouse_position=TRUE
-
-# The third and final, step in customizing the 'look' or 'skin' of the
-# menu is to modify how the script invokes its menu command
-# ('menu_cmd') and its error notification (error_cmd'). In general,
-# the options available to you are limited by those of your chosen
-# front-end, so refer to its man page and other documentation.
-# Additionally, you may refer to variables defined in one of the
-# 'external_skin_definition_file's you specified above, and you may
-# use variables 'x_position' and 'y_position' to set where on the
-# screen you want your menu. Here are some examples:
-# IMPORTANT:
-#   In order for the script to properly position the menu, these
-#   definitions must include parameters that correctly use the string
-#   literals X_POSITION, Y_POSITION, MENU_LINES, and MENU_WIDTH, as is
-#   the case in the default and in the examples below. Additionally,
-#   MENU_LINES and MENU_WIDTH must be correctly used, as in the
-#   examples below, in order for dynamically positioned menus not to
-#   try to display beyond the screen edge, and for there not to
-#   display unnecessary whitespace.
-#
-# The script's default, using 'dmenu' 
-#menu_cmd="dmenu -i -l MENU_LINES -x X_POSITION -y Y_POSITION -w MENU_WIDTH "
-#menu_cmd="dmenu -i -l MENU_LINES -x X_POSITION -y Y_POSITION -w MENU_WIDTH "
-
-# Using a variable defined in an external_skin_definition_file, in
-# this case ${HOME}/.dmenurc
-menu_cmd="dmenu -i -l MENU_LINES -x X_POSITION -y Y_POSITION -w MENU_WIDTH ${DMENU_OPTIONS}"
-
-# Using 'zenity' and 'rofi'
-# Because there ought to be some reward for reading all this
-# documentation, note the use of the embedded linux command 'uname' to
-# set the zenity column title. 
-# menu_cmd="zenity --list --column=$(uname -no) "
-# menu_cmd="rofi "
-
-
-# Customize the 'look' or 'skin' of the error messages by modifying
-# the following string, which, as above for the menu command, will be
-# used to invoke your choice of menu front end.
-error_cmd="dmenu -i -l 40 -x 500 -y 150 -w 350 -nb red -nf black -fn DejaVu"
-# error_cmd="zenity --error "
-# error_cmd="rofi "
-
-
-# Distinguish between an executable item and a sub-menu selection
-menu_prefix=" "
-menu_suffix=" >"
-# If a 'menu_suffix' is defined, you can have the script align them
-# vertically, but this only works if you are using a fixed width font,
-# so if you've selected a proportional font, set 'align_suffix' to
-# 'FALSE'.
-align_suffix=TRUE
-
-# Desired categories: Any single .desktop definition can include an
-# arbitrarily long list of categories for itself, which would bloat
-# the menu with duplicate clutter, so the following space-delimited
-# variable white-lists the desired categories.
-desired_categories="Favorites Settings Development Documentation Education System Network Utility Graphics Office AudioVideo"
-
-
-# Category aliases: The common convention seems to be to rename some
-# categories, as in the default below. We implement the renaming sing
-# an associative array in which the index is the category as defined
-# in the .desktop file, and the value is the desired output
-declare -A category_aliases=( [Utility]=Accessories [AudioVideo]=Multimedia [Network]=Internet )
-
-
-# Unwanted names and execs: Entries with these names or execution
-# statements should black-listed from the menu.
-unwanted_names=( feh )
-unwanted_execs=( )
-
-
-# Maximum number of backups to keep: because almost no one will notice
-# accumulating cruft. Backups are automatically created in the user's
-# ${HOME}/.config/morc_menu folder, in the form
-# "categorized_menu${ext}_%y-%m-%d-%T" where ${ext} is either ".txt"
-# or "_xml.txt" and the suffix is a timestamp. If you want to keep a
-# particular backup forever, rename it to fail a match against
-# "categorized_menu${ext}_*"
-max_num_backups=5
-
-# Information about the menu and how to customize it are by default
-# presented in a trailng menu entry "about morc_menu". You may exclude
-# presentation of that menu item by setting 'exclude_about' to TRUE
-exclude_about="TRUE"
-#exclude_about="False"
-
-# Adding top-level menu entries for frequently used applications:
-# That's what 'favorites' are. See below for how to do that.
-
-# Adding 'favorites' and custom entries: Neither of those
-# customizations are performed in this configuration file. In both
-# cases, define each extra entry by creating a new ".desktop" file or
-# by editing an existing one. For system-wide customization, this will
-# be performed by a system administrator in the
-# /usr/share/applications folder; For user-personal customizations,
-# this will be performed by the user in the
-# ${HOME}/.local/share/applications folder. Favorites are defined by
-# adding that word to the list of categories in the .desktop file.
-# Other additional entries are made by adding a new .desktop file, or
-# adding a category to an existing one.
--- a/community/bspwm/desktop-overlay/etc/skel/.config/sxhkd/sxhkdrc
+++ b/community/bspwm/desktop-overlay/etc/skel/.config/sxhkd/sxhkdrc
@ -1,326 +0,0 @@
-# bspwm hotkeys
-#
-# Cleanly quit bspwm
-super + shift + q
-	bspc quit 1 && pkill lemonpanel && pkill lemonbar
-
-# Show keybindings
-super + F1
-	$TERMINAL -e keybindings.sh
-#
-# Window manipulation
-# ______________
-
-# Close window
-super + x
-	bspc  node -c
-
-# Kill window
-super + shift + x
-	bspc  node -k
-
-# Toggle tiling mode of window
-super + shift + t
-	bspc node -t {pseudo_tiled,tiled}
-super + t
-	{bspc node -t floating && window-placer $(bspc query -T -d | grep -o '"state":"floating"' | wc -l),bspc node -t tiled}
-# Force all windows of the desktop to tile
-super + ctrl + t
-	bspcp tile
-# Force all windows of the desktop to float and arrange them
-super + ctrl + shift + t
-	bspcp float
-	
-# Toggle fullscreen
-super + shift + f 
-	bspc node -t {fullscreen,tiled}	
-
-# Try to keep size and position of the selected window
-super + o
-	bspc node -g private
-
-# Make window sticky
-super + i
-	bspc node -g sticky
-
-# Lock a window from closing
-super + Escape
-	bspc node -g locked 
-
-### Map or unmap windows (functional equivalent of "minimize")
-super + c
-    whid dmenu
-
-super + shift + c
-    whid hide
-
-super + ctrl + c
-    whid last
-
-#
-# Window moving and splitting
-# ______________    
-
-# Autopresel (split window in its largest dimension)
-super + ctrl + Return
-	auto-presel
-
-ctrl + space
-	auto-presel
-	
-# Presel window for splitting in certain direction
-alt + ctrl + {a,s,w,d}
-	bspc node -p \~{west,south,north,east} -i
-
-alt + ctrl + {h,j,k,l}
-	bspc node -p \~{west,south,north,east}
-
-alt + ctrl + {Left,Down,Up,Right}
-	bspc node -p \~{west,south,north,east}
-
-# Presel the desktop for splitting in certain direction
-alt + shift + {a,s,w,d}
-	bspc node @/ -p \~{west,south,north,east}
-
-alt + shift + {h,j,k,l}
-	bspc node @/ -p \~{west,south,north,east}
-
-alt + shift + {Left,Down,Up,Right}
-	bspc node @/ -p \~{west,south,north,east}
-# Set splitting ratio of windows
-alt + ctrl + {1-9}
-	bspc node -o 0.{1-9}
-		
-# Move current window to largest space or preselected area if there is one.
-super + Return
-    windowpromoter
-
-# Create a new "master area", splitting the whole desktop instead of just windows.
-alt + Return
-	bspc node -n @/
-	
-# go (Shift=move) to desktop (and focus the monitor that the desktop is located on. Bspwm style)
-super + {_,shift + }{1-9,0}
-    bspc {desktop -f,node -d} ^{1-9,10}
-
-## Alternative: i3 style behavior (focus nth, desktop of the focused monitor)
-#super + {1-9,0}
-#	focusdesktopofthismonitor {1-9}
-#super + shift + {1-9,0}
-#	movetodesktopofthismonitor {1-9,10}
-
-## Another alternative: xmonad style desktops. You have 10 desktops shared between all monitors,
-## and focusing a desktop focuses it on the currently focused monitor
-#super + {1-9,0}
-#	summondesktop.sh {1-9,10}
-#super + shift + {1-9,0}
-#	bspc node -d ^{1-9,10}
-
-# Select previous / next desktop
-super + {m,n}
-	bspc desktop -f {prev.occupied,next.occupied} 
-
-# cycle windows
-alt + {_,shift + }Tab
-    bspc node -f {next,prev}
-
-# Go to specific window
-super + Tab
-	WindowSelector
-	
-#Focus windows by direction, works with multihead
-super +  {a,s,w,d}
-    focusmover {west,south,north,east}
-
-super +  {h,j,k,l}
-    focusmover {west,south,north,east}
-
-super +  {Left,Down,Up,Right}
-    focusmover {west,south,north,east}
-        	
-# Move tiled windows. Moving a tiled window to 
-# preselected one moves into preselection instead. 
-# Moving out of the screen should move the window to next monitor if possible
-super + shift + {a,s,w,d}
-	windowgrabber {west,south,north,east}
-
-super + shift + {h,j,k,l}
-	windowgrabber {west,south,north,east}
-	
-# Different style of movement: transplant into window in chosen direction
-super + shift + {Left,Down,Up,Right}
-	euclid_mover {west,south,north,east}
-
-#resize windows
-super + ctrl + {a,s,w,d}
-	bspwm_resize.sh {west,south,north,east}
-
-super + ctrl + {h,j,k,l}
-	bspwm_resize.sh {west,south,north,east}
-	
-super + ctrl + {Left,Down,Up,Right}
-	bspwm_resize.sh {west,south,north,east}
-
-#
-# Layout manipulation/desktop level controls
-# ______________    
-
-# Toggle monocle mode
-super + f 
-	bspc desktop -l next
-	
-# Balance tree
-super + b
-	bspc node @/ -B
-
-# Balance brother node. If you do this on biggest window of the desktop, it usually means balancing all windows with except the biggest.
-super + alt + b
-	bspc node @brother -B
-	
-# Undo balancing (equalize windows)
-super + ctrl + b
-	bspc node @/ -E
-
-# Toggle automatic balancing of windows
-alt + b
-	euclid_balancer
-
-# Mirror and flip leaves of tree
-super + {comma,period}
-	bspc node @/ -F {horizontal,vertical}
-	
-# Rotate leaves of tree
-super + shift + {comma,period}
-	bspc node @/ -R {90,270}
-
-# Change window gap
-
-super + g
-	bspc config -d focused window_gap {$gap,$(($gap+$gap)),$(($gap+$gap+$gap))}
-
-super + button{4,5}
-	bspc config -d focused window_gap $((`bspc config -d focused window_gap` {+,-} 2 ))
-#
-# mouse bindings
-# __________________
-
-~button1
-	DidIClickDesktop.sh && mygtkmenui -- .config/GTKmenu/LaunchMenu
-
-~button2
-	DidIClickDesktop.sh && mygtkmenui -- .config/GTKmenu/BspwmWindowMenui
-		
-~button3
-	DidIClickDesktop.sh && mygtkmenui -- .config/GTKmenu/BspwmDesktopMenui
-
-# Switch workspace by scrolling on the desktop. Causes scrolling issues on some systems.
-#~button4
-#	DidIClickDesktop.sh && bspc desktop -f next
-#~button5
-#	DidIClickDesktop.sh && bspc desktop -f prev
-	
-### Add or remove desktops by scrolling
-super + ctrl + button5
-    bspcp dsktp rm
-
-super + ctrl + button4
-    bspcp dsktp add
-
-# Spawn applications popup menu and manually tile selected 
-# app where your mouse was when you opened the menu. Smartsplit only chooses
-# biggest dimension of the window, MouseLaunch only cares which edge is closer.
-# mod5 is alt_gr (first key right from space) on most keyboards. 
-mod5 + @button1
-    MouseLaunch ; mygtkmenui -- .config/GTKmenu/LaunchMenu
-#	smartsplit ; dboxmenu
-
-# Spawn window manipulation menu
-# Mod1 is alt
-#    BspwmWindowMenu
-mod1 + @button1
-    mygtkmenui -- .config/GTKmenu/BspwmWindowMenui
-
-
-#
-# Touchpad "gestures" (depend on your touchpad driver, very likely to be unavailable)
-#_____________________
-    
-#
-# spawn programs
-#
-
-# run applications
-super + space
-	dmenu_recent -fn 'xos4 Terminus:size=15' -i -l 14 -w 600 -y $PANEL_HEIGHT
-
-super + shift + space
-	rofi -show
-
-super + p
-	dmenu_recent -h $PANEL_HEIGHT -fn 'xos4 Terminus:size=15' -i
-
-super + shift + Return
-	default-terminal
-super + z
-	default-terminal
-
-super + shift + z
-	open-terminal-here
-	
-super + r
-	rofi-finder.sh
-
-super + shift + b
-	$BROWSER
-    		
-super + e
-	spacefm -n
-
-super + shift + e
-	st -f "Terminus:size=14:style=regular" ranger
-
-Print
-	scrot
-
-	
-#
-# Media keys
-#
-
-XF86AudioRaiseVolume
-	volume up
-
-XF86AudioLowerVolume
-	volume down
-
-XF86AudioMute
-	volume mute
-	
-XF86MonBrightnessDown
- light -U 5 
-
-XF86MonBrightnessUp
- light -A 5
- 
-
-XF86Sleep
-	systemctl suspend
-
-# make sxhkd reload its configuration files:
-super + shift + Escape
-	pkill -USR1 -x sxhkd
-
-# In case bspwmrc fails to execute/you wish have plugged in a new monitor
-super + shift + r
-	bspwmrc
-#edit this file
-alt + ctrl + space
-	$GUI_EDITOR ~/.config/sxhkd/sxhkdrc
-# Toggle compositing
-super + ctrl + space
-	{pkill compton ,\
-	compton -b }
-
-# Remove receptacles
-super + BackSpace
-  for i in $(bspc query -N -n .leaf.!window.local); do bspc node $i -k; done
--- a/community/bspwm/desktop-overlay/etc/skel/.zshrc
+++ b/community/bspwm/desktop-overlay/etc/skel/.zshrc
@ -1,223 +0,0 @@
-## Options section
-setopt correct                                                  # Auto correct mistakes
-setopt extendedglob                                             # Extended globbing. Allows using regular expressions with *
-setopt nocaseglob                                               # Case insensitive globbing
-setopt rcexpandparam                                            # Array expension with parameters
-setopt nocheckjobs                                              # Don't warn about running processes when exiting
-setopt numericglobsort                                          # Sort filenames numerically when it makes sense
-setopt nobeep                                                   # No beep
-setopt appendhistory                                            # Immediately append history instead of overwriting
-setopt histignorealldups                                        # If a new command is a duplicate, remove the older one
-setopt autocd                                                   # if only directory path is entered, cd there.
-
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'       # Case insensitive tab completion
-zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"         # Colored completion (different colors for dirs/files/etc)
-zstyle ':completion:*' rehash true                              # automatically find new executables in path 
-# Speed up completions
-zstyle ':completion:*' accept-exact '*(N)'
-zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path ~/.zsh/cache
-HISTFILE=~/.zhistory
-HISTSIZE=1000
-SAVEHIST=500
-WORDCHARS=${WORDCHARS//\/[&.;]}                                 # Don't consider certain characters part of the word
-
-
-## Keybindings section
-bindkey -e
-bindkey '^[[7~' beginning-of-line                               # Home key
-bindkey '^[[H' beginning-of-line                                # Home key
-if [[ "${terminfo[khome]}" != "" ]]; then
-  bindkey "${terminfo[khome]}" beginning-of-line                # [Home] - Go to beginning of line
-fi
-bindkey '^[[8~' end-of-line                                     # End key
-bindkey '^[[F' end-of-line                                     # End key
-if [[ "${terminfo[kend]}" != "" ]]; then
-  bindkey "${terminfo[kend]}" end-of-line                       # [End] - Go to end of line
-fi
-bindkey '^[[2~' overwrite-mode                                  # Insert key
-bindkey '^[[3~' delete-char                                     # Delete key
-bindkey '^[[C'  forward-char                                    # Right key
-bindkey '^[[D'  backward-char                                   # Left key
-bindkey '^[[5~' history-beginning-search-backward               # Page up key
-bindkey '^[[6~' history-beginning-search-forward                # Page down key
-
-# Navigate words with ctrl+arrow keys
-bindkey '^[Oc' forward-word                                     #
-bindkey '^[Od' backward-word                                    #
-bindkey '^[[1;5D' backward-word                                 #
-bindkey '^[[1;5C' forward-word                                  #
-bindkey '^H' backward-kill-word                                 # delete previous word with ctrl+backspace
-bindkey '^[[Z' undo                                             # Shift+tab undo last action
-
-## Alias section 
-alias cp="cp -i"                                                # Confirm before overwriting something
-alias df='df -h'                                                # Human-readable sizes
-alias free='free -m'                                            # Show sizes in MB
-alias gitu='git add . && git commit && git push'
-
-# Theming section  
-autoload -U compinit colors zcalc
-compinit -d
-colors
-
-# enable substitution for prompt
-setopt prompt_subst
-
-# Prompt (on left side) similar to default bash prompt, or redhat zsh prompt with colors
- #PROMPT="%(!.%{$fg[red]%}[%n@%m %1~]%{$reset_color%}# .%{$fg[green]%}[%n@%m %1~]%{$reset_color%}$ "
-# Maia prompt
-PROMPT="%B%{$fg[cyan]%}%(4~|%-1~/.../%2~|%~)%u%b >%{$fg[cyan]%}>%B%(?.%{$fg[cyan]%}.%{$fg[red]%})>%{$reset_color%}%b " # Print some system information when the shell is first started
-# Print a greeting message when shell is started
-echo $USER@$HOST  $(uname -srm) $(lsb_release -rcs)
-## Prompt on right side:
-#  - shows status of git when in git repository (code adapted from https://techanic.net/2012/12/30/my_git_prompt_for_zsh.html)
-#  - shows exit status of previous command (if previous command finished with an error)
-#  - is invisible, if neither is the case
-
-# Modify the colors and symbols in these variables as desired.
-GIT_PROMPT_SYMBOL="%{$fg[blue]%}±"                              # plus/minus     - clean repo
-GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$reset_color%}"
-GIT_PROMPT_SUFFIX="%{$fg[green]%}]%{$reset_color%}"
-GIT_PROMPT_AHEAD="%{$fg[red]%}ANUM%{$reset_color%}"             # A"NUM"         - ahead by "NUM" commits
-GIT_PROMPT_BEHIND="%{$fg[cyan]%}BNUM%{$reset_color%}"           # B"NUM"         - behind by "NUM" commits
-GIT_PROMPT_MERGING="%{$fg_bold[magenta]%}⚡︎%{$reset_color%}"     # lightning bolt - merge conflict
-GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"       # red circle     - untracked files
-GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%}●%{$reset_color%}"     # yellow circle  - tracked files modified
-GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}"        # green circle   - staged changes present = ready for "git push"
-
-parse_git_branch() {
-  # Show Git branch/tag, or name-rev if on detached head
-  ( git symbolic-ref -q HEAD || git name-rev --name-only --no-undefined --always HEAD ) 2> /dev/null
-}
-
-parse_git_state() {
-  # Show different symbols as appropriate for various Git repository states
-  # Compose this value via multiple conditional appends.
-  local GIT_STATE=""
-  local NUM_AHEAD="$(git log --oneline @{u}.. 2> /dev/null | wc -l | tr -d ' ')"
-  if [ "$NUM_AHEAD" -gt 0 ]; then
-    GIT_STATE=$GIT_STATE${GIT_PROMPT_AHEAD//NUM/$NUM_AHEAD}
-  fi
-  local NUM_BEHIND="$(git log --oneline ..@{u} 2> /dev/null | wc -l | tr -d ' ')"
-  if [ "$NUM_BEHIND" -gt 0 ]; then
-    GIT_STATE=$GIT_STATE${GIT_PROMPT_BEHIND//NUM/$NUM_BEHIND}
-  fi
-  local GIT_DIR="$(git rev-parse --git-dir 2> /dev/null)"
-  if [ -n $GIT_DIR ] && test -r $GIT_DIR/MERGE_HEAD; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_MERGING
-  fi
-  if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_UNTRACKED
-  fi
-  if ! git diff --quiet 2> /dev/null; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_MODIFIED
-  fi
-  if ! git diff --cached --quiet 2> /dev/null; then
-    GIT_STATE=$GIT_STATE$GIT_PROMPT_STAGED
-  fi
-  if [[ -n $GIT_STATE ]]; then
-    echo "$GIT_PROMPT_PREFIX$GIT_STATE$GIT_PROMPT_SUFFIX"
-  fi
-}
-
-git_prompt_string() {
-  local git_where="$(parse_git_branch)"
-  
-  # If inside a Git repository, print its branch and state
-  [ -n "$git_where" ] && echo "$GIT_PROMPT_SYMBOL$(parse_git_state)$GIT_PROMPT_PREFIX%{$fg[yellow]%}${git_where#(refs/heads/|tags/)}$GIT_PROMPT_SUFFIX"
-  
-  # If not inside the Git repo, print exit codes of last command (only if it failed)
-  [ ! -n "$git_where" ] && echo "%{$fg[red]%} %(?..[%?])"
-}
-
-# Right prompt with exit status of previous command if not successful
- #RPROMPT="%{$fg[red]%} %(?..[%?])" 
-# Right prompt with exit status of previous command marked with ✓ or ✗
- #RPROMPT="%(?.%{$fg[green]%}✓ %{$reset_color%}.%{$fg[red]%}✗ %{$reset_color%})"
-
-
-# Color man pages
-export LESS_TERMCAP_mb=$'\E[01;32m'
-export LESS_TERMCAP_md=$'\E[01;32m'
-export LESS_TERMCAP_me=$'\E[0m'
-export LESS_TERMCAP_se=$'\E[0m'
-export LESS_TERMCAP_so=$'\E[01;47;34m'
-export LESS_TERMCAP_ue=$'\E[0m'
-export LESS_TERMCAP_us=$'\E[01;36m'
-export LESS=-r
-
-
-## Plugins section: Enable fish style features
-# Use syntax highlighting
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-# Use history substring search
-source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
-# bind UP and DOWN arrow keys to history substring search
-zmodload zsh/terminfo
-bindkey "$terminfo[kcuu1]" history-substring-search-up
-bindkey "$terminfo[kcud1]" history-substring-search-down
-bindkey '^[[A' history-substring-search-up			
-bindkey '^[[B' history-substring-search-down
-
-case $(basename "$(cat "/proc/$PPID/comm")") in
-  login)
-    	RPROMPT="%{$fg[red]%} %(?..[%?])" 
-    	alias x='startx ~/.xinitrc'      # Type name of desired desktop after x, xinitrc is configured for it
-    ;;
-  urxvt)
-    	RPROMPT='$(git_prompt_string)'
-    	# Use autosuggestion
-    	source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-    	ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-    	ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-    ;;
-  konsole|qterminal)
-    	RPROMPT='$(git_prompt_string)'
-    ;;   
-  'tmux: server')
-  	if $(ps -p$PPID| grep -q -e konsole -e qterminal); then
-    	RPROMPT='$(git_prompt_string)'
-    else
-        RPROMPT='$(git_prompt_string)'
-		## Base16 Shell color themes.
-		#possible themes: 3024, apathy, ashes, atelierdune, atelierforest, atelierhearth,
-		#atelierseaside, bespin, brewer, chalk, codeschool, colors, default, eighties, 
-		#embers, flat, google, grayscale, greenscreen, harmonic16, isotope, londontube,
-		#marrakesh, mocha, monokai, ocean, paraiso, pop (dark only), railscasts, shapesifter,
-		#solarized, summerfruit, tomorrow, twilight
-		theme="eighties"
-		#Possible variants: dark and light
-		shade="dark"
-		BASE16_SHELL="/usr/share/zsh/scripts/base16-shell/base16-$theme.$shade.sh"
-		[[ -s $BASE16_SHELL ]] && source $BASE16_SHELL
-		# Use autosuggestion
-		source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-		ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-  		ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-  	fi
-    ;;
-  *)
-  	if $(ps -p$PPID| grep -q -e konsole -e qterminal); then
-    	RPROMPT='$(git_prompt_string)'
-    else
-        RPROMPT='$(git_prompt_string)'
-		# Use autosuggestion
-		source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-		ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20
-  		ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
-  	fi
-    ;;
-esac
-
-
-#if [[ -z "$TMUX" ]] ;then
-#    ID="$( tmux ls | grep -vm1 attached | cut -d: -f1 )" # get the id of a deattached session
-#        if [[ -z "$ID" ]] ;then # if not available create a new one
-#           tmux new-session
-#        else
-#           tmux attach-session -t "$ID" # if available attach to it
-#        fi
-#fi
-
-                                  
--- a/community/bspwm/desktop-overlay/etc/spacefm/spacefm.conf
+++ b/community/bspwm/desktop-overlay/etc/spacefm/spacefm.conf
@ -1,17 +0,0 @@
-# spacefm.conf
-# This file affects all users of SpaceFM on this system.
-
-# Documentation: /usr/share/doc/spacefm/spacefm-manual-en.html#programfiles-etc
-# http://ignorantguru.github.io/spacefm/spacefm-manual-en.html#programfiles-etc
-
-# tmp_dir must be a root-protected user-writable dir like /tmp
-# ALL users must be able to write to this dir.
-# tmp_dir must NOT contain spaces or special chars - keep it simple
-#tmp_dir=/tmp
-
-# Specify an absolute path to an additional terminal su or sudo program:
-#terminal_su=/bin/su
-
-# Specify an absolute path to an additional graphical su program:
-graphical_su=/usr/bin/zensu
-
--- a/community/bspwm/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf
+++ b/community/bspwm/desktop-overlay/etc/sysctl.d/20-quiet-printk.conf
@ -1 +0,0 @@
-kernel.printk = 3 3 3 3
--- a/community/bspwm/desktop-overlay/etc/systemd/user/dbus.service
+++ b/community/bspwm/desktop-overlay/etc/systemd/user/dbus.service
@ -1,7 +0,0 @@
-[Unit]
-Description=D-Bus Message Bus
-Requires=dbus.socket
-
-[Service]
-ExecStart=/usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation
-ExecReload=/usr/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
--- a/community/bspwm/desktop-overlay/etc/systemd/user/dbus.socket
+++ b/community/bspwm/desktop-overlay/etc/systemd/user/dbus.socket
@ -1,9 +0,0 @@
-[Unit]
-Description=D-Bus Message Bus Socket
-Before=sockets.target
-
-[Socket]
-ListenStream=/run/user/%U/dbus/user_bus_socket
-
-[Install]
-WantedBy=default.target
--- a/community/bspwm/desktop-overlay/etc/udevil/udevil.conf
+++ b/community/bspwm/desktop-overlay/etc/udevil/udevil.conf
@ -1,335 +0,0 @@
-##############################################################################
-#
-# udevil configuration file    /etc/udevil/udevil.conf
-#
-# This file controls what devices, networks, and files users may mount and
-# unmount via udevil (set suid).
-# 
-# IMPORTANT:  IT IS POSSIBLE TO CREATE SERIOUS SECURITY PROBLEMS IF THIS FILE
-# IS MISCONFIGURED - EDIT WITH CARE
-#
-# Note:  For greater control for specific users, including root, copy this
-# file to /etc/udevil/udevil-user-USERNAME.conf replacing USERNAME with the
-# desired username (eg /etc/udevil/udevil-user-jim.conf).
-#
-# Format:
-#   OPTION = VALUE[, VALUE, ...]
-#
-# DO NOT USE QUOTES except literally
-# Lines beginning with # are ignored
-#
-##############################################################################
-
-
-# To log all uses of udevil, set log_file to a file path:
-# log_file = /var/log/udevil.log
-
-# Approximate number of days to retain log entries (0=forever, max=60):
-log_keep_days = 10
-
-
-# allowed_types determines what fstypes can be passed by a user to the u/mount
-# program, what device filesystems may be un/mounted implicitly, and what
-# network filesystems may be un/mounted.
-# It may also include the 'file' keyword, indicating that the user is allowed
-# to mount files (eg an ISO file).  The $KNOWN_FILESYSTEMS variable may
-# be included to include common local filesystems as well as those listed in
-# /etc/filesystems and /proc/filesystems.
-# allowed_types_USERNAME, if present, is used to override allowed_types for
-# the specific user 'USERNAME'.  For example, to allow user 'jim' to mount
-# only vfat filesystems, add:
-# allowed_types_jim = vfat
-# Setting allowed_types = * does NOT allow all types, as this is a security
-# risk, but does allow all recognized types.
-# allowed_types = $KNOWN_FILESYSTEMS, file, cifs, smbfs, nfs, curlftpfs, ftpfs, sshfs, davfs, tmpfs, ramfs
-allowed_types = $KNOWN_FILESYSTEMS, file
-
-
-# allowed_users is a list of users permitted to mount and unmount with udevil.
-# Wildcards (* or ?) may be used in the usernames.  To allow all users,
-# specify "allowed_users=*".  UIDs may be included using the form UID=1000.
-# For example:  allowed_users = carl, UID=1000, pre*
-# Also note that permission to execute udevil may be limited to users belonging
-# to the group that owns /usr/bin/udevil, such as 'plugdev' or 'storage',
-# depending on installation.
-# allowed_users_FSTYPE, if present, is used to override allowed_users when
-# mounting or unmounting a specific fstype (eg nfs, ext3, file).
-# Note that when mounting a file, fstype will always be 'file' regardless of
-# the internal fstype of the file.
-# For example, to allow only user 'bob' to mount nfs shares, add:
-# allowed_users_nfs = bob
-# The root user is NOT automatically allowed to use udevil in some cases unless
-# listed here (except for unmounting anything or mounting fstab devices).
-allowed_users = *
-
-
-# allowed_groups is a list of groups permitted to mount and unmount with
-# udevil.  The user MUST belong to at least one of these groups.  Wildcards
-# or GIDs may NOT be used in group names, but a single * may be used to allow
-# all groups.
-# Also note that permission to execute udevil may be limited to users belonging
-# to the group that owns /usr/bin/udevil, such as 'plugdev' or 'storage',
-# depending on installation.
-# allowed_groups_FSTYPE, if present, is used to override allowed_groups when
-# mounting or unmounting a specific fstype (eg nfs, ext3, file).  For example,
-# to allow only members of the 'network' group to mount smb and nfs shares,
-# use both of these lines:
-# allowed_groups_smbfs = network
-# allowed_groups_nfs = network
-# The root user is NOT automatically allowed to use udevil in some cases unless
-# listed here (except for unmounting anything or mounting fstab devices).
-allowed_groups = *
-
-
-# allowed_media_dirs specifies the media directories in which user mount points
-# may be located.  The first directory which exists and does not contain a
-# wildcard will be used as the default media directory (normally /media or
-# /media/$USER).
-# The $USER variable, if included, will be replaced with the username of the
-# user running udevil.  Wildcards may also be used in any directory EXCEPT the
-# default.  Wildcards will not match a /, except a /** suffix for recursion.
-# allowed_media_dirs_FSTYPE, if present, is used to override allowed_media_dirs
-# when mounting or unmounting a specific fstype (eg ext2, nfs).  For example,
-# to cause /media/network to be used as the default media directory for
-# nfs and ftpfs mounts, use these two lines:
-# allowed_media_dirs_nfs   = /media/network, /media, /media/$USER
-# allowed_media_dirs_ftpfs = /media/network, /media, /media/$USER
-# NOTE: If you want only the user who mounted a device to have access to it
-# and be allowed to unmount it, specify /media/$USER as the first
-# allowed media directory (only /media/$USER is created on demand).
-# IMPORTANT:  If an allowed file is mounted to a media directory, the user may
-# be permitted to unmount its associated loop device even though internal.
-# INCLUDING /MNT HERE IS NOT RECOMMENDED.  ALL ALLOWED MEDIA DIRECTORIES
-# SHOULD BE OWNED AND WRITABLE ONLY BY ROOT.
-allowed_media_dirs = /media, /media/$USER, /run/media/$USER
-
-
-# allowed_devices is the first criteria for what block devices users may mount
-# or unmount.  If a device is not listed in allowed_devices, it cannot be
-# un/mounted (unless in fstab).  However, even if a device is listed, other
-# factors may prevent its use.  For example, access to system internal devices
-# will be denied to normal users even if they are included in allowed_devices.  
-# allowed_devices_FSTYPE, if present, is used to override allowed_devices when
-# mounting or unmounting a specific fstype (eg ext3, ntfs).  For example, to
-# prevent all block devices containing an ext4 filesystem from being
-# un/mounted use:
-# allowed_devices_ext4 =
-# Note: Wildcards may be used, but a wildcard will never match a /, except
-# for "allowed_devices=*" which allows any device.  The recommended setting is
-# allowed_devices = /dev/*
-# WARNING:  ALLOWING USERS TO MOUNT DEVICES OUTSIDE OF /dev CAN CAUSE SERIOUS
-# SECURITY PROBLEMS.  DO NOT ALLOW DEVICES IN /dev/shm
-allowed_devices = /dev/*, /dev/mapper/*
-
-
-# allowed_internal_devices causes udevil to treat any listed block devices as
-# removable, thus allowing normal users to un/mount them (providing they are
-# also listed in allowed_devices).
-# allowed_internal_devices_FSTYPE, if present, is used to override
-# allowed_internal_devices when mounting or unmounting a specific fstype
-# (eg ext3, ntfs).  For example, to allow block devices containing a vfat
-# filesystem to be un/mounted even if they are system internal devices, use:
-# allowed_internal_devices_vfat = /dev/sdb*
-# Some removable esata drives look like internal drives to udevil.  To avoid
-# this problem, they can be treated as removable with this setting.
-# WARNING:  SETTING A SYSTEM DEVICE HERE CAN CAUSE SERIOUS SECURITY PROBLEMS.
-allowed_internal_devices = /dev/*, /dev/mapper/*
-
-
-# allowed_internal_uuids and allowed_internal_uuids_FSTYPE work similarly to
-# allowed_internal_devices, except that UUIDs are specified instead of devices.
-# For example, to allow un/mounting of an internal filesystem based on UUID:
-# allowed_internal_uuids = cc0c4489-8def-1e5b-a304-ab87c3cb626c0
-# WARNING:  SETTING A SYSTEM DEVICE HERE CAN CAUSE SERIOUS SECURITY PROBLEMS.
-# allowed_internal_uuids = 
-
-
-# forbidden_devices is used to prevent block devices from being un/mounted
-# even if other settings would allow them (except devices in fstab).
-# forbidden_devices_FSTYPE, if present, is used to override
-# forbidden_devices when mounting or unmounting a specific fstype
-# (eg ext3, ntfs).  For example, to prevent device /dev/sdd1 from being
-# mounted when it contains an ntfs filesystem, use:
-# forbidden_devices_ntfs = /dev/sdd1
-# NOTE: device node paths are canonicalized before being tested, so forbidding
-# a link to a device will have no effect.
-forbidden_devices =
-
-
-# allowed_networks determines what hosts may be un/mounted by udevil users when
-# using nfs, cifs, smbfs, curlftpfs, ftpfs, or sshfs.  Hosts may be specified
-# using a hostname (eg myserver.com) or IP address (192.168.1.100).
-# Wildcards may be used in hostnames and IP addresses, but CIDR notation 
-# (192.168.1.0/16) is NOT supported.  IP v6 is supported.  For example:
-# allowed_networks = 127.0.0.1, 192.168.1.*, 10.0.0.*, localmachine, *.okay.com
-# Or, to prevent un/mounting of any network shares, set:
-# allowed_networks =
-# allowed_networks_FSTYPE, if present, is used to override allowed_networks
-# when mounting or unmounting a specific network fstype (eg nfs, cifs, sshfs,
-# curlftpfs).  For example, to limit nfs and samba shares to only local
-# networks, use these two lines:
-# allowed_networks_nfs = 192.168.1.*, 10.0.0.*
-# allowed_networks_cifs = 192.168.1.*, 10.0.0.*
-allowed_networks = *
-
-
-# forbidden_networks and forbidden_networks_FSTYPE are used to specify networks
-# that are never allowed, even if other settings allow them (except fstab).
-# NO REVERSE LOOKUP IS PERFORMED, so including bad.com will only have an effect
-# if the user uses that hostname.  IP lookup is always performed, so forbidding
-# an IP address will also forbid all corresponding hostnames.
-forbidden_networks = 
-
-
-# allowed_files is used to determine what files in what directories may be
-# un/mounted.  A user must also have read permission on a file to mount it.
-# Note: Wildcards may be used, but a wildcard will never match a /, except
-# for "allowed_files=*" which allows any file, and a /** suffix, which matches
-# all files recursively.
-# For example, to allow only files in the /share directory to be mounted, use:
-# allowed_files = /share/*
-# To allow all files in the /share directory AND all subdirectories use:
-# allowed_files = /share/**
-# NOTE:  Specifying allowed_files_FSTYPE will NOT work because the fstype of
-# files is always 'file'.
-allowed_files = *
-
-
-# forbidden_files is used to specify files that are never allowed, even if
-# other settings allow them (except fstab).  Specify a full path.
-# Note: Wildcards may be used, but a wildcard will never match a /, except
-# for "forbidden_files = *", or a /** suffix, which matches all recursively.
-# NOTE: file paths are canonicalized before being tested, so forbidding
-# a link to a file will have no effect.
-forbidden_files = 
-
-
-# default_options specifies what options are always included when performing
-# a mount, in addition to any options the user may specify.
-# Note:  When a device is present in /etc/fstab, and the user does not specify
-# a mount point, the device is mounted with normal user permissions using
-# the fstab entry, without these options.
-# default_options_FSTYPE, if present, is used to override default_options
-# when mounting a specific fstype (eg ext2, nfs).
-# The variables $USER, $UID, and $GID are changed to the user's username, UID,
-# and GID.
-# FOR GOOD SECURITY, default_options SHOULD ALWAYS INCLUDE: nosuid,noexec,nodev
-# WARNING:  OPTIONS PRESENT OR MISSING CAN CAUSE SERIOUS SECURITY PROBLEMS.
-default_options           = nosuid, noexec, nodev, noatime
-default_options_file      = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, ro
-# mount iso9660 with 'ro' to prevent mount read-only warning
-default_options_iso9660   = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, ro, utf8
-default_options_udf       = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID
-default_options_vfat      = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID, utf8
-default_options_exfat     = nosuid, noexec, nodev, noatime, umask=0077, uid=$UID, gid=$GID, iocharset=utf8, namecase=0, nonempty
-default_options_msdos     = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID
-default_options_umsdos    = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID
-default_options_ntfs      = nosuid, noexec, nodev, noatime, fmask=0133, uid=$UID, gid=$GID, utf8
-default_options_cifs      = nosuid, noexec, nodev, uid=$UID, gid=$GID
-default_options_smbfs     = nosuid, noexec, nodev, uid=$UID, gid=$GID
-default_options_sshfs     = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, nonempty, allow_other
-default_options_curlftpfs = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, nonempty, allow_other
-default_options_ftpfs     = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID
-default_options_davfs     = nosuid, noexec, nodev, uid=$UID, gid=$GID
-default_options_tmpfs     = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID
-default_options_ramfs     = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID
-
-
-# allowed_options determines all options that a user may specify when mounting.
-# All the options used in default_options above must be included here too, or
-# they will be rejected.  If the user attempts to use an option not included
-# here, an error will result.  Wildcards may be used.
-# allowed_options_FSTYPE, if present, is used to override allowed_options
-# when mounting a specific fstype (eg ext2, nfs).
-# The variables $USER, $UID, and $GID are changed to the user's username, UID,
-# and GID.
-# If you want to forbid remounts, remove 'remount' from here.
-# WARNING:  OPTIONS HERE CAN CAUSE SERIOUS SECURITY PROBLEMS - CHOOSE CAREFULLY
-allowed_options           = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID, ro, rw, sync, flush, iocharset=*, utf8, remount
-allowed_options_nfs       = nosuid, noexec, nodev, noatime, ro, rw, sync, remount, port=*, rsize=*, wsize=*, hard, proto=*, timeo=*, retrans=*
-allowed_options_cifs      = nosuid, noexec, nodev, ro, rw, remount, port=*, user=*, username=*, pass=*, password=*, guest, domain=*, uid=$UID, gid=$GID, credentials=*
-allowed_options_smbfs     = nosuid, noexec, nodev, ro, rw, remount, port=*, user=*, username=*, pass=*, password=*, guest, domain=*, uid=$UID, gid=$GID, credentials=*
-allowed_options_sshfs     = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, gid=$GID, nonempty, allow_other, idmap=user, BatchMode=yes, port=*
-allowed_options_curlftpfs = nosuid, noexec, nodev, noatime, ro, rw, uid=$UID, gid=$GID, nonempty, allow_other, user=*
-allowed_options_ftpfs     = nosuid, noexec, nodev, noatime, ro, rw, port=*, user=*, pass=*, root=*, uid=$UID, gid=$GID
-allowed_options_exfat     = nosuid, noexec, nodev, noatime, fmask=0133, dmask=0022, uid=$UID, gid=$GID, umask=0077, namecase=*, ro, rw, sync, flush, iocharset=*, remount, nonempty
-
-
-# mount_point_mode, if present and set to a non-empty value, will cause udevil
-# to set the mode (permissions) on the moint point after mounting  If not
-# specified or if left empty, the mode is not changed.  Mode must be octal
-# starting with a zero (0755).
-# mount_point_mode_FSTYPE, if present, is used to override mount_point_mode
-# when mounting a specific fstype (eg ext2, nfs).
-# NOT SETTING A MODE CAN HAVE SECURITY IMPLICATIONS FOR SOME FSTYPES
-mount_point_mode = 0755
-# don't set a mode for some types:
-mount_point_mode_sshfs =
-mount_point_mode_curlftpfs =
-mount_point_mode_ftpfs =
-
-
-# Use the settings below to change the default locations of programs used by
-# udevil, or (advanced topic) to redirect commands to your scripts.
-# When substituting scripts, make sure they are root-owned and accept the
-# options used by udevil (for example, the mount_program must accept --fake,
-# -o, -v, and other options valid to mount.)
-# Be sure to specify the full path and include NO OPTIONS or other arguments.
-# These programs may also be specified as configure options when building
-# udevil.
-# THESE PROGRAMS ARE RUN AS ROOT
-# mount_program   = /bin/mount
-# umount_program  = /bin/umount
-# losetup_program = /sbin/losetup
-# setfacl_program = /usr/bin/setfacl
-
-
-# validate_exec specifies a program or script which provides additional
-# validation of a mount or unmount command, beyond the checks performed by
-# udevil.  The program is run as a normal user (if root runs udevil,
-# validate_exec will NOT be run).  The program is NOT run if the user is
-# mounting a device without root priviledges (a device in fstab).
-# The program is passed the username, a printable description of what is
-# happening, and the entire udevil command line as the first three arguments.
-# The program must return an exit status of 0 to allow the mount or unmount
-# to proceed.  If it returns non-zero, the user will be denied permission.
-# For example, validate_exec might specify a script which notifies you
-# of the command being run, or performs additional steps to authenticate the
-# user.
-# Specify a full path to the program, with NO options or arguments.
-# validate_exec =
-
-
-# validate_rootexec works similarly to validate_exec, except that the program
-# is run as root.  validate_rootexec will also be run if the root user runs
-# udevil.  If both validate_exec and validate_rootexec are specified, 
-# validate_rootexec will run first, followed by validate_exec.
-# The program must return an exit status of 0 to allow the mount or unmount
-# to proceed.  If it returns non-zero, the user will be denied permission.
-# Unless you are familiar with writing root scripts, it is recommended that
-# rootexec settings NOT be used, as it is easy to inadvertently open exploits.
-# THIS PROGRAM IS ALWAYS RUN AS ROOT, even if the user running udevil is not.
-# validate_rootexec =
-
-
-# success_exec is run after a successful mount, remount, or unmount.  The 
-# program is run as a normal user (if root runs udevil, success_exec
-# will NOT be run).
-# The program is passed the username, a printable description of what action
-# was taken, and the entire udevil command line as the first three arguments.
-# The program's exit status is ignored.
-# For example, success_exec might run a script which informs you of what action
-# was taken, and might perform further actions.
-# Specify a full path to the program, with NO options or arguments.
-# success_exec =
-
-
-# success_rootexec works similarly to success_exec, except that the program is
-# run as root.  success_rootexec will also be run if the root user runs udevil.
-# If both success_exec and success_rootexec are specified,  success_rootexec
-# will run first, followed by success_exec.
-# Unless you are familiar with writing root scripts, it is recommended that
-# rootexec settings NOT be used, as it is easy to inadvertently open exploits.
-# THIS PROGRAM IS ALWAYS RUN AS ROOT, even if the user running udevil is not.
-# success_rootexec =
-
--- a/community/bspwm/desktop-overlay/root/.bin/scripts.txt
+++ b/community/bspwm/desktop-overlay/root/.bin/scripts.txt
@ -1 +0,0 @@
-You can put your scripts in this directory and they become available to use in dmenu and command line without specifying the full path.
--- a/community/bspwm/desktop-overlay/usr/share/gtk-3.0/gtk.css
+++ b/community/bspwm/desktop-overlay/usr/share/gtk-3.0/gtk.css
@ -1,10 +0,0 @@
-.window-frame, .window-frame:backdrop {
-  box-shadow: 0 0 0 black;
-  border-style: none;
-  margin: 0;
-  border-radius: 0;
-}
-    
-.titlebar {
-  border-radius: 0;
-}
--- a/community/bspwm/desktop-overlay/usr/share/gtk-3.0/settings.ini
+++ b/community/bspwm/desktop-overlay/usr/share/gtk-3.0/settings.ini
@ -1,17 +0,0 @@
-[Settings]
-gtk-theme-name=Adwaita-Maia
-gtk-icon-theme-name=Breeze-Maia-Dark
-gtk-font-name=xos4 Terminus 13
-gtk-cursor-theme-name=xcursor-breeze
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=0
-gtk-xft-hinting=0
-gtk-xft-hintstyle=hintmedium
-gtk-application-prefer-dark-theme=1
-gtk-decoration-layout=:menu,appmenu,close
--- a/community/bspwm/live-overlay/etc/default
+++ b/community/bspwm/live-overlay/etc/default
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/default
--- a/community/bspwm/live-overlay/etc/fstab
+++ b/community/bspwm/live-overlay/etc/fstab
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/fstab
--- a/community/bspwm/live-overlay/etc/issue
+++ b/community/bspwm/live-overlay/etc/issue
@ -1,31 +0,0 @@
-[H[2J
-Manjaro Live ISO (\l) - \s-\r \m
-
-
-                 \e[0m# Welcome to Manjaro #
-
-
-              \e[34m██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ██████████████████  ████████
-              ████████            ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████
-              ████████  ████████  ████████\e[0m
-
-
-                         login:
-
-                   \e[34muser\e[0m     \e[1m\e[36mmanjaro\e[0m
-                   \e[34mpassword\e[0m \e[1m\e[36mmanjaro\e[0m
-
-          To launch the installer run: \e[1m\e[36msudo setup\e[0m
-
--- a/community/bspwm/live-overlay/etc/pam.d
+++ b/community/bspwm/live-overlay/etc/pam.d
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/pam.d
--- a/community/bspwm/live-overlay/etc/sudoers.d
+++ b/community/bspwm/live-overlay/etc/sudoers.d
@ -1 +0,0 @@
-../../../../shared/manjaro/live-overlay/etc/sudoers.d
--- a/community/bspwm/profile.conf
+++ b/community/bspwm/profile.conf
@ -1,64 +0,0 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
-displaymanager="none"
-
-nonfree_mhwd="false"
-
-multilib="false"
-
-# use extra packages as defined in pkglist to activate a full profile
-extra="false"
-
-################ install ################
-
-# configure calamares for netinstall
-netinstall="false"
-
-# configure calamares to use chrootcfg instead of unpackfs
-chrootcfg="false"
-
-# use geoip for localization
-# geoip='true'
-
-# unset defaults to given values
-# names must match systemd service names
-enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root')
-disable_systemd=('pacman-init')
-
-# unset defaults to given values,
-# names must match openrc service names
-# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager' 'tlp' 'tlp-sleep' 'xdm')
-# disable_openrc=()
-
-# the same workgroup name if samba is used
-# smb_workgroup=""
-
-################# livecd #################
-
-# unset defaults to given value
-hostname="manjaro-bspwm"
-
-# unset defaults to given value
-# username="manjaro"
-
-# unset defaults to given value
-# password="manjaro"
-
-# the login shell
-# defaults to bash
-login_shell=/bin/zsh
-
-# unset defaults to given values
-# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel"
-
-# unset defaults to given values
-# names must match systemd service names
-# services in enable_systemd array don't need to be listed here
-# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'pacman-boot')
-
-# unset defaults to given values,
-# names must match openrc service names
-# services in enable_openrc array don't need to be listed here
-# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'pacman-boot')
--- a/community/budgie/Packages-Desktop
+++ b/community/budgie/Packages-Desktop
@ -10,10 +10,15 @@ lightdm-slick-greeter
 lightdm-settings
 grub-theme-manjaro
 budgie-desktop
->extra budgie-extras
+budgie-extras
+budgie-desktop-view #support for desktop icons
 manjaro-budgie-settings
 papirus-maia-icon-theme
+manjaro-wallpapers-18.0
+wallpapers-2018
 manjaro-icons
+matcha-gtk-theme
+libappindicator-gtk3
 baobab
 dconf-editor
 hexchat
@ -26,17 +31,14 @@ gnome-font-viewer
 gnome-themes-standard
 gnome-keyring
 gnome-settings-daemon
-gnome-system-log
 gnome-system-monitor
 gnome-terminal
-gnome-screensaver
+budgie-screensaver
 gnome-screenshot
 >extra gnome-backgrounds
 grilo-plugins
 gucharmap
 mousetweaks
-nautilus
-nautilus-empty-file
 file-roller
 sushi
 vino
@ -57,6 +59,7 @@ gvfs-mtp
 gvfs-smb
 inxi
 imagewriter
+kvantum-theme-matcha
 mc # Midnight Commander
 #pacui
 mhwd-tui
@ -67,6 +70,8 @@ manjaro-hotfixes
 manjaro-pulse
 manjaro-settings-manager-notifier
 manjaro-hello
+manjaro-application-utility
+>extra snapd
 mesa-demos
 mobile-broadband-provider-info
 modemmanager
@ -85,7 +90,8 @@ networkmanager-vpnc
 nss-mdns
 numlockx
 openresolv
-pamac
+pamac-gtk
+pamac-snap-plugin
 polkit-gnome
 powertop
 pulseaudio-bluetooth
@ -111,14 +117,11 @@ ttf-indic-otf
 ttf-liberation
 budgie-wallpapers
 vino
-xdg-su
 xdg-user-dirs-gtk
 xdg-utils
 xf86-input-elographics
 xf86-input-evdev
-xf86-input-keyboard
 xf86-input-libinput
-xf86-input-mouse
 xf86-input-void
 xorg-twm
 xorg-xinit
@ -129,26 +132,23 @@ yelp
 >extra unrar
 >extra unace
 >extra lrzip
->extra gtk3-print-backends
->extra libreoffice-fresh
+>extra onlyoffice
 >extra thunderbird
 >extra lollypop
->extra empathy
+>extra pidgin
 >extra uget
 >extra transmission-gtk
 >extra brasero
 >extra manjaro-documentation-en
 >extra jre8-openjdk
 >extra jre8-openjdk-headless
->extra timeshift
->extra kernel-alive
-# >extra flashplugin
+timeshift
+#>extra kernel-alive
 >extra libdvdcss
->extra steam-manjaro
 >extra manjaro-printer
 >extra blueman
 >extra ffmpegthumbnailer
-#AUR complete support ( base devel + yaourt )
+#AUR complete support ( base devel )
 #>extra autoconf
 #>extra automake
 #>extra binutils
@ -163,5 +163,5 @@ yelp
 #>extra make
 #>extra patch
 #>extra subversion
-#>extra yaourt
 manjaro-aur-support
+
--- a/community/budgie/Packages-Live
+++ b/community/budgie/Packages-Live
@ -1 +0,0 @@
-../../shared/Packages-Live-Xorg
--- a/community/budgie/Packages-Mhwd
+++ b/community/budgie/Packages-Mhwd
@ -1 +0,0 @@
-../../shared/Packages-Mhwd
--- a/community/budgie/Packages-Root
+++ b/community/budgie/Packages-Root
@ -1 +0,0 @@
-../../shared/Packages-Root
--- a/community/budgie/desktop-overlay/etc/lightdm/slick-greeter.conf
+++ b/community/budgie/desktop-overlay/etc/lightdm/slick-greeter.conf
@ -1,5 +1,5 @@
 [Greeter]
 background=/usr/share/backgrounds/manjaro-budgie/manjaro-budgie.jpg
-theme-name=Adapta-Nokto-Maia
-icon-theme-name=Arc-Maia
+theme-name=Matcha-sea
+icon-theme-name=Papirus-Maia
 draw-grid=false
--- a/community/budgie/live-overlay
+++ b/community/budgie/live-overlay
@ -1 +0,0 @@
-../../shared/manjaro/live-overlay
--- a/community/budgie/profile.conf
+++ b/community/budgie/profile.conf
@ -5,7 +5,7 @@
 # use multilib packages; x86_64 only
 # multilib="true"

-extra="true"
+# extra="true"

 ################ install ################

@ -33,16 +33,11 @@ displaymanager="lightdm"

 # unset defaults to given values
 # names must match systemd service names
-  enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group')
+  enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'cups' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged' 'apparmor' 'snapd.apparmor' 'snapd')
 # disable_systemd=()

-# unset defaults to given values,
-# names must match openrc service names
-# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
-# disable_openrc=()
-
 # unset defaults to given values
-# addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel"
+# addgroups="lp,network,power,wheel"

 # the same workgroup name if samba is used
 # smb_workgroup=""
@ -62,8 +57,19 @@ hostname="manjaro-budgie"
 # names must match systemd service names
 # services in enable_systemd array don't need to be listed here
 # enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
+disable_systemd_live=('tlp' 'tlp-sleep')

 # unset defaults to given values,
 # names must match openrc service names
 # services in enable_openrc array don't need to be listed here
 # enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
+
+# unset defaults to given values
+# names must match systemd service names
+# services in enable_systemd array don't need to be listed here
+# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
+disable_systemd_live=('tlp' 'tlp-sleep' 'apparmor' 'snapd.apparmor' 'snapd' 'fstrim.timer' 'pkgfile–update.timer' 'ufw')
+# unset defaults to given values,
+# names must match openrc service names
+# services in enable_openrc array don't need to be listed here
+# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
--- a/community/cinnamon/Packages-Desktop
+++ b/community/cinnamon/Packages-Desktop
@ -1,44 +1,56 @@
 adapta-maia-theme
 alsa-firmware
 alsa-utils
+>extra apparmor
 autoconf
 automake
 avahi
 >extra baobab
 binutils
 bison
->extra blueberry
+>extra blueman
+>extra celluloid
+#cinnamon-panel-chooser
 cinnamon-sounds
+cinnamon-translations
 >extra cinnamon-wallpapers
 >extra dconf-editor
+>extra deluge
 dmidecode
+#>extra etcher
 fakeroot
 >extra ffmpegthumbnailer
->extra firefox
+#>extra firefox
+flatpak
 flex
+gvfs-goa
+gvfs-google
 >extra galculator
-gcc
->multilib gcc-libs-multilib
->multilib gcc-multilib
+>extra gcc
+>extra >multilib gcc-libs-multilib
+>extra >multilib gcc-multilib
 >extra gcolor2
 >extra gimp
 >extra git
-gksu
 >extra gnome-disk-utility
 gnome-keyring
+>extra gnome-online-accounts
 >extra gnome-screenshot
-gnome-system-log
-gnome-system-monitor
-gnome-terminal-fedora
+>extra gnome-system-monitor
+gnome-terminal
 gnome-themes-standard
+gnu-free-fonts
 >extra gparted
 >extra gprename
+grub-theme-manjaro-dev
 >extra gst-libav
 >extra gst-plugins-bad
 >extra gst-plugins-base
 >extra gst-plugins-good
 >extra gst-plugins-ugly
 >extra gstreamer
+gtkhash-nemo
+>extra gufw
 gvfs-afc
 gvfs-gphoto2
 gvfs-mtp
@ -47,20 +59,19 @@ htop
 >extra hexchat
 icon-naming-utils
 inxi
->extra isousb
 >extra jre8-openjdk
 >extra jre8-openjdk-headless
-kvantum-manjaro
 >multilib lib32-flex
 libtool
 >extra libdvdcss
 >extra libgsf
->extra libreoffice-fresh
 lightdm-settings
 lightdm-slick-greeter
+>extra lollypop
 m4
 make
 manjaro-alsa
+manjaro-application-utility
 manjaro-browser-settings
 manjaro-cinnamon-settings
 >extra manjaro-documentation-en
@ -74,9 +85,10 @@ manjaro-settings-manager-notifier
 >extra mobile-broadband-provider-info
 >extra modemmanager
 >extra mousetweaks
+>extra microsoft-office-web-jak
 >extra mugshot
 >multilib lib32-mesa-demos
->extra nemo-bulk-rename
+# >extra nemo-bulk-rename
 >extra nemo-fileroller
 >extra nemo-preview
 >extra nemo-python
@ -94,6 +106,7 @@ openssh
 >extra openvpn
 >extra p7zip
 pamac
+papirus-maia-icon-theme
 >extra parcellite
 patch
 >extra patchutils
@ -102,51 +115,49 @@ pavucontrol
 >extra pix
 pkg-config
 >extra poppler-data
+>extra popsicle
 >extra powertop
->extra pragha
+#>extra pragha
 >extra pulseaudio-bluetooth
 pulseaudio-ctl
-pulseaudio-gconf
 pulseaudio-zeroconf
-python2-ptyprocess
 python-ptyprocess
-qt5ct
-qt5-styleplugins
 screenfetch
+>extra snapd
+>basic squashfs-tools
 >extra subversion
 >extra system-config-printer
-terminus-font
+>extra terminus-font
 >extra thunderbird
->extra transmission-gtk
+>extra timeshift
 tree
-ttf-bitstream-vera
 ttf-dejavu
-ttf-droid
-ttf-inconsolata
-ttf-indic-otf
-ttf-liberation
+>extra ttf-droid
+>extra ttf-inconsolata
+>extra ttf-indic-otf
+>extra ttf-liberation
 >extra udiskie
->extra vertex-maia-themes
 vi
->extra vlc-nightly
 >extra xcursor-chameleon-pearl-deepin
-xdg-su
 xdg-user-dirs-gtk
 xdg-utils
 xed
 xf86-input-elographics
 xf86-input-evdev
-xf86-input-keyboard
 xf86-input-libinput
-xf86-input-mouse
 xf86-input-void
 xorg-twm
+>extra vivaldi
+>extra vivaldi-ffmpeg-codecs
 xorg-xinit
->extra xplayer
+#>extra xplayer
 >extra xreader
 >extra xviewer-plugins
->extra yaourt
-xdg-user-dirs
 xorg-server
 xorg-xhost
 xorg-xkill
+>extra xorg-xrandr
+>extra yay
+yelp
+zensu
+
--- a/community/cinnamon/Packages-Live
+++ b/community/cinnamon/Packages-Live
@ -1,10 +0,0 @@
-calamares
-cinnamon-live
-gsmartcontrol
-manjaro-architect
-manjaro-live-skel
-mkinitcpio-nfs-utils
-nbd
-grub-theme-live-manjaro
-squashfs-tools
-manjaro-live-systemd
--- a/community/cinnamon/Packages-Mhwd
+++ b/community/cinnamon/Packages-Mhwd
@ -1 +0,0 @@
-../../shared/Packages-Mhwd
--- a/community/cinnamon/Packages-Root
+++ b/community/cinnamon/Packages-Root
@ -1 +0,0 @@
-../../shared/Packages-Root
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`../../../../shared/manjaro/live-overlay/etc/default`
				`@ -1 +0,0 @@`
				`You can put your scripts in this directory and they become available to use in dmenu and command line without specifying the full path.`