Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Frede Hundewadt 2020-04-29 14:14:36 +02:00
commit 2084ab6d0c
No known key found for this signature in database
GPG Key ID: 7605992471F3F073
7 changed files with 22 additions and 15 deletions

View File

@ -6,7 +6,7 @@ autoconf
automake automake
avahi avahi
>extra baobab >extra baobab
>extra bauh #>extra bauh
binutils binutils
bison bison
>extra blueman >extra blueman
@ -17,7 +17,7 @@ cinnamon-translations
>extra dconf-editor >extra dconf-editor
>extra deluge >extra deluge
dmidecode dmidecode
>extra etcher #>extra etcher
fakeroot fakeroot
>extra ffmpegthumbnailer >extra ffmpegthumbnailer
>extra firefox >extra firefox
@ -66,6 +66,7 @@ libtool
>extra libgsf >extra libgsf
lightdm-settings lightdm-settings
lightdm-slick-greeter lightdm-slick-greeter
>extra lollypop
m4 m4
make make
manjaro-alsa manjaro-alsa
@ -113,8 +114,9 @@ pavucontrol
>extra pix >extra pix
pkg-config pkg-config
>extra poppler-data >extra poppler-data
>extra popsicle
>extra powertop >extra powertop
>extra pragha #>extra pragha
>extra pulseaudio-bluetooth >extra pulseaudio-bluetooth
pulseaudio-ctl pulseaudio-ctl
pulseaudio-zeroconf pulseaudio-zeroconf

View File

@ -22,7 +22,7 @@ gnome-backgrounds
gnome-calculator gnome-calculator
gnome-control-center gnome-control-center
gnome-desktop gnome-desktop
#gnome-disk-utility gnome-disk-utility
>extra gnome-font-viewer >extra gnome-font-viewer
gnome-keyring gnome-keyring
fprintd #need for finger id reader fprintd #need for finger id reader
@ -77,14 +77,14 @@ bmenu
######## ########
manjaro-alsa manjaro-alsa
manjaro-artwork manjaro-artwork
#>extra wallpapers-2018 >extra wallpapers-2018
#>extra manjaro-wallpapers-18.0 >extra manjaro-wallpapers-18.0
>extra wallpapers-juhraya >extra wallpapers-juhraya
illyria-wallpaper illyria-wallpaper
manjaro-browser-settings manjaro-browser-settings
manjaro-dynamic-wallpaper manjaro-dynamic-wallpaper
manjaro-settings-manager-notifier manjaro-settings-manager-notifier
manjaro-gnome-assets-19.0 manjaro-gnome-assets
>extra gnome-layout-switcher >extra gnome-layout-switcher
manjaro-hotfixes manjaro-hotfixes
manjaro-pulse manjaro-pulse

View File

@ -56,6 +56,12 @@ disable_systemd=('pacman-init')
# the same workgroup name if samba is used # the same workgroup name if samba is used
# smb_workgroup="" # smb_workgroup=""
# default system shell is bash
# '/etc/defaults/useradd': " "
# userShell : "/bin/zsh"
# empty value will not be used
user_shell="/bin/zsh"
################# live-session ################# ################# live-session #################
# unset defaults to given value # unset defaults to given value
@ -69,7 +75,7 @@ hostname="manjaro-gnome"
# the login shell # the login shell
# defaults to bash # defaults to bash
login_shell=/usr/bin/zsh login_shell="/bin/zsh"
# unset defaults to given values # unset defaults to given values
# names must match systemd service names # names must match systemd service names

View File

@ -245,7 +245,6 @@ poppler-data # encoding data to display PDF documents containing CJK characters
## Applications ## Applications
>extra cantata >extra cantata
dmidecode # for inxi -m output dmidecode # for inxi -m output
>extra etcher
firefox firefox
htop htop
inxi inxi
@ -277,7 +276,7 @@ yakuake
manjaro-documentation-en manjaro-documentation-en
## Settings packages ## Settings packages
manjaro-kde-settings-19.0 manjaro-kde-settings
manjaro-browser-settings manjaro-browser-settings
## Xorg Input Drivers ## Xorg Input Drivers

View File

@ -181,7 +181,6 @@ xcursor-vanilla-dmz-aa
>extra catfish >extra catfish
dmidecode # optional dependency inxi dmidecode # optional dependency inxi
engrampa engrampa
>extra etcher
>extra firefox >extra firefox
# >extra flashplugin # >extra flashplugin
>extra galculator-gtk2 >extra galculator-gtk2

View File

@ -110,12 +110,12 @@ openresolv
#gnome-software-snap #gnome-software-snap
#>extra flatpak #>extra flatpak
#>extra bauh #>extra bauh
pamac-gtk-dev pamac-gtk
#>extra snapd #>extra snapd
>extra snapd-glib >extra snapd-glib
>extra pamac-snap-plugin-dev >extra pamac-snap-plugin
>extra pamac-flatpak-plugin-dev >extra pamac-flatpak-plugin
pamac-gnome-integration-dev pamac-gnome-integration
polkit-gnome polkit-gnome
powertop powertop
pulseaudio-bluetooth pulseaudio-bluetooth

View File

@ -87,3 +87,4 @@ wpa_supplicant
xfsprogs xfsprogs
xz xz
manjaro-zsh-config manjaro-zsh-config
hardcode-fixer #This script adjust the missing icons when are hardcoded