Merge pull request #1 from manjaro/master

merge upstream
This commit is contained in:
Thanos Apostolou 2017-09-03 12:24:33 +00:00 committed by GitHub
commit 3a05a4446a
3 changed files with 25 additions and 21 deletions

View File

@ -111,6 +111,7 @@ manjaro-hello
manjaro-settings-manager
manjaro-settings-manager-notifier
engrampa
gnome-disk-utility
gparted
inxi
dmidecode # optional dependency inxi
@ -185,6 +186,8 @@ manjaro-hotfixes
## Extra Themes/Artwork
>extra manjaro-wallpapers-17.0
>extra breath-wallpaper
>extra vertex-maia-themes
## Extra Cli Applications
>extra pacui
@ -199,7 +202,6 @@ manjaro-hotfixes
## Extra Applications
>extra gufw
>extra guvcview
>extra gnome-disk-utility
>extra transmission-gtk
>extra gimp
>extra libreoffice-fresh

View File

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

View File

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