Merge pull request #1 from manjaro/master

update fork
This commit is contained in:
Chrysostomus 2017-03-05 18:32:44 +02:00 committed by GitHub
commit 4836a03712
18 changed files with 54 additions and 147 deletions

View File

@ -3,6 +3,7 @@ KERNEL-ndiswrapper
KERNEL-r8168
KERNEL-rt3562sta
KERNEL-virtualbox-guest-modules
maia-console
manjaro-architect-launcher
manjaro-hotfixes
manjaro-syslinux-theme

View File

@ -2,10 +2,10 @@
Manjaro Live ISO (\l) - \s-\r \m
# Welcome to Manjaro #
\e[0m# Welcome to Manjaro #
██████████████████ ████████
\e[32m██████████████████ ████████
██████████████████ ████████
██████████████████ ████████
██████████████████ ████████
@ -18,13 +18,13 @@ Manjaro Live ISO (\l) - \s-\r \m
████████ ████████ ████████
████████ ████████ ████████
████████ ████████ ████████
████████ ████████ ████████
████████ ████████ ████████\e[0m
login:
user 'manjaro'
password 'manjaro'
To launch the installer type: 'setup'
\e[32muser\e[0m \e[1m\e[36mmanjaro\e[0m
\e[32mpassword\e[0m \e[1m\e[36mmanjaro\e[0m
To launch the installer type: \e[1m\e[36msetup\e[0m

View File

@ -80,18 +80,6 @@ networkmanager-pptp
networkmanager-vpnc
nss-mdns
numlockx
>openrc alsa-utils-openrc
>openrc avahi-openrc
>openrc cgmanager-openrc
>openrc consolekit-openrc
>openrc displaymanager-openrc
>openrc networkmanager-consolekit
>openrc networkmanager-openrc
>openrc ntp-openrc
>openrc openssh-openrc
>openrc pm-utils
>openrc sddm-consolekit
>openrc syslog-ng-openrc
openresolv
pamac
polkit-gnome
@ -139,3 +127,4 @@ xorg-twm
xorg-utils
xorg-xinit
yelp
>extra gtk3-print-backends

View File

@ -1,35 +0,0 @@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See logind.conf(5) for details.
[Login]
#NAutoVTs=6
#ReserveVT=6
#KillUserProcesses=no
#KillOnlyUsers=
#KillExcludeUsers=root
#InhibitDelayMaxSec=5
#HandlePowerKey=poweroff
HandleSuspendKey=ignore
#HandleHibernateKey=hibernate
HandleLidSwitch=ignore
HandleLidSwitchDocked=suspend
#PowerKeyIgnoreInhibited=no
#SuspendKeyIgnoreInhibited=no
#HibernateKeyIgnoreInhibited=no
#LidSwitchIgnoreInhibited=yes
#HoldoffTimeoutSec=30s
#IdleAction=ignore
#IdleActionSec=30min
#RuntimeDirectorySize=10%
#RemoveIPC=yes
#UserTasksMax=4096

View File

@ -12,7 +12,7 @@ pxe_boot="false"
# basic="false"
# use extra packages as defined in pkglist to activate a full profile
# extra="false"
extra="true"
################ install ################
@ -24,7 +24,7 @@ displaymanager="lightdm"
# autologin="true"
# nonfree xorg drivers
# nonfree_mhwd="true"
nonfree_mhwd="true"
# use plymouth
plymouth_boot="true"

View File

@ -60,6 +60,7 @@ lm_sensors
lxappearance
lxinput
m4
maia-console
make
>multilib manjaro-alsa
manjaro-browser-settings

View File

@ -127,6 +127,7 @@ xorg-twm
xorg-utils
xorg-xinit
yelp
>extra gtk3-print-backends
>extra manjaro-documentation
>extra mate-themes
>extra libreoffice-fresh

View File

@ -31,6 +31,7 @@ gnome-tweak-tool
gnome-user-docs
gnome-user-share
gnome-wallpapers
file-roller
gparted
grilo-plugins
gst-libav
@ -120,8 +121,17 @@ xorg-twm
xorg-utils
xorg-xinit
yelp
#extra depends for file-roller
>extra p7zip
>extra unrar
>extra unace
>extra lrzip
>extra gtk3-print-backends
>extra libreoffice-fresh
>extra thunderbird
#>extra thunderbird
>extra evolution
>extra lollypop
>extra empathy
>extra uget
@ -134,6 +144,7 @@ yelp
>extra libdvdcss
>extra steam-manjaro
>extra manjaro-printer
#AUR complete support ( base devel + yaourt )
>extra autoconf
>extra automake
>extra binutils

View File

@ -1,35 +0,0 @@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
#
# See logind.conf(5) for details.
[Login]
#NAutoVTs=6
#ReserveVT=6
#KillUserProcesses=no
#KillOnlyUsers=
#KillExcludeUsers=root
#InhibitDelayMaxSec=5
#HandlePowerKey=poweroff
HandleSuspendKey=ignore
#HandleHibernateKey=hibernate
HandleLidSwitch=ignore
HandleLidSwitchDocked=suspend
#PowerKeyIgnoreInhibited=no
#SuspendKeyIgnoreInhibited=no
#HibernateKeyIgnoreInhibited=no
#LidSwitchIgnoreInhibited=yes
#HoldoffTimeoutSec=30s
#IdleAction=ignore
#IdleActionSec=30min
#RuntimeDirectorySize=10%
#RemoveIPC=yes
#UserTasksMax=4096

View File

@ -12,7 +12,7 @@
# basic="false"
# use extra packages as defined in pkglist to activate a full profile
# extra="false"
extra="true"
################ install ################
@ -33,7 +33,7 @@ displaymanager="gdm"
# efi_boot_loader="grub"
# configure calamares for netinstall
netinstall="true"
# netinstall="false"
# the default url for the netinstall.yaml
# netgroups="https://raw.githubusercontent.com/manjaro/manjaro-tools-iso-profiles/master/shared/netinstall"

View File

@ -143,6 +143,7 @@ ksysguard
kwallet-pam
kwayland-integration
kwin
qt5-virtualkeyboard # Virtual keyboard support for kwin-wayland
kwrited
milou
plasma-desktop

View File

@ -1,6 +1,7 @@
alsa-firmware
>basic manjaro-lxqt-basic-settings
compton
compton-conf
dmidecode
>extra lximage-qt
>extra manjaro-lxqt-extra-settings
@ -8,7 +9,6 @@ dmidecode
>extra octopi-notifier-qt5
>extra octopi-cachecleaner
>extra octopi-repoeditor
>extra plymouth-theme-manjaro-elegant
>extra qupzilla
>extra vlc
>extra qpdfview

View File

@ -1,21 +1,28 @@
#calamares
calamares-dev
>sonar sonar-calamares-branding
KERNEL-broadcom-wl
KERNEL-ndiswrapper
KERNEL-r8168
KERNEL-rt3562sta
KERNEL-virtualbox-guest-modules
manjaro-live-skel
>manjaro manjaro-syslinux-theme
>sonar sonar-syslinux-theme
manjaro-live-skel
>openrc manjaro-live-openrc
>systemd manjaro-live-systemd
mkinitcpio-nfs-utils
nbd
>openrc manjaro-live-openrc
open-vm-tools
>sonar sonar-calamares-branding
>sonar sonar-syslinux-theme
squashfs-tools
>systemd manjaro-live-systemd
>x86_64 manjaro-efi-utils
virtualbox-guest-utils
xf86-input-elographics
xf86-input-evdev
xf86-input-keyboard
@ -34,3 +41,9 @@ xf86-video-sisusb
xf86-video-vesa
xf86-video-vmware
xf86-video-voodoo
## system rescue utilities
#manjaro-tools-base
#partitionmanager
#imagewriter
#qupzilla

View File

@ -11,10 +11,7 @@ displaymanager="sddm"
multilib="false"
# nonfree mhwd drivers
#nonfree_mhwd="false"
# use plymouth; initcpio hook
plymouth_boot="false"
nonfree_mhwd="true"
# use pxe boot; initcpio hooks
pxe_boot="false"
@ -23,7 +20,7 @@ pxe_boot="false"
# basic="false"
# use extra packages as defined in pkglist to activate a full profile
#extra="true"
# extra="true"
################ install ################
@ -33,11 +30,8 @@ pxe_boot="false"
# configure calamares for netinstall
netinstall="true"
# the default url for the netinstall.yaml
# netgroups="https://raw.githubusercontent.com/manjaro/iso-profiles/master/shared/netgroups"
# configure calamares to use chrootcfg instead of unpackfs
# chrootcfg="true"
chrootcfg="true"
# use geoip for localization
# geoip='true'
@ -78,10 +72,10 @@ enable_openrc=('acpid' 'cgmanager' 'consolekit' 'cronie' 'dbus' 'syslog-ng' 'Net
# 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' 'pacman-init' 'mirrors-live')
enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live-net')
# 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' 'pacman-init' 'mirrors-live')
enable_openrc_live=('manjaro-live' 'pacman-init' 'mirrors-live-net')

View File

@ -69,11 +69,10 @@ pkg-config
>extra git
>extra patchutils
>extra subversion
yaourt
## Fonts
cantarell-fonts
# noto-fonts # default font
# noto-fonts # default font
# noto-fonts-cjk # big package, ~76 mb compressed
# >extra noto-fonts-emoji
>extra terminus-font

View File

@ -109,18 +109,6 @@ networkmanager-pptp
networkmanager-vpnc
nss-mdns
numlockx
>openrc alsa-utils-openrc
>openrc avahi-openrc
>openrc cgmanager-openrc
>openrc consolekit-openrc
>openrc displaymanager-openrc
>openrc networkmanager-consolekit
>openrc networkmanager-openrc
>openrc ntp-openrc
>openrc openssh-openrc
>openrc pm-utils
>openrc sddm-consolekit
>openrc syslog-ng-openrc
openresolv
pamac
polkit-gnome
@ -167,6 +155,7 @@ xorg-xinit
yelp
orca
libyaml
>extra gtk3-print-backends
>extra libreoffice-fresh
>extra thunderbird
>extra lollypop

View File

@ -8,6 +8,7 @@ mate-desktop-gtk3
plymouth-theme-sonar-elegant
maia-wallpaper
manjaro-artwork
>extra gtk3-print-backends
mate-tweak
mate-screensaver-gtk3
network-manager-applet

View File

@ -1,23 +0,0 @@
### Pamac configuration file
## When removing a package, also remove those dependencies
## that are not required by other packages (recurse option):
RemoveUnrequiredDeps
## How often to check for updates, value in hours (0 to disable):
RefreshPeriod = 2
## When there are no updates available, hide the tray icon:
NoUpdateHideIcon
## Allow Pamac to search and install packages from AUR:
EnableAUR
## When AUR support is enabled search in AUR by default:
SearchInAURByDefault
## When AUR support is enabled check for updates from AUR:
CheckAURUpdates
## Do not ask for confirmation when building packages:
NoConfirmBuild