diff --git a/community/architect/Packages-Live b/community/architect/Packages-Live index 8f97807..e4af8c5 100644 --- a/community/architect/Packages-Live +++ b/community/architect/Packages-Live @@ -8,20 +8,15 @@ manjaro-architect-launcher manjaro-hotfixes mkinitcpio-nfs-utils nbd ->openrc elogind-openrc ->openrc openrc-settingsd ->openrc manjaro-live-openrc ->openrc networkmanager-openrc open-vm-tools ->systemd manjaro-live-systemd +manjaro-live-systemd networkmanager terminus-font virtualbox-guest-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput ->openrc xf86-input-libinput-nosystemd +xf86-input-libinput xf86-input-mouse xf86-input-vmmouse xf86-input-void diff --git a/community/architect/profile.conf b/community/architect/profile.conf index f87e1a6..53fb27d 100644 --- a/community/architect/profile.conf +++ b/community/architect/profile.conf @@ -8,10 +8,6 @@ hostname="manjaro-architect" enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep') -enable_openrc=('acpid' 'elogind' 'cronie' 'dbus' 'NetworkManager' 'syslog-ng') - enable_systemd_live=('manjaro-live' 'mirrors-live' 'pacman-init') -enable_openrc_live=('manjaro-live' 'mirrors-live' 'pacman-init') - # login_shell=/bin/bash diff --git a/community/bspwm/Packages-Desktop b/community/bspwm/Packages-Desktop index 9d8dd59..db42aa9 100644 --- a/community/bspwm/Packages-Desktop +++ b/community/bspwm/Packages-Desktop @@ -15,6 +15,7 @@ chromium clonezilla compton dash +dbus-x11 dconf delayed-hibernation desktop-file-utils @@ -52,6 +53,10 @@ ncdu networkmanager networkmanager-dispatcher-ntpd networkmanager-dmenu +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-vpnc openresolv yaourt pacui @@ -82,6 +87,7 @@ xf86-input-mouse xf86-input-void xfce4-notifyd-gtk3 xlogin +xorg-xbacklight xorg-server xorg-xinit xorg-xprop diff --git a/community/bspwm/Packages-Live b/community/bspwm/Packages-Live index 238adde..e0e582e 100644 --- a/community/bspwm/Packages-Live +++ b/community/bspwm/Packages-Live @@ -1,10 +1,9 @@ manjaro-live-skel mkinitcpio-nfs-utils nbd ->openrc manjaro-live-openrc >sonar sonar-calamares-branding squashfs-tools ->systemd manjaro-live-systemd +manjaro-live-systemd >sonar thus >manjaro grub-theme-live-manjaro >sonar grub-theme-live-sonar diff --git a/community/budgie/Packages-Desktop b/community/budgie/Packages-Desktop index 8241448..b006870 100644 --- a/community/budgie/Packages-Desktop +++ b/community/budgie/Packages-Desktop @@ -10,6 +10,7 @@ lightdm-slick-greeter lightdm-settings budgie-desktop manjaro-budgie-settings +manjaro-icons baobab dconf-editor hexchat @@ -27,7 +28,6 @@ gnome-system-monitor gnome-terminal gnome-screensaver gnome-screenshot -gnome-tweak-tool >extra gnome-backgrounds grilo-plugins gucharmap @@ -90,13 +90,14 @@ pulseaudio-bluetooth pulseaudio-ctl pulseaudio-zeroconf sushi ->systemd xdg-user-dirs ->systemd xorg-server ->systemd alsa-utils ->systemd avahi +xdg-user-dirs +xorg-server +alsa-utils +avahi +usb_modeswitch networkmanager ->systemd ntp ->systemd openssh +ntp +openssh terminus-font totem tracker @@ -112,7 +113,6 @@ moka-icon-theme #firefox-arc-maia-settings ff-theme-util budgie-wallpapers -moka-icon-theme vino xdg-su xdg-user-dirs-gtk @@ -120,7 +120,7 @@ xdg-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput +xf86-input-libinput xf86-input-mouse xf86-input-void xorg-twm @@ -133,24 +133,6 @@ yelp >extra unace >extra lrzip >extra gtk3-print-backends ->openrc alsa-utils-openrc ->openrc avahi-openrc ->openrc elogind-openrc ->openrc openrc-settingsd ->openrc cronjobs ->openrc displaymanager-openrc ->openrc networkmanager-openrc ->openrc ntp-openrc ->openrc openssh-openrc ->openrc sddm-elogind ->openrc syslog-ng-openrc ->openrc json-c ->openrc xdg-user-dirs-nosystemd ->openrc xorg-server-nosystemd ->openrc xf86-input-libinput-nosystemd ->openrc accountsservice-elogind ->openrc upower-nosystemd ->openrc udisks2-elogind >extra libreoffice-fresh >extra thunderbird >extra lollypop diff --git a/community/budgie/desktop-overlay/etc/lightdm/slick-greeter.conf b/community/budgie/desktop-overlay/etc/lightdm/slick-greeter.conf deleted file mode 100644 index 35ce18b..0000000 --- a/community/budgie/desktop-overlay/etc/lightdm/slick-greeter.conf +++ /dev/null @@ -1,5 +0,0 @@ -[Greeter] -background=/usr/share/backgrounds/manjaro-budgie/Budgie_minimal wall.jpg -theme-name=Vertex-Maia-Dark -icon-theme-name=Arc-Maia -draw-grid=false diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop index 7e2c6c4..2635676 100644 --- a/community/cinnamon/Packages-Desktop +++ b/community/cinnamon/Packages-Desktop @@ -7,9 +7,7 @@ avahi cinnamon-sounds >extra cinnamon-wallpapers >extra dconf-editor ->openrc displaymanager-openrc dmidecode ->openrc elogind-openrc >extra ffmpegthumbnailer >extra ff-theme-util >extra firefox @@ -25,16 +23,16 @@ gnome-system-log gnome-system-monitor gnome-terminal >extra gparted +>extra gprename >extra gst-libav >extra gst-plugins-bad >extra gst-plugins-base >extra gst-plugins-good >extra gst-plugins-ugly >extra gstreamer -gvfs-afc >extra >multilib gcc-libs-multilib >extra >multilib gcc-multilib -gvfs-google +gvfs-afc gvfs-gphoto2 gvfs-mtp gvfs-smb @@ -66,13 +64,17 @@ manjaro-settings-manager-notifier >extra mousetweaks >extra mugshot >multilib lib32-mesa-demos +>extra nemo-bulk-rename >extra nemo-fileroller >extra nemo-preview >extra nemo-python >extra nemo-share netctl networkmanager-dispatcher-ntpd ->openrc networkmanager-openrc +networkmanager-openconnect +networkmanager-openvpn +networkmanager-pptp +networkmanager-vpnc >extra npapi-vlc nss-mdns ntp @@ -120,8 +122,7 @@ xed xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput ->openrc xf86-input-libinput-nosystemd +xf86-input-libinput xf86-input-mouse xf86-input-void xorg-twm @@ -130,10 +131,5 @@ xorg-xinit >extra xreader >extra xviewer-plugins >extra yaourt ->openrc accountsservice-elogind ->openrc upower-nosystemd ->openrc udisks2-elogind ->openrc xdg-user-dirs-nosystemd ->openrc xorg-server-nosystemd ->systemd xdg-user-dirs ->systemd xorg-server +xdg-user-dirs +xorg-server diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf index eaa64b2..a0b955d 100644 --- a/community/cinnamon/profile.conf +++ b/community/cinnamon/profile.conf @@ -37,11 +37,6 @@ nonfree_mhwd="true" # 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 # addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" @@ -63,8 +58,3 @@ hostname="manjaro-cinnamon" # 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') diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop index 490c0e1..9e02b15 100644 --- a/community/deepin/Packages-Desktop +++ b/community/deepin/Packages-Desktop @@ -17,7 +17,7 @@ deepin-gtk-theme >extra deepin-music >extra deepin-screen-recorder >extra deepin-screenshot -#>extra deepin-system-monitor +>extra deepin-system-monitor deepin-terminal dmidecode >extra downgrade @@ -34,7 +34,7 @@ gedit >extra gimp gksu >extra gparted ->extra gnome-system-monitor +#>extra gnome-system-monitor >extra gst-libav >extra gst-plugins-bad >extra gst-plugins-base @@ -109,8 +109,7 @@ xdg-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput ->openrc xf86-input-libinput-nosystemd +xf86-input-libinput xf86-input-mouse xf86-input-void >extra xfburn @@ -119,10 +118,5 @@ xorg-xinit >extra xsane >extra xsane-gimp >extra yaourt ->openrc accountsservice-elogind ->openrc upower-nosystemd ->openrc udisks2-elogind ->openrc xdg-user-dirs-nosystemd ->openrc xorg-server-nosystemd ->systemd xdg-user-dirs ->systemd xorg-server +xdg-user-dirs +xorg-server diff --git a/community/deepin/desktop-overlay/etc/skel/.config/deepin/deepin-terminal/config.conf b/community/deepin/desktop-overlay/etc/skel/.config/deepin/deepin-terminal/config.conf deleted file mode 100644 index 27a7f25..0000000 --- a/community/deepin/desktop-overlay/etc/skel/.config/deepin/deepin-terminal/config.conf +++ /dev/null @@ -1,21 +0,0 @@ -[theme] -color_1=#2e3436 -color_2=#cc0000 -color_3=#4e9a06 -color_4=#c4a000 -color_5=#3465a4 -color_6=#75507b -color_7=#0b939b -color_8=#d3d7cf -color_9=#555753 -color_10=#ef2929 -color_11=#8ae234 -color_12=#fce94f -color_13=#729fcf -color_14=#ad7fa8 -color_15=#00f5e9 -color_16=#eeeeec -background=#101010 -foreground=#f2f2f2 -tab=#f2f2f2 -style=dark diff --git a/community/deepin/profile.conf b/community/deepin/profile.conf index ebaec41..923a2fa 100644 --- a/community/deepin/profile.conf +++ b/community/deepin/profile.conf @@ -37,11 +37,6 @@ displaymanager="lightdm" # 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 # addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" @@ -63,8 +58,3 @@ hostname="manjaro-deepin" # 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') diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop index 040f906..cf647a3 100644 --- a/community/i3/Packages-Desktop +++ b/community/i3/Packages-Desktop @@ -1,22 +1,18 @@ accountsservice alsa-firmware alsa-plugins ->systemd alsa-utils ->openrc alsa-utils-openrc +alsa-utils arandr artwork-i3 autoconf automake ->systemd avahi +avahi binutils bison blueman bmenu clipit ->openrc elogind-openrc ->openrc openrc-settingsd dfc ->openrc displaymanager-openrc dmidecode downgrade epdfview @@ -61,7 +57,7 @@ lm_sensors lxappearance lxinput m4 ->systemd maia-console +maia-console make >multilib manjaro-alsa manjaro-browser-settings @@ -70,6 +66,7 @@ manjaro-hotfixes manjaro-i3-settings manjaro-printer manjaro-settings-manager-notifier +markdown_previewer mesa-demos mlocate mobile-broadband-provider-info @@ -80,9 +77,8 @@ mousepad >multilib lib32-flex >multilib lib32-mesa-demos ncdu ->systemd netctl +netctl networkmanager ->openrc networkmanager-openrc network-manager-applet networkmanager-dispatcher-ntpd networkmanager-openconnect @@ -90,12 +86,10 @@ networkmanager-openvpn networkmanager-pptp networkmanager-vpnc nss-mdns ->systemd ntp ->openrc ntp-openrc +ntp open-fuse-iso ->systemd openresolv ->systemd openssh ->openrc openssh-openrc +openresolv +openssh p7zip palemoon-bin pamac @@ -141,8 +135,7 @@ xdotool xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput ->openrc xf86-input-libinput-nosystemd +xf86-input-libinput xf86-input-mouse xf86-input-void xfburn @@ -153,10 +146,5 @@ xorg-xkill xorg-xprop xterm yaourt ->openrc accountsservice-elogind ->openrc upower-nosystemd ->openrc udisks2-elogind ->openrc xdg-user-dirs-nosystemd ->openrc xorg-server-nosystemd ->systemd xdg-user-dirs ->systemd xorg-server +xdg-user-dirs +xorg-server diff --git a/community/i3/profile.conf b/community/i3/profile.conf index 21963e3..1856cf6 100644 --- a/community/i3/profile.conf +++ b/community/i3/profile.conf @@ -37,11 +37,6 @@ displaymanager="lightdm" # 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 # addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" @@ -63,8 +58,3 @@ hostname="manjaro-i3" # 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') diff --git a/community/lxde/Packages-Desktop b/community/lxde/Packages-Desktop index 03d6ac5..13dd811 100644 --- a/community/lxde/Packages-Desktop +++ b/community/lxde/Packages-Desktop @@ -1,22 +1,23 @@ ## Network ->systemd avahi ->systemd networkmanager +avahi +networkmanager networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc networkmanager-dispatcher-ntpd nss-mdns # NSS support for mDNS (optdepend for avahi) ->systemd ntp +ntp mobile-broadband-provider-info modemmanager ->systemd openresolv ->systemd openssh +openresolv +openssh samba +usb_modeswitch ## Libraries for Sound/Audio/Video alsa-firmware ->systemd alsa-utils +alsa-utils ffmpeg gst-libav gst-plugins-bad @@ -25,10 +26,10 @@ gst-plugins-good gst-plugins-ugly libdvdcss >multilib manjaro-alsa ->systemd manjaro-pulse ->systemd pulseaudio-bluetooth ->systemd pulseaudio-ctl ->systemd pulseaudio-zeroconf +manjaro-pulse +pulseaudio-bluetooth +pulseaudio-ctl +pulseaudio-zeroconf ## Connect Packages android-tools @@ -100,7 +101,7 @@ gnome-keyring # fix wlan segfault libgsf # tumbler - for ODF thumbnails libopenraw # tumbler - for RAW thumbnails network-manager-applet ->systemd pavucontrol +pavucontrol manjaro-lxde-settings gnome-icon-theme gnome-themes-standard @@ -111,6 +112,7 @@ manjaro-hello manjaro-settings-manager manjaro-settings-manager-notifier engrampa +gnome-disk-utility gparted inxi dmidecode # optional dependency inxi @@ -188,24 +190,17 @@ manjaro-hotfixes ## Extra Cli Applications >extra pacui ->extra mhwd-tui >extra powertop >extra htop >extra mlocate -## Games ->extra steam-manjaro - ## Extra Applications >extra gufw >extra guvcview ->extra gnome-disk-utility >extra transmission-gtk >extra gimp >extra libreoffice-fresh ->extra pidgin >extra vlc-nightly >extra thunderbird >extra xfburn >extra yelp ->extra menulibre diff --git a/community/lxde/desktop-overlay/etc/X11/xorg.conf.d/70-synaptics.conf b/community/lxde/desktop-overlay/etc/X11/xorg.conf.d/70-synaptics.conf index a8030fc..05be751 100644 --- a/community/lxde/desktop-overlay/etc/X11/xorg.conf.d/70-synaptics.conf +++ b/community/lxde/desktop-overlay/etc/X11/xorg.conf.d/70-synaptics.conf @@ -7,7 +7,7 @@ Section "InputClass" Option "TapButton3" "2" Option "VertEdgeScroll" "on" Option "HorizEdgeScroll" "on" - Option "SingleTapTimeout" "10" + Option "SingleTapTimeout" "100" EndSection Section "InputClass" diff --git a/community/lxde/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/community/lxde/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf index c5e127f..aacfb0f 100644 --- a/community/lxde/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf +++ b/community/lxde/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf @@ -4,7 +4,7 @@ font-name = Cantarell 12 xft-antialias = true icon-theme-name = Arc-Maia screensaver-timeout = 60 -theme-name = Vertex-Maia +theme-name = Adapta-Eta-Maia cursor-theme-name = Breeze show-clock = false default-user-image = #avatar-default diff --git a/community/lxde/profile.conf b/community/lxde/profile.conf index 5d3ba86..c63c478 100644 --- a/community/lxde/profile.conf +++ b/community/lxde/profile.conf @@ -5,45 +5,50 @@ # use multilib packages; x86_64 only # multilib="true" +# use extra packages as defined in pkglist to activate a full profile +extra="true" + +################ install ################ + +# default displaymanager: none +# supported; lightdm, sddm, gdm, lxdm, mdm displaymanager="lightdm" # Set to false to disable autologin in the livecd # autologin="true" -# nonfree mhwd drivers +# nonfree xorg drivers # nonfree_mhwd="true" -# use extra packages as defined in pkglist to activate a full profile -extra="false" - -################ install ################ - -# unset defaults to given value +# possible values: grub;systemd-boot # efi_boot_loader="grub" # configure calamares for netinstall -netinstall="true" +# netinstall="false" -# configure calamares to use chrootcfg instead of unpackfs +# configure calamares to use chrootcfg instead of unpackfs; default: unpackfs # chrootcfg="false" -# use geoip for localization -# geoip='true' +# use geoip +# geoip="true" # unset defaults to given values # names must match systemd service names -enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep') -disable_systemd=('pacman-init') +# 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=() -# the same workgroup name if samba is used -# smb_workgroup="" +# unset defaults to given values +# addgroups="video,power,storage,optical,network,lp,scanner,wheel" -################# livecd ################# +# the same workgroup name if samba is used +# smb_workgroup="Manjaro" + +################# live-session ################# # unset defaults to given value hostname="manjaro-lxde" @@ -58,9 +63,6 @@ hostname="manjaro-lxde" # defaults to bash # login_shell=/bin/bash -# 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 diff --git a/community/mate/Packages-Desktop b/community/mate/Packages-Desktop index 752d4d9..c954c43 100644 --- a/community/mate/Packages-Desktop +++ b/community/mate/Packages-Desktop @@ -30,6 +30,7 @@ mate-user-guide mate-system-monitor mate-power-manager pluma +mozo gnome-disk-utility gnome-keyring manjaro-mate-settings @@ -62,6 +63,7 @@ manjaro-hello mesa-demos mobile-broadband-provider-info modemmanager +usb_modeswitch >multilib lib32-mesa-demos netctl network-manager-applet @@ -72,27 +74,17 @@ networkmanager-pptp networkmanager-vpnc nss-mdns numlockx ->openrc alsa-utils-openrc ->openrc avahi-openrc ->openrc elogind-openrc ->openrc openrc-settingsd ->openrc displaymanager-openrc ->openrc networkmanager-openrc ->openrc ntp-openrc ->openrc openssh-openrc ->openrc sddm-elogind ->openrc syslog-ng-openrc openresolv pamac powertop pulseaudio-bluetooth pulseaudio-ctl pulseaudio-zeroconf ->systemd alsa-utils ->systemd avahi +alsa-utils +avahi networkmanager ->systemd ntp ->systemd openssh +ntp +openssh terminus-font ttf-bitstream-vera ttf-dejavu @@ -112,8 +104,7 @@ xdg-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput ->openrc xf86-input-libinput-nosystemd +xf86-input-libinput xf86-input-mouse xf86-input-void xorg-twm @@ -157,11 +148,5 @@ caja-open-terminal #>extra yaourt manjaro-aur-support - ->openrc accountsservice-elogind ->openrc upower-nosystemd ->openrc udisks2-elogind ->openrc xdg-user-dirs-nosystemd ->openrc xorg-server-nosystemd ->systemd xdg-user-dirs ->systemd xorg-server +xdg-user-dirs +xorg-server diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 3822c78..be66cb4 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -3,12 +3,12 @@ alsa-firmware baobab dconf-editor dmidecode -#empathy hexchat gthumb evince firefox gdm +manjaro-gnome-maia-theme #>extra gdm3setup #lightdm #lightdm-slick-greeter @@ -114,6 +114,7 @@ ttf-droid ttf-inconsolata ttf-indic-otf ttf-liberation +>systemd usb_modeswitch arc-maia-icon-theme moka-icon-theme #firefox-arc-maia-settings #disable theming since upstream no adjust the theme @@ -145,6 +146,7 @@ yelp >extra evolution >extra lollypop >extra empathy +>extra telepathy-accounts-signon >extra uget >extra transmission-gtk >extra brasero diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf index d0c3c3f..efbb7d6 100644 --- a/manjaro/gnome/profile.conf +++ b/manjaro/gnome/profile.conf @@ -34,7 +34,7 @@ displaymanager="gdm" # unset defaults to given values # names must match systemd service names - enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'no-tray-icon') + enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep') # disable_systemd=() # unset defaults to given values, diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 2c13b65..83910c1 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -1,27 +1,23 @@ ## Network ->systemd avahi ->openrc avahi-openrc +avahi networkmanager ->openrc networkmanager-openrc networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc networkmanager-dispatcher-ntpd nss-mdns # NSS support for mDNS (optdepend for avahi) ->systemd ntp ->openrc ntp-openrc +ntp mobile-broadband-provider-info modemmanager ->systemd openresolv ->systemd openssh ->openrc openssh-openrc +openresolv +openssh samba +usb_modeswitch ## Libraries for Sound/Audio/Video alsa-firmware ->systemd alsa-utils ->openrc alsa-utils-openrc +alsa-utils ffmpeg gst-libav gst-plugins-bad @@ -120,8 +116,7 @@ octopi-repoeditor >extra python-reportlab ## Display manager ->systemd sddm ->openrc sddm-elogind +sddm sddm-kcm ## Plasma5 @@ -260,7 +255,7 @@ manjaro-settings-manager-knotifier powertop >extra qbittorrent screenfetch ->systemd systemd-kcm +systemd-kcm >extra thunderbird-kde vlc-nightly yakuake @@ -285,16 +280,13 @@ manjaro-browser-settings xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput ->openrc xf86-input-libinput-nosystemd +xf86-input-libinput xf86-input-mouse xf86-input-void ## Xorg Server and Graphics ->systemd xdg-user-dirs ->systemd xorg-server ->openrc xdg-user-dirs-nosystemd ->openrc xorg-server-nosystemd +xdg-user-dirs +xorg-server xorg-twm xorg-xinit mesa-demos @@ -307,12 +299,6 @@ xdg-su ## Misc manjaro-hotfixes ->openrc elogind-openrc ->openrc openrc-settingsd ->openrc displaymanager-openrc ->openrc accountsservice-elogind ->openrc upower-nosystemd ->openrc udisks2-elogind ## Flatpak support >extra flatpak diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf index 71559c0..d583b16 100644 --- a/manjaro/kde/profile.conf +++ b/manjaro/kde/profile.conf @@ -15,7 +15,7 @@ displaymanager="sddm" # use extra packages as defined in pkglist to activate a full profile # extra="false" -extra="true" +#extra="true" ################ install ################ diff --git a/manjaro/lxqt/Packages-Desktop b/manjaro/lxqt/Packages-Desktop index b1d3549..6376479 100644 --- a/manjaro/lxqt/Packages-Desktop +++ b/manjaro/lxqt/Packages-Desktop @@ -33,25 +33,6 @@ network-manager-applet nss-mdns obconf-qt openbox ->openrc alsa-utils-openrc ->openrc avahi-openrc ->openrc elogind-openrc ->openrc openrc-settingsd ->openrc cronjobs ->openrc displaymanager-openrc ->openrc networkmanager-openrc ->openrc ntp-openrc ->openrc openssh-openrc ->openrc sddm-elogind ->openrc syslog-ng-openrc ->openrc json-c ->openrc xdg-user-dirs-nosystemd ->openrc xorg-server-nosystemd ->openrc accountsservice-elogind ->openrc upower-nosystemd ->openrc udisks2-elogind ->openrc media-player-info-nosystemd ->openrc libpulse-nosystemd pcmanfm-qt powertop qterminal @@ -60,15 +41,15 @@ octopi octopi-notifier-qt5 qupzilla sddm-qt-manjaro-theme ->systemd alsa-utils ->systemd avahi +alsa-utils +avahi networkmanager ->systemd ntp ->systemd openssh ->systemd sddm ->systemd syslog-ng ->systemd xdg-user-dirs ->systemd xorg-server +ntp +openssh +sddm +syslog-ng +xdg-user-dirs +xorg-server terminus-font ttf-bitstream-vera ttf-dejavu @@ -76,6 +57,7 @@ ttf-droid ttf-inconsolata ttf-indic-otf ttf-liberation +usb_modeswitch xarchiver xdg-su xdg-utils diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 0b83e09..85acc75 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -1,27 +1,23 @@ ## Network ->systemd avahi ->openrc avahi-openrc +avahi networkmanager ->openrc networkmanager-openrc networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc networkmanager-dispatcher-ntpd nss-mdns # NSS support for mDNS (optdepend for avahi) ->systemd ntp ->openrc ntp-openrc +ntp mobile-broadband-provider-info modemmanager ->systemd openresolv ->systemd openssh ->openrc openssh-openrc +openresolv +openssh samba +usb_modeswitch ## Libraries for Sound/Audio/Video alsa-firmware ->systemd alsa-utils ->openrc alsa-utils-openrc +alsa-utils ffmpeg gst-libav gst-plugins-bad @@ -30,10 +26,10 @@ gst-plugins-good gst-plugins-ugly libdvdcss >multilib manjaro-alsa ->systemd manjaro-pulse ->systemd pulseaudio-bluetooth ->systemd pulseaudio-ctl ->systemd pulseaudio-zeroconf +manjaro-pulse +pulseaudio-bluetooth +pulseaudio-ctl +pulseaudio-zeroconf ## Connect Packages android-tools @@ -179,8 +175,8 @@ xfce4-taskmanager >extra xfce4-weather-plugin xfce4-whiskermenu-plugin xfce4-xkb-plugin ->systemd pa-applet ->systemd pavucontrol +xfce4-pulseaudio-plugin +pavucontrol ## Themes QT/GTK/SDDM >extra manjaro-wallpapers-17.0 @@ -245,16 +241,13 @@ manjaro-browser-settings xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput ->openrc xf86-input-libinput-nosystemd +xf86-input-libinput xf86-input-mouse xf86-input-void ## Xorg Server and Graphics ->systemd xdg-user-dirs ->systemd xorg-server ->openrc xdg-user-dirs-nosystemd ->openrc xorg-server-nosystemd +xdg-user-dirs +xorg-server numlockx mesa-demos >multilib lib32-mesa-demos @@ -269,12 +262,6 @@ xdg-su ## Misc manjaro-hotfixes ->openrc elogind-openrc ->openrc openrc-settingsd ->openrc displaymanager-openrc ->openrc accountsservice-elogind ->openrc upower-nosystemd ->openrc udisks2-elogind vibrancy-colors diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf index 7220bba..deb8325 100644 --- a/manjaro/xfce/profile.conf +++ b/manjaro/xfce/profile.conf @@ -14,7 +14,7 @@ displaymanager="lightdm" # nonfree_mhwd="true" # use extra packages as defined in pkglist to activate a full profile -extra="true" +# extra="true" ################ install ################ diff --git a/shared/Packages-Desktop b/shared/Packages-Desktop index 128f959..73cdb61 100644 --- a/shared/Packages-Desktop +++ b/shared/Packages-Desktop @@ -12,30 +12,14 @@ modemmanager >multilib lib32-mesa-demos nss-mdns numlockx ->openrc alsa-utils-openrc ->openrc avahi-openrc ->openrc elogind-openrc ->openrc openrc-settingsd ->openrc displaymanager-openrc ->openrc networkmanager-openrc ->openrc ntp-openrc ->openrc openssh-openrc ->openrc accountsservice-elogind ->openrc upower-nosystemd ->openrc udisks2-elogind ->openrc xdg-user-dirs-nosystemd ->openrc xorg-server-nosystemd ->openrc media-player-info-nosystemd ->openrc libpulse-nosystemd powertop ->systemd alsa-utils ->systemd avahi +alsa-utils +avahi networkmanager -usb_modeswitch ->systemd ntp ->systemd openssh ->systemd xdg-user-dirs ->systemd xorg-server +ntp +openssh +xdg-user-dirs +xorg-server terminus-font ttf-bitstream-vera ttf-dejavu @@ -48,8 +32,7 @@ xdg-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput ->openrc xf86-input-libinput-nosystemd +xf86-input-libinput xf86-input-mouse xf86-input-void xorg-server-utils diff --git a/shared/Packages-Live b/shared/Packages-Live index 65b0e94..39acf5c 100644 --- a/shared/Packages-Live +++ b/shared/Packages-Live @@ -2,10 +2,10 @@ calamares manjaro-live-skel mkinitcpio-nfs-utils nbd +gsmartcontrol >manjaro grub-theme-live-manjaro >sonar grub-theme-live-sonar ->openrc manjaro-live-openrc >sonar sonar-calamares-branding squashfs-tools ->systemd manjaro-live-systemd +manjaro-live-systemd >sonar thus diff --git a/shared/Packages-Live-Xorg b/shared/Packages-Live-Xorg index bfe867f..ceb7a43 100644 --- a/shared/Packages-Live-Xorg +++ b/shared/Packages-Live-Xorg @@ -8,15 +8,13 @@ mkinitcpio-nfs-utils >multilib lib32-libxvmc >multilib lib32-primus nbd ->openrc bumblebee-openrc ->openrc manjaro-live-openrc open-vm-tools primus >manjaro grub-theme-live-manjaro >sonar grub-theme-live-sonar squashfs-tools ->systemd bumblebee ->systemd manjaro-live-systemd +bumblebee +manjaro-live-systemd xf86-input-vmmouse xf86-video-amdgpu xf86-video-ati diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd index fa3b353..5c8ea14 100644 --- a/shared/Packages-Mhwd +++ b/shared/Packages-Mhwd @@ -27,13 +27,11 @@ mesa-vdpau >nonfree_multilib lib32-nvidia-340xx-utils >nonfree_multilib lib32-nvidia-utils opencl-mesa ->openrc bumblebee-openrc ->openrc virtualbox-guest-utils-openrc open-vm-tools pangox-compat primus ->systemd bumblebee ->systemd virtualbox-guest-utils +bumblebee +virtualbox-guest-utils vulkan-radeon >multilib lib32-vulkan-radeon vulkan-intel diff --git a/shared/Packages-Root b/shared/Packages-Root index 37d265d..abd273f 100644 --- a/shared/Packages-Root +++ b/shared/Packages-Root @@ -51,33 +51,12 @@ mhwd-db mkinitcpio-openswap nano ntfs-3g ->openrc acpid-openrc ->openrc cpupower-openrc ->openrc cronie-openrc ->openrc cryptsetup-openrc ->openrc dbus-openrc ->openrc dbus-elogind ->openrc device-mapper-openrc ->openrc dhcpcd-openrc ->openrc eudev-systemd ->openrc haveged-openrc ->openrc libeudev-systemd ->openrc lvm2-openrc ->openrc mdadm-openrc ->openrc netifrc ->openrc nfs-utils-openrc ->openrc rsync-openrc ->openrc wpa_supplicant-openrc ->openrc libusb-nosystemd ->openrc mkinitcpio-nosystemd os-prober pacman pciutils ->systemd pcmciautils ->openrc pcmciautils-nosystemd +pcmciautils perl ->systemd procps-ng ->openrc procps-ng-elogind +procps-ng psmisc reiserfsprogs sed @@ -86,26 +65,26 @@ s-nail >sonar sonar-release sudo sysfsutils ->systemd acpid ->systemd cpupower ->systemd cronie ->systemd cryptsetup ->systemd device-mapper ->systemd dhcpcd ->systemd haveged ->systemd lvm2 ->systemd mdadm ->systemd nfs-utils ->systemd rsync ->systemd systemd-sysvcompat ->systemd tlp ->systemd wpa_supplicant +acpid +cpupower +cronie +cryptsetup +device-mapper +dhcpcd +haveged +lvm2 +mdadm +nfs-utils +rsync +systemd-sysvcompat +tlp +wpa_supplicant tar texinfo usbutils ->systemd util-linux ->openrc util-linux-nosystemd +util-linux vi +wget which xfsprogs zd1211-firmware diff --git a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc new file mode 100644 index 0000000..2d5cad0 --- /dev/null +++ b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc @@ -0,0 +1,23 @@ +--- +componentName: manjaro + +strings: + productName: Manjaro Linux + shortProductName: Manjaro + version: 17.1-pre1 + shortVersion: 17.1-pre1 + versionedName: Manjaro Linux 17.1-pre1 "Hakoila" + shortVersionedName: Manjaro 17.1-pre1 + bootloaderEntryName: Manjaro + +images: + productLogo: "squid.png" + productIcon: "logo.png" + productWelcome: "languages.png" + +slideshow: "show.qml" + +style: + sidebarBackground: "#454948" + sidebarText: "#efefef" + sidebarTextSelect: "#9E4F5D"