Merge branch 'v18.0' into 'master'

merge V18.0 into master

See merge request profiles-and-settings/iso-profiles!151
This commit is contained in:
Stefano Capitani 2018-12-16 21:51:29 +01:00
commit ca3597b34c
9 changed files with 28 additions and 27 deletions

View File

@ -10,10 +10,13 @@ lightdm-slick-greeter
lightdm-settings
grub-theme-manjaro
budgie-desktop
>extra budgie-extras
budgie-extras
manjaro-budgie-settings
papirus-maia-icon-theme
manjaro-wallpapers-18.0
wallpapers-2018
manjaro-icons
matcha-gtk-theme
libappindicator-gtk3
baobab
dconf-editor
@ -68,6 +71,7 @@ manjaro-hotfixes
manjaro-pulse
manjaro-settings-manager-notifier
manjaro-hello
manjaro-application-utility
mesa-demos
mobile-broadband-provider-info
modemmanager
@ -141,9 +145,8 @@ yelp
>extra manjaro-documentation-en
>extra jre8-openjdk
>extra jre8-openjdk-headless
>extra timeshift
timeshift
>extra kernel-alive
# >extra flashplugin
>extra libdvdcss
>extra steam-manjaro
>extra manjaro-printer

View File

@ -5,7 +5,7 @@
# use multilib packages; x86_64 only
# multilib="true"
extra="true"
# extra="true"
################ install ################
@ -38,7 +38,7 @@ displaymanager="lightdm"
# unset defaults to given values,
# names must match openrc service names
# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
# disable_openrc=()
# unset defaults to given values

View File

@ -11,6 +11,7 @@ bison
cinnamon-sounds
cinnamon-translations
>extra cinnamon-wallpapers
dbus-x11
>extra dconf-editor
>extra deluge
dmidecode
@ -64,7 +65,7 @@ m4
make
manjaro-alsa
manjaro-browser-settings
manjaro-cinnamon-settings-dev
manjaro-cinnamon-settings
>extra manjaro-documentation-en
manjaro-hello
manjaro-hotfixes
@ -73,6 +74,7 @@ manjaro-pulse
manjaro-settings-manager-notifier
>extra mesa-demos
>basic midori
>extra mint-themes
>extra mobile-broadband-provider-info
>extra modemmanager
>extra mousetweaks
@ -96,6 +98,7 @@ openssh
>extra openvpn
>extra p7zip
pamac
papirus-maia-icon-theme
>extra parcellite
patch
>extra patchutils

View File

@ -1,5 +1,6 @@
calamares-git
calamares
cinnamon-live
clonezilla
grub-theme-live-manjaro
gsmartcontrol
manjaro-architect

View File

@ -3,7 +3,7 @@ background=/usr/share/backgrounds/greeter_default.jpg
background-color=#263138
draw-grid=false
theme-name=Adapta-Nokto-Eta-Maia
icon-theme-name=Vibrancy-Full-Dark-Teal
icon-theme-name=Papirus-Dark-Maia
font-name='Cantarell 11'
xft-antialias=true
xft-hintstyle=hintfull

View File

@ -5,8 +5,6 @@
# use multilib packages; x86_64 only
# multilib="true"
################ install ################
# default displaymanager: none
# supported; lightdm, sddm, gdm, lxdm, mdm
displaymanager="lightdm"
@ -17,6 +15,8 @@ displaymanager="lightdm"
# nonfree xorg drivers
# nonfree_mhwd="true"
################ install ################
# possible values: grub;systemd-boot
# efi_boot_loader="grub"
@ -31,16 +31,13 @@ displaymanager="lightdm"
# unset defaults to given values
# names must match systemd service names
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'add-autologin-group' 'haveged')
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw')
disable_systemd=('pacman-init')
# unset defaults to given values
# addgroups="lp,network,power,wheel"
# the same workgroup name if samba is used
# smb_workgroup=""
################# live-session #################
################# livecd #################
# unset defaults to given value
hostname="manjaro-deepin"
@ -51,6 +48,13 @@ hostname="manjaro-deepin"
# unset defaults to given value
# password="manjaro"
# the login shell
# defaults to bash
# login_shell=/bin/bash
# unset defaults to given values
# addgroups="lp,network,power,wheel"
# unset defaults to given values
# names must match systemd service names
# services in enable_systemd array don't need to be listed here

View File

@ -127,7 +127,7 @@ caja-open-terminal
>extra brasero
>extra jre8-openjdk
>extra jre8-openjdk-headless
>extra timeshift #backup utility
timeshift #backup utility
>extra kernel-alive #after a kernel update this maintain usable the modules
# >extra flashplugin
>extra libdvdcss

View File

@ -6,7 +6,7 @@
# multilib="true"
# use extra packages as defined in pkglist to activate a full profile
extra="true"
# extra="true"
################ install ################

View File

@ -35,11 +35,6 @@ displaymanager="lightdm"
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw')
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')
# disable_openrc=()
# the same workgroup name if samba is used
# smb_workgroup=""
@ -65,8 +60,3 @@ disable_systemd=('pacman-init')
# 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')