mirror of https://github.com/JPyke3/mbp-manjaro
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
2a2443d994
|
@ -1,10 +1,12 @@
|
||||||
>extra adapta-maia-theme
|
>extra adapta-maia-theme
|
||||||
alsa-firmware
|
alsa-firmware
|
||||||
alsa-utils
|
alsa-utils
|
||||||
|
>extra apparmor
|
||||||
autoconf
|
autoconf
|
||||||
automake
|
automake
|
||||||
avahi
|
avahi
|
||||||
>extra baobab
|
>extra baobab
|
||||||
|
>extra bauh
|
||||||
binutils
|
binutils
|
||||||
bison
|
bison
|
||||||
>extra brasero
|
>extra brasero
|
||||||
|
@ -16,6 +18,7 @@ deepin-file-manager
|
||||||
deepin-gtk-theme
|
deepin-gtk-theme
|
||||||
>extra deepin-draw
|
>extra deepin-draw
|
||||||
>extra deepin-image-viewer
|
>extra deepin-image-viewer
|
||||||
|
deepin-kwin
|
||||||
>extra deepin-movie
|
>extra deepin-movie
|
||||||
>extra deepin-music
|
>extra deepin-music
|
||||||
>extra deepin-picker
|
>extra deepin-picker
|
||||||
|
@ -79,6 +82,7 @@ mesa-demos
|
||||||
mlocate
|
mlocate
|
||||||
mobile-broadband-provider-info
|
mobile-broadband-provider-info
|
||||||
modemmanager
|
modemmanager
|
||||||
|
>extra ms-office-online
|
||||||
>multilib lib32-mesa-demos
|
>multilib lib32-mesa-demos
|
||||||
netctl
|
netctl
|
||||||
networkmanager
|
networkmanager
|
||||||
|
@ -90,6 +94,7 @@ nss-mdns
|
||||||
ntp
|
ntp
|
||||||
openresolv
|
openresolv
|
||||||
pamac
|
pamac
|
||||||
|
>extra pamac-snap-plugin
|
||||||
patch
|
patch
|
||||||
>extra patchutils
|
>extra patchutils
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -103,6 +108,7 @@ pulseaudio-zeroconf
|
||||||
>extra qpdfview
|
>extra qpdfview
|
||||||
>extra redshift
|
>extra redshift
|
||||||
screenfetch
|
screenfetch
|
||||||
|
>basic squashfs-tools
|
||||||
>extra subversion
|
>extra subversion
|
||||||
>extra sushi
|
>extra sushi
|
||||||
syslog-ng
|
syslog-ng
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
calamares-git
|
calamares
|
||||||
deepin-live
|
deepin-live
|
||||||
grub-theme-live-manjaro
|
grub-theme-live-manjaro
|
||||||
gsmartcontrol
|
gsmartcontrol
|
||||||
|
@ -7,4 +7,3 @@ manjaro-live-skel
|
||||||
manjaro-live-systemd
|
manjaro-live-systemd
|
||||||
mkinitcpio-nfs-utils
|
mkinitcpio-nfs-utils
|
||||||
nbd
|
nbd
|
||||||
squashfs-tools
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
../../shared/Packages-Root
|
|
|
@ -0,0 +1,93 @@
|
||||||
|
>i686 archlinux32-keyring
|
||||||
|
>manjaro manjaro-release
|
||||||
|
>multilib gcc-libs-multilib
|
||||||
|
acpi
|
||||||
|
acpid
|
||||||
|
amd-ucode
|
||||||
|
b43-fwcutter
|
||||||
|
bash-completion
|
||||||
|
btrfs-progs
|
||||||
|
bzip2
|
||||||
|
coreutils
|
||||||
|
cpupower
|
||||||
|
crda
|
||||||
|
cronie
|
||||||
|
cryptsetup
|
||||||
|
dbus-x11
|
||||||
|
device-mapper
|
||||||
|
dhclient
|
||||||
|
dhcpcd
|
||||||
|
diffutils
|
||||||
|
dmraid
|
||||||
|
dnsmasq
|
||||||
|
dosfstools
|
||||||
|
e2fsprogs
|
||||||
|
ecryptfs-utils
|
||||||
|
efibootmgr
|
||||||
|
exfat-utils
|
||||||
|
f2fs-tools
|
||||||
|
file
|
||||||
|
filesystem
|
||||||
|
findutils
|
||||||
|
gawk
|
||||||
|
gcc-libs
|
||||||
|
gettext
|
||||||
|
glibc
|
||||||
|
grep
|
||||||
|
grub
|
||||||
|
gzip
|
||||||
|
haveged
|
||||||
|
inetutils
|
||||||
|
intel-ucode
|
||||||
|
iproute2
|
||||||
|
iptables
|
||||||
|
iputils
|
||||||
|
ipw2100-fw
|
||||||
|
ipw2200-fw
|
||||||
|
jfsutils
|
||||||
|
KERNEL
|
||||||
|
less
|
||||||
|
licenses
|
||||||
|
linux-firmware
|
||||||
|
logrotate
|
||||||
|
lsb-release
|
||||||
|
lvm2
|
||||||
|
man-db
|
||||||
|
man-pages
|
||||||
|
manjaro-firmware
|
||||||
|
manjaro-system
|
||||||
|
mdadm
|
||||||
|
memtest86+
|
||||||
|
mhwd
|
||||||
|
mhwd-db
|
||||||
|
mkinitcpio-openswap
|
||||||
|
nano
|
||||||
|
nfs-utils
|
||||||
|
ntfs-3g
|
||||||
|
os-prober
|
||||||
|
pacman
|
||||||
|
pciutils
|
||||||
|
perl
|
||||||
|
procps-ng
|
||||||
|
psmisc
|
||||||
|
reiserfsprogs
|
||||||
|
rsync
|
||||||
|
s-nail
|
||||||
|
sed
|
||||||
|
shadow
|
||||||
|
spectre-meltdown-checker
|
||||||
|
sudo
|
||||||
|
sysfsutils
|
||||||
|
systemd-fsck-silent
|
||||||
|
systemd-sysvcompat
|
||||||
|
tar
|
||||||
|
texinfo
|
||||||
|
tlp
|
||||||
|
usbutils
|
||||||
|
util-linux
|
||||||
|
vi
|
||||||
|
wget
|
||||||
|
which
|
||||||
|
wpa_supplicant
|
||||||
|
xfsprogs
|
||||||
|
zsh
|
|
@ -1,61 +1,11 @@
|
||||||
##########################################
|
#! /bin/bash
|
||||||
###### use this file in the profile ######
|
|
||||||
##########################################
|
|
||||||
|
|
||||||
# use multilib packages; x86_64 only
|
|
||||||
# multilib="true"
|
|
||||||
|
|
||||||
# default displaymanager: none
|
|
||||||
# supported; lightdm, sddm, gdm, lxdm, mdm
|
|
||||||
displaymanager="lightdm"
|
displaymanager="lightdm"
|
||||||
|
|
||||||
# Set to false to disable autologin in the livecd
|
nonfree_mhwd="true"
|
||||||
# autologin="true"
|
|
||||||
|
|
||||||
# nonfree xorg drivers
|
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
|
||||||
# nonfree_mhwd="true"
|
|
||||||
|
|
||||||
################ install ################
|
|
||||||
|
|
||||||
# possible values: grub;systemd-boot
|
|
||||||
# efi_boot_loader="grub"
|
|
||||||
|
|
||||||
# configure calamares for netinstall
|
|
||||||
# netinstall="false"
|
|
||||||
|
|
||||||
# configure calamares to use chrootcfg instead of unpackfs
|
|
||||||
# chrootcfg="false"
|
|
||||||
|
|
||||||
# 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' 'ufw')
|
|
||||||
disable_systemd=('pacman-init')
|
disable_systemd=('pacman-init')
|
||||||
|
|
||||||
# the same workgroup name if samba is used
|
|
||||||
# smb_workgroup=""
|
|
||||||
|
|
||||||
################# livecd #################
|
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
hostname="manjaro-deepin"
|
hostname="manjaro-deepin"
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
# username="manjaro"
|
|
||||||
|
|
||||||
# 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
|
|
||||||
# enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
|
|
||||||
|
|
|
@ -82,7 +82,7 @@ grub-theme-manjaro #grub theme for installed S.O.
|
||||||
manjaro-hotfixes
|
manjaro-hotfixes
|
||||||
manjaro-pulse
|
manjaro-pulse
|
||||||
manjaro-hello
|
manjaro-hello
|
||||||
#manjaro-application-utility #not compatible to pamac 9.0 yet
|
manjaro-application-utility
|
||||||
mesa-demos
|
mesa-demos
|
||||||
mobile-broadband-provider-info
|
mobile-broadband-provider-info
|
||||||
modemmanager
|
modemmanager
|
||||||
|
@ -104,7 +104,9 @@ openresolv
|
||||||
>extra flatpak
|
>extra flatpak
|
||||||
>extra bauh
|
>extra bauh
|
||||||
pamac
|
pamac
|
||||||
>extra pamac-snap-plugin
|
>extra snapd
|
||||||
|
>extra snapd-glib
|
||||||
|
#>extra pamac-snap-plugin
|
||||||
polkit-gnome
|
polkit-gnome
|
||||||
powertop
|
powertop
|
||||||
pulseaudio-bluetooth
|
pulseaudio-bluetooth
|
||||||
|
|
|
@ -97,6 +97,8 @@ pamac-tray-appindicator
|
||||||
#pamac-cli
|
#pamac-cli
|
||||||
>extra apparmor
|
>extra apparmor
|
||||||
>extra snapd
|
>extra snapd
|
||||||
|
>extra snapd-glib
|
||||||
|
#>extra pamac-snap-plugin
|
||||||
#discover-snap
|
#discover-snap
|
||||||
#discover
|
#discover
|
||||||
#packagekit-qt5
|
#packagekit-qt5
|
||||||
|
|
|
@ -88,6 +88,8 @@ ttf-bitstream-vera # xfce4-terminal default Monospace
|
||||||
>extra bauh
|
>extra bauh
|
||||||
pamac
|
pamac
|
||||||
>extra snapd
|
>extra snapd
|
||||||
|
>extra snapd-glib
|
||||||
|
#>extra pamac-snap-plugin
|
||||||
|
|
||||||
## Java
|
## Java
|
||||||
>extra jdk8-openjdk
|
>extra jdk8-openjdk
|
||||||
|
@ -277,6 +279,7 @@ xdg-su
|
||||||
gtkhash-thunar
|
gtkhash-thunar
|
||||||
manjaro-hotfixes
|
manjaro-hotfixes
|
||||||
>basic squashfs-tools
|
>basic squashfs-tools
|
||||||
|
xiccd # enable color profile settings
|
||||||
|
|
||||||
## Handshake tools
|
## Handshake tools
|
||||||
#faucet-tool
|
#faucet-tool
|
||||||
|
|
Loading…
Reference in New Issue