mirror of https://github.com/JPyke3/mbp-manjaro
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
d8adff94b5
|
@ -108,7 +108,6 @@ pkg-config
|
||||||
>extra pragha
|
>extra pragha
|
||||||
>extra pulseaudio-bluetooth
|
>extra pulseaudio-bluetooth
|
||||||
pulseaudio-ctl
|
pulseaudio-ctl
|
||||||
pulseaudio-gconf
|
|
||||||
pulseaudio-zeroconf
|
pulseaudio-zeroconf
|
||||||
>extra pygtk # needed for deluge
|
>extra pygtk # needed for deluge
|
||||||
python2-ptyprocess
|
python2-ptyprocess
|
||||||
|
|
|
@ -9,6 +9,7 @@ binutils
|
||||||
bison
|
bison
|
||||||
>extra brasero
|
>extra brasero
|
||||||
>extra dconf-editor
|
>extra dconf-editor
|
||||||
|
>extra deepin-anything
|
||||||
deepin-calendar
|
deepin-calendar
|
||||||
>extra deepin-calculator
|
>extra deepin-calculator
|
||||||
deepin-file-manager
|
deepin-file-manager
|
||||||
|
@ -33,9 +34,9 @@ fakeroot
|
||||||
firefox
|
firefox
|
||||||
flex
|
flex
|
||||||
>extra galculator
|
>extra galculator
|
||||||
gcc
|
>extra gcc
|
||||||
>multilib gcc-libs-multilib
|
>extra >multilib gcc-libs-multilib
|
||||||
>multilib gcc-multilib
|
>extra >multilib gcc-multilib
|
||||||
gedit
|
gedit
|
||||||
>extra gimp
|
>extra gimp
|
||||||
>extra git
|
>extra git
|
||||||
|
@ -99,6 +100,7 @@ polkit-gnome
|
||||||
pulseaudio-ctl
|
pulseaudio-ctl
|
||||||
pulseaudio-zeroconf
|
pulseaudio-zeroconf
|
||||||
>extra pygtk # needed for deluge
|
>extra pygtk # needed for deluge
|
||||||
|
>extra qpdfview
|
||||||
>extra redshift
|
>extra redshift
|
||||||
screenfetch
|
screenfetch
|
||||||
>extra subversion
|
>extra subversion
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
calamares-git
|
calamares
|
||||||
deepin-live
|
deepin-live
|
||||||
grub-theme-live-manjaro
|
grub-theme-live-manjaro-dev
|
||||||
gsmartcontrol
|
gsmartcontrol
|
||||||
manjaro-architect
|
manjaro-architect
|
||||||
manjaro-live-skel
|
manjaro-live-skel
|
||||||
|
@ -8,3 +8,4 @@ manjaro-live-systemd
|
||||||
mkinitcpio-nfs-utils
|
mkinitcpio-nfs-utils
|
||||||
nbd
|
nbd
|
||||||
squashfs-tools
|
squashfs-tools
|
||||||
|
clonezilla
|
||||||
|
|
|
@ -31,7 +31,7 @@ displaymanager="lightdm"
|
||||||
|
|
||||||
# unset defaults to given values
|
# unset defaults to given values
|
||||||
# names must match systemd service names
|
# names must match systemd service names
|
||||||
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'add-autologin-group')
|
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'add-autologin-group' 'haveged')
|
||||||
disable_systemd=('pacman-init')
|
disable_systemd=('pacman-init')
|
||||||
|
|
||||||
# unset defaults to given values
|
# unset defaults to given values
|
||||||
|
|
|
@ -20,4 +20,4 @@ xf86-input-libinput
|
||||||
xf86-input-mouse
|
xf86-input-mouse
|
||||||
xf86-input-vmmouse
|
xf86-input-vmmouse
|
||||||
xf86-input-void
|
xf86-input-void
|
||||||
>manjaro grub-theme-live-manjaro
|
grub-theme-live-manjaro-dev
|
||||||
|
|
|
@ -245,7 +245,7 @@ imagewriter
|
||||||
inxi
|
inxi
|
||||||
#>extra krita
|
#>extra krita
|
||||||
>extra firefox
|
>extra firefox
|
||||||
>basic qupzilla
|
>basic falkon
|
||||||
ms-office-online
|
ms-office-online
|
||||||
>extra libreoffice-fresh
|
>extra libreoffice-fresh
|
||||||
manjaro-hello
|
manjaro-hello
|
||||||
|
|
Loading…
Reference in New Issue