mirror of https://github.com/JPyke3/mbp-manjaro
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
0af6746ba0
|
@ -72,6 +72,8 @@ manjaro-pulse
|
||||||
manjaro-settings-manager-notifier
|
manjaro-settings-manager-notifier
|
||||||
manjaro-hello
|
manjaro-hello
|
||||||
manjaro-application-utility
|
manjaro-application-utility
|
||||||
|
>extra bauh
|
||||||
|
>extra snapd
|
||||||
mesa-demos
|
mesa-demos
|
||||||
mobile-broadband-provider-info
|
mobile-broadband-provider-info
|
||||||
modemmanager
|
modemmanager
|
||||||
|
|
|
@ -33,7 +33,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=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged')
|
enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-daemon' 'add-autologin-group' 'haveged' 'apparmor' 'snapd.apparmor' 'snapd')
|
||||||
# disable_systemd=()
|
# disable_systemd=()
|
||||||
|
|
||||||
# unset defaults to given values,
|
# unset defaults to given values,
|
||||||
|
|
|
@ -6,9 +6,11 @@ autoconf
|
||||||
automake
|
automake
|
||||||
avahi
|
avahi
|
||||||
>extra baobab
|
>extra baobab
|
||||||
|
>extra bauh
|
||||||
binutils
|
binutils
|
||||||
bison
|
bison
|
||||||
>extra blueman
|
>extra blueman
|
||||||
|
cinnamon-panel-chooser
|
||||||
cinnamon-sounds
|
cinnamon-sounds
|
||||||
cinnamon-translations
|
cinnamon-translations
|
||||||
>extra cinnamon-wallpapers
|
>extra cinnamon-wallpapers
|
||||||
|
@ -20,8 +22,6 @@ fakeroot
|
||||||
>extra firefox
|
>extra firefox
|
||||||
flatpak
|
flatpak
|
||||||
flex
|
flex
|
||||||
fpakman
|
|
||||||
#>extra freeoffice
|
|
||||||
>extra galculator
|
>extra galculator
|
||||||
>extra gcc
|
>extra gcc
|
||||||
>extra >multilib gcc-libs-multilib
|
>extra >multilib gcc-libs-multilib
|
||||||
|
@ -46,6 +46,7 @@ grub-theme-manjaro-dev
|
||||||
>extra gst-plugins-ugly
|
>extra gst-plugins-ugly
|
||||||
>extra gstreamer
|
>extra gstreamer
|
||||||
gtkhash-nemo
|
gtkhash-nemo
|
||||||
|
>extra gufw
|
||||||
gvfs-afc
|
gvfs-afc
|
||||||
gvfs-gphoto2
|
gvfs-gphoto2
|
||||||
gvfs-mtp
|
gvfs-mtp
|
||||||
|
@ -79,6 +80,7 @@ manjaro-settings-manager-notifier
|
||||||
>extra mobile-broadband-provider-info
|
>extra mobile-broadband-provider-info
|
||||||
>extra modemmanager
|
>extra modemmanager
|
||||||
>extra mousetweaks
|
>extra mousetweaks
|
||||||
|
>extra ms-office-online
|
||||||
>extra mugshot
|
>extra mugshot
|
||||||
>multilib lib32-mesa-demos
|
>multilib lib32-mesa-demos
|
||||||
# >extra nemo-bulk-rename
|
# >extra nemo-bulk-rename
|
||||||
|
@ -119,6 +121,7 @@ python-ptyprocess
|
||||||
qt5-styleplugins
|
qt5-styleplugins
|
||||||
screenfetch
|
screenfetch
|
||||||
>extra snapd
|
>extra snapd
|
||||||
|
>basic squashfs-tools
|
||||||
>extra subversion
|
>extra subversion
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
>extra terminus-font
|
>extra terminus-font
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
calamares-git
|
calamares
|
||||||
cinnamon-live
|
cinnamon-live
|
||||||
clonezilla
|
clonezilla
|
||||||
grub-theme-live-manjaro
|
grub-theme-live-manjaro
|
||||||
|
@ -8,4 +8,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-dbus-x11
|
|
|
@ -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,66 +1,11 @@
|
||||||
##########################################
|
#! /bin/bash
|
||||||
###### use this file in the profile ######
|
|
||||||
##########################################
|
|
||||||
|
|
||||||
# use multilib packages; x86_64 only
|
|
||||||
# multilib="true"
|
|
||||||
|
|
||||||
################ install ################
|
|
||||||
|
|
||||||
# default displaymanager: none
|
|
||||||
# supported; lightdm, sddm, gdm, lxdm, mdm
|
|
||||||
displaymanager="lightdm"
|
displaymanager="lightdm"
|
||||||
|
|
||||||
# Set to false to disable autologin in the livecd
|
|
||||||
# autologin="true"
|
|
||||||
|
|
||||||
# nonfree xorg drivers
|
|
||||||
nonfree_mhwd="true"
|
nonfree_mhwd="true"
|
||||||
|
|
||||||
# possible values: grub;systemd-boot
|
enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
|
||||||
# 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' 'apparmor' 'snapd.apparmor' 'snapd')
|
|
||||||
disable_systemd=('pacman-init')
|
disable_systemd=('pacman-init')
|
||||||
|
|
||||||
# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
|
|
||||||
|
|
||||||
#strict_snaps="snapd core18 snap-store core gnome-3-28-1804 gtk-common-themes"
|
|
||||||
|
|
||||||
# add classic snaps: classic_snaps="code"
|
|
||||||
# classic_snaps=""
|
|
||||||
# choose the snap channel. Possible options are: stable, candidate, beta, edge
|
|
||||||
# snap_channel="stable"
|
|
||||||
|
|
||||||
# unset defaults to given values
|
|
||||||
# addgroups="lp,network,power,wheel"
|
|
||||||
|
|
||||||
# the same workgroup name if samba is used
|
|
||||||
# smb_workgroup="Manjaro"
|
|
||||||
|
|
||||||
################# live-session #################
|
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
hostname="manjaro-cinnamon"
|
hostname="manjaro-cinnamon"
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
# username="manjaro"
|
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
# password="manjaro"
|
|
||||||
|
|
||||||
# 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')
|
|
||||||
|
|
Loading…
Reference in New Issue