mirror of https://github.com/JPyke3/mbp-manjaro
Compare commits
No commits in common. "7a48116724960369cefae6544e8755faeb0618a7" and "a6ee693a41e0d080f0f2f8d48fc3fc9b3a7e7697" have entirely different histories.
7a48116724
...
a6ee693a41
|
|
@ -13,7 +13,6 @@ RUN [ "pacman", "-Syu", "manjaro-tools-iso-git",\
|
|||
"base-devel",\
|
||||
"git",\
|
||||
"lsb-release",\
|
||||
"fontconfig",\
|
||||
"--noconfirm" ]
|
||||
|
||||
# Import my Pacman GPG key
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ ttf-indic-otf
|
|||
ttf-liberation
|
||||
budgie-wallpapers
|
||||
vino
|
||||
xdg-su
|
||||
xdg-user-dirs-gtk
|
||||
xdg-utils
|
||||
xf86-input-elographics
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ mesa-demos
|
|||
mlocate
|
||||
mobile-broadband-provider-info
|
||||
modemmanager
|
||||
>extra ms-office-online
|
||||
>multilib lib32-mesa-demos
|
||||
netctl
|
||||
networkmanager
|
||||
|
|
@ -120,6 +121,7 @@ terminus-font
|
|||
>extra ttf-liberation
|
||||
>extra xarchiver
|
||||
>extra xcursor-breeze
|
||||
xdg-su
|
||||
xdg-utils
|
||||
xf86-input-elographics
|
||||
xf86-input-evdev
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
|
||||
## xorg - should be explicitly installed to prevent user from removing accidentally
|
||||
xorg-server
|
||||
|
||||
## display manager
|
||||
sddm
|
||||
>extra sddm-kcm
|
||||
|
||||
## plasma
|
||||
plasma-desktop
|
||||
dolphin
|
||||
konsole
|
||||
>extra kwrite
|
||||
>extra kde-servicemenus-rootactions
|
||||
>extra plasma-pa
|
||||
>extra kde-gtk-config
|
||||
>extra breeze-gtk
|
||||
>extra systemd-kcm
|
||||
>extra plasma-wayland-session
|
||||
>extra xdg-user-dirs
|
||||
>extra ark
|
||||
# optional dependencies of ark:
|
||||
>extra p7zip
|
||||
>extra unarchiver
|
||||
# wifi setup for systemd-networkd (recommended reading: https://wiki.archlinux.org/index.php/Systemd-networkd#Wireless_adapter and https://wiki.archlinux.org/index.php/WPA_supplicant):
|
||||
#>extra wpa_supplicant_gui
|
||||
|
||||
## package manager
|
||||
>extra octopi
|
||||
>extra octopi-notifier-frameworks
|
||||
# optional dependencies of octopi:
|
||||
>extra octopi-cachecleaner
|
||||
>extra octopi-repoeditor
|
||||
>extra pacmanlogviewer
|
||||
|
||||
## AUR support
|
||||
>extra base-devel
|
||||
>extra git
|
||||
>extra yaourt
|
||||
|
||||
## manjaro settings manager
|
||||
>extra manjaro-settings-manager
|
||||
>extra manjaro-settings-manager-kcm
|
||||
>extra manjaro-settings-manager-knotifier
|
||||
|
||||
# mbp
|
||||
linux57-mbp-headers
|
||||
linux57-mbp-docs
|
||||
linux57-mbp-zfs
|
||||
linux57-mbp-bbswitch
|
||||
linux57-mbp-broadcom-wl
|
||||
linux57-mbp-virtualbox-guest-modules
|
||||
linux57-mbp-virtualbox-host-modules
|
||||
apple-bce-dkms-git
|
||||
macbook12-spi-driver-dkms
|
||||
audio-fix-mbp
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
|
||||
## live system environment - required packages
|
||||
manjaro-live-skel
|
||||
manjaro-live-systemd
|
||||
grub-theme-live-manjaro
|
||||
nbd
|
||||
mkinitcpio-nfs-utils
|
||||
|
||||
## GUI installer
|
||||
calamares
|
||||
squashfs-tools
|
||||
xdg-user-dirs
|
||||
|
||||
## system repair tools for chroot, partitioning, internet research, iso writer, SMART tool, ...
|
||||
memtest86+
|
||||
manjaro-tools-base
|
||||
falkon
|
||||
imagewriter
|
||||
gsmartcontrol
|
||||
gparted
|
||||
# optional dependencies of gparted:
|
||||
dosfstools
|
||||
f2fs-tools
|
||||
btrfs-progs
|
||||
exfat-utils
|
||||
ntfs-3g
|
||||
xfsprogs
|
||||
nilfs-utils
|
||||
gpart
|
||||
mtools
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
|
||||
## base system
|
||||
base
|
||||
|
||||
## manjaro base system
|
||||
KERNEL
|
||||
manjaro-system
|
||||
mhwd
|
||||
sudo
|
||||
|
||||
## boot loader
|
||||
grub
|
||||
os-prober
|
||||
efibootmgr
|
||||
intel-ucode
|
||||
|
||||
## network: please enable the following systemd services in profile.conf file both for live and installed systems:
|
||||
# 'systemd-resolved' 'systemd-networkd'
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[Match]
|
||||
Name=en*
|
||||
|
||||
[Network]
|
||||
DHCP=yes
|
||||
|
||||
[DHCP]
|
||||
RouteMetric=10
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[Match]
|
||||
Name=wl*
|
||||
|
||||
[Network]
|
||||
DHCP=yes
|
||||
|
||||
[DHCP]
|
||||
RouteMetric=20
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/default
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/fstab
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
[Autologin]
|
||||
# Autologin again on session exit
|
||||
Relogin=false
|
||||
|
||||
# Autologin session
|
||||
Session=plasma.desktop
|
||||
|
||||
# Autologin user
|
||||
User=manjaro
|
||||
|
||||
|
||||
[General]
|
||||
# Halt command
|
||||
HaltCommand=/usr/bin/systemctl poweroff
|
||||
|
||||
# Initial NumLock state
|
||||
# Valid values: on|off|none
|
||||
# If property is set to none, numlock won't be changed
|
||||
Numlock=none
|
||||
|
||||
# Reboot command
|
||||
RebootCommand=/usr/bin/systemctl reboot
|
||||
|
||||
|
||||
[Theme]
|
||||
# Current theme name
|
||||
Current=breeze-text-only
|
||||
|
||||
# Cursor theme
|
||||
CursorTheme=breeze_cursors
|
||||
|
||||
# Face icon directory
|
||||
# The files should be in username.face.icon format
|
||||
FacesDir=/usr/share/sddm/faces
|
||||
|
||||
# Theme directory path
|
||||
ThemeDir=/usr/share/sddm/themes
|
||||
|
||||
|
||||
[Users]
|
||||
# Default $PATH
|
||||
DefaultPath=/bin:/usr/bin:/usr/local/bin
|
||||
|
||||
# Hidden shells
|
||||
# Users with these shells as their default won't be listed
|
||||
HideShells=
|
||||
|
||||
# Hidden users
|
||||
HideUsers=
|
||||
|
||||
# Maximum user id for displayed users
|
||||
MaximumUid=60000
|
||||
|
||||
# Minimum user id for displayed users
|
||||
MinimumUid=1000
|
||||
|
||||
# Remember the session of the last successfully logged in user
|
||||
RememberLastSession=true
|
||||
|
||||
# Remember the last successfully logged in user
|
||||
RememberLastUser=true
|
||||
|
||||
[Wayland]
|
||||
# Wayland session script path
|
||||
# A script to execute when starting the desktop session
|
||||
SessionCommand=/usr/share/sddm/scripts/wayland-session
|
||||
|
||||
# Session description directory
|
||||
SessionDir=/usr/share/wayland-sessions
|
||||
|
||||
[X11]
|
||||
# Xsetup script path
|
||||
# A script to execute when starting the display server
|
||||
DisplayCommand=/usr/share/sddm/scripts/Xsetup
|
||||
|
||||
# Xstop script path
|
||||
# A script to execute when stopping the display server
|
||||
DisplayStopCommand=/usr/share/sddm/scripts/Xstop
|
||||
|
||||
# Minimum VT
|
||||
# The lowest virtual terminal number that will be used.
|
||||
MinimumVT=1
|
||||
|
||||
# X server arguments
|
||||
ServerArguments=-nolisten tcp
|
||||
|
||||
# X server path
|
||||
ServerPath=/usr/bin/X
|
||||
|
||||
# Xsession script path
|
||||
# A script to execute when starting the desktop session
|
||||
SessionCommand=/usr/share/sddm/scripts/Xsession
|
||||
|
||||
# Session description directory
|
||||
SessionDir=/usr/share/xsessions
|
||||
|
||||
# Xauth path
|
||||
XauthPath=/usr/bin/xauth
|
||||
|
||||
# Xephyr path
|
||||
XephyrPath=/usr/bin/Xephyr
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../../../../../shared/manjaro/live-overlay/etc/skel/.config/manjaro
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[Match]
|
||||
Name=en*
|
||||
|
||||
[Network]
|
||||
DHCP=yes
|
||||
|
||||
[DHCP]
|
||||
RouteMetric=10
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[Match]
|
||||
Name=wl*
|
||||
|
||||
[Network]
|
||||
DHCP=yes
|
||||
|
||||
[DHCP]
|
||||
RouteMetric=20
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../../shared/manjaro/live-overlay/usr
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
##########################################
|
||||
###### use this file in the profile ######
|
||||
##########################################
|
||||
|
||||
# use multilib packages; x86_64 only
|
||||
# multilib="true"
|
||||
|
||||
displaymanager="sddm"
|
||||
|
||||
# Set to false to disable autologin in the livecd
|
||||
# autologin="true"
|
||||
|
||||
# nonfree mhwd drivers
|
||||
# nonfree_mhwd="false"
|
||||
|
||||
# use extra packages as defined in pkglist to activate a full profile
|
||||
extra="false"
|
||||
|
||||
################ install ################
|
||||
|
||||
# unset defaults to given value
|
||||
# efi_boot_loader="grub"
|
||||
|
||||
# configure calamares for netinstall
|
||||
# netinstall="false"
|
||||
|
||||
# configure calamares to use chrootcfg instead of unpackfs
|
||||
# chrootcfg="false"
|
||||
|
||||
# use geoip for localization
|
||||
# geoip='true'
|
||||
|
||||
# unset defaults to given values
|
||||
# names must match systemd service names
|
||||
enable_systemd=( 'systemd-resolved' 'systemd-networkd' )
|
||||
disable_systemd=('pacman-init')
|
||||
|
||||
# unset defaults to given values,
|
||||
# names must match openrc service names
|
||||
# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
|
||||
# disable_openrc=()
|
||||
|
||||
# the same workgroup name if samba is used
|
||||
# smb_workgroup=""
|
||||
|
||||
################# livecd #################
|
||||
|
||||
# unset defaults to given value
|
||||
# hostname="manjaro"
|
||||
|
||||
# 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' 'systemd-resolved' 'systemd-networkd')
|
||||
|
||||
# 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' 'mhwd-live' 'pacman-init' 'mirrors-live')
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../user-repos.conf
|
||||
|
|
@ -223,6 +223,7 @@ gtk-engines
|
|||
polkit
|
||||
python-pyxdg
|
||||
squashfs-tools
|
||||
xdg-su
|
||||
xdg-user-dirs
|
||||
xdg-utils
|
||||
zensu
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
## Extra Network packages
|
||||
>extra mobile-broadband-provider-info
|
||||
>extra modemmanager-qt
|
||||
>extra networkmanager-dispatcher-ntpd
|
||||
>extra networkmanager-openconnect
|
||||
>extra networkmanager-pptp
|
||||
>extra networkmanager-vpnc
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@ ttf-indic-otf
|
|||
ttf-liberation
|
||||
manjaro-mate-panel-layout
|
||||
vino
|
||||
xdg-su
|
||||
xdg-user-dirs-gtk
|
||||
xdg-utils
|
||||
xf86-input-elographics
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ ttf-inconsolata
|
|||
ttf-indic-otf
|
||||
ttf-liberation
|
||||
vino
|
||||
xdg-su
|
||||
xdg-user-dirs-gtk
|
||||
xdg-utils
|
||||
xf86-input-elographics
|
||||
|
|
@ -93,6 +94,7 @@ yelp
|
|||
>extra thunderbird
|
||||
>extra lollypop
|
||||
>extra vlc
|
||||
>extra empathy
|
||||
>extra uget
|
||||
>extra transmission-gtk
|
||||
>extra brasero
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
git
|
||||
KERNEL-broadcom-wl
|
||||
KERNEL-ndiswrapper
|
||||
KERNEL-r8168
|
||||
KERNEL-virtualbox-guest-modules
|
||||
maia-console
|
||||
manjaro-architect-launcher
|
||||
|
|
|
|||
|
|
@ -121,8 +121,10 @@ manjaro-application-utility
|
|||
>extra splix
|
||||
|
||||
## Optional dependencies for hplip
|
||||
>extra pyqt5-common
|
||||
>extra python-pillow
|
||||
>extra python-pip
|
||||
>extra python-pyqt5
|
||||
>extra python-reportlab
|
||||
|
||||
## Optional dependencies for print-manager
|
||||
|
|
|
|||
Loading…
Reference in New Issue