mirror of https://github.com/JPyke3/mbp-manjaro
Merge branch 'master' of ssh://gitlab.manjaro.org:22277/profiles-and-settings/iso-profiles
This commit is contained in:
commit
f174c68d0b
|
@ -1 +0,0 @@
|
|||
../../../shared/manjaro/live-overlay/etc
|
|
@ -0,0 +1 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/default
|
|
@ -0,0 +1 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/fstab
|
|
@ -0,0 +1 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/issue
|
|
@ -0,0 +1 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/localtime
|
|
@ -0,0 +1 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/pam.d
|
|
@ -0,0 +1,9 @@
|
|||
[Desktop Entry]
|
||||
Terminal=false
|
||||
Name=mntray
|
||||
Type=Application
|
||||
Exec=/usr/bin/mntray --delay
|
||||
Icon=mntray
|
||||
Comment=A Manjaro Linux announcements notification app
|
||||
X-GNOME-Autostart-enabled=false
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../../../../../shared/manjaro/live-overlay/etc/skel/.config/manjaro
|
|
@ -0,0 +1 @@
|
|||
../../../../shared/manjaro/live-overlay/etc/sudoers.d
|
|
@ -0,0 +1,9 @@
|
|||
[Desktop Entry]
|
||||
Terminal=false
|
||||
Name=mntray
|
||||
Type=Application
|
||||
Exec=/usr/bin/mntray --delay
|
||||
Icon=mntray
|
||||
Comment=A Manjaro Linux announcements notification app
|
||||
X-GNOME-Autostart-enabled=false
|
||||
|
|
@ -1,108 +1,90 @@
|
|||
# All extra packages are also part of netinstaller
|
||||
# https://gitlab.manjaro.org/packages/community/jade/calamares/-/blob/master/netinstall-applications.yaml
|
||||
|
||||
## Connect Packages
|
||||
android-tools
|
||||
android-udev
|
||||
gvfs
|
||||
gvfs-google
|
||||
gvfs-afc
|
||||
gvfs-gphoto2
|
||||
gvfs-mtp
|
||||
gvfs-nfs
|
||||
gvfs-smb
|
||||
mtpfs
|
||||
udiskie
|
||||
udisks2
|
||||
>extra android-tools
|
||||
>extra android-udev
|
||||
>extra gvfs
|
||||
>extra gvfs-google
|
||||
>extra gvfs-afc
|
||||
>extra gvfs-gphoto2
|
||||
>extra gvfs-mtp
|
||||
>extra gvfs-nfs
|
||||
>extra gvfs-smb
|
||||
>extra mtpfs
|
||||
>extra udiskie
|
||||
>extra udisks2
|
||||
|
||||
|
||||
## Libraries for Sound/Audio/Video
|
||||
alsa-firmware
|
||||
alsa-utils
|
||||
ffmpeg
|
||||
grilo-plugins
|
||||
gst-libav
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
libdvdcss
|
||||
>multilib manjaro-alsa
|
||||
manjaro-pulse
|
||||
pulseaudio-bluetooth
|
||||
pulseaudio-ctl
|
||||
pulseaudio-zeroconf
|
||||
>extra ffmpeg
|
||||
>extra grilo-plugins
|
||||
>extra gst-libav
|
||||
>extra gst-plugins-bad
|
||||
>extra gst-plugins-base
|
||||
>extra gst-plugins-good
|
||||
>extra gst-plugins-ugly
|
||||
>extra libdvdcss
|
||||
|
||||
|
||||
# Applications
|
||||
gthumb
|
||||
evince
|
||||
chromium
|
||||
>extra geary
|
||||
gedit
|
||||
file-roller
|
||||
## Applications
|
||||
guake
|
||||
nautilus
|
||||
nautilus-admin
|
||||
nautilus-empty-file
|
||||
>extra dconf-editor
|
||||
>extra slack-web-jak
|
||||
>extra skype-web-jak
|
||||
>extra whatsapp-web-jak
|
||||
>extra microsoft-office-web-jak
|
||||
>extra lxrandr
|
||||
vlc
|
||||
>extra lightdm-gtk-greeter-settings
|
||||
gufw
|
||||
>extra timeshift
|
||||
>extra syncthing-gtk
|
||||
software-center-web-jak # for url handler's and discover
|
||||
>extra nautilus-admin
|
||||
>extra nautilus-empty-file
|
||||
>extra dconf-editor
|
||||
>extra lxrandr
|
||||
>extra vlc
|
||||
>extra lightdm-gtk-greeter-settings
|
||||
>extra gufw
|
||||
>extra deja-dup
|
||||
>extra syncthing-gtk
|
||||
>extra hardinfo
|
||||
>extra gthumb
|
||||
>extra evince
|
||||
>extra geary
|
||||
>extra gedit
|
||||
>extra file-roller
|
||||
|
||||
|
||||
## Startup and shutdown
|
||||
lightdm
|
||||
lightdm-gtk-greeter
|
||||
accountsservice
|
||||
>extra bootsplash-systemd
|
||||
>extra bootsplash-theme-manjaro
|
||||
accountsservice
|
||||
|
||||
|
||||
## Network
|
||||
netctl
|
||||
networkmanager-openconnect
|
||||
networkmanager-openvpn
|
||||
networkmanager-pptp
|
||||
networkmanager-vpnc
|
||||
mobile-broadband-provider-info
|
||||
modemmanager
|
||||
avahi
|
||||
networkmanager
|
||||
ntp
|
||||
openresolv
|
||||
>extra avahi
|
||||
>extra networkmanager-openconnect
|
||||
>extra networkmanager-openvpn
|
||||
>extra networkmanager-pptp
|
||||
>extra networkmanager-vpnc
|
||||
|
||||
|
||||
## Base
|
||||
manjaro-settings-manager-notifier
|
||||
manjaro-jade-settings
|
||||
gnome-keyring
|
||||
manjaro-browser-settings
|
||||
manjaro-settings-manager-notifier
|
||||
manjaro-hotfixes
|
||||
manjaro-hello
|
||||
mousetweaks
|
||||
nss-mdns
|
||||
numlockx
|
||||
powertop
|
||||
>basic squashfs-tools
|
||||
openssh
|
||||
tracker
|
||||
tracker-miners
|
||||
>basic disable-tracker
|
||||
inxi
|
||||
>extra dunst-notify-speech
|
||||
dmidecode
|
||||
>extra gtkhash-nautilus
|
||||
fprintd #need for finger id reader
|
||||
lxqt-powermanagement
|
||||
blueberry
|
||||
usb_modeswitch
|
||||
xdg-user-dirs
|
||||
xdg-user-dirs-gtk
|
||||
xdg-utils
|
||||
|
@ -112,16 +94,44 @@ xf86-input-libinput
|
|||
xf86-input-void
|
||||
xorg-server
|
||||
xorg-xinit
|
||||
>extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
|
||||
>extra xf86-input-wacom # Support for tablet and pen display ( wacom ecc. )
|
||||
>extra manjaro-settings-manager-notifier
|
||||
>extra mousetweaks
|
||||
>extra nss-mdns
|
||||
>extra numlockx
|
||||
>extra powertop
|
||||
>extra inxi
|
||||
>extra dunst-notify-speech
|
||||
>extra dmidecode
|
||||
>extra gtkhash-nautilus
|
||||
>extra fprintd #need for finger id reader
|
||||
>extra lxqt-powermanagement
|
||||
>extra blueberry
|
||||
>extra usb_modeswitch
|
||||
>extra openssh
|
||||
>extra manjaro-browser-settings
|
||||
|
||||
# Dependencies for file-roller
|
||||
>extra gnome-getting-started-docs
|
||||
>extra p7zip
|
||||
>extra unrar
|
||||
>extra unace
|
||||
>extra lrzip
|
||||
>extra gtk3-print-backends
|
||||
>extra manjaro-documentation-en
|
||||
>extra manjaro-printer
|
||||
>extra simple-scan
|
||||
>extra ffmpegthumbnailer
|
||||
>extra kernel-alive
|
||||
|
||||
|
||||
## Package management
|
||||
>extra apparmor
|
||||
pamac-gtk
|
||||
>extra snapd
|
||||
>extra snapd-glib
|
||||
>extra pamac-snap-plugin
|
||||
>extra pamac-flatpak-plugin
|
||||
>extra apparmor
|
||||
|
||||
|
||||
## Java
|
||||
|
@ -134,41 +144,3 @@ pamac-gtk
|
|||
ttf-roboto
|
||||
adobe-source-code-pro-fonts
|
||||
|
||||
|
||||
#extra depends for file-roller
|
||||
>extra gnome-getting-started-docs
|
||||
>extra p7zip
|
||||
>extra unrar
|
||||
>extra unace
|
||||
>extra lrzip
|
||||
>extra gtk3-print-backends
|
||||
>extra manjaro-documentation-en
|
||||
#>x86_64 >extra steam-manjaro
|
||||
>extra manjaro-printer
|
||||
>extra simple-scan
|
||||
>extra ffmpegthumbnailer
|
||||
>extra kernel-alive
|
||||
|
||||
|
||||
## AUR Support/Development
|
||||
# Missing base-devel packages
|
||||
#>extra autoconf
|
||||
#>extra automake
|
||||
#>extra binutils
|
||||
#>extra bison
|
||||
#>extra fakeroot
|
||||
#>extra flex
|
||||
#>extra gcc
|
||||
#>extra >multilib gcc-libs-multilib
|
||||
#>extra >multilib gcc-multilib
|
||||
#>extra libtool
|
||||
#>extra m4
|
||||
#>extra make
|
||||
#>extra patch
|
||||
#>extra pkg-config
|
||||
#>extra >multilib lib32-flex
|
||||
# Extra packages for AUR support
|
||||
#>extra git
|
||||
#>extra patchutils
|
||||
#>extra subversion
|
||||
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
prettyName: "Join Our Forum"
|
||||
url: "https://forum.manjaro.org/"
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
groupsUrl: https://gitlab.manjaro.org/packages/community/jade/calamares-netinstall-settings/-/raw/master/netinstall-software.yaml
|
||||
|
||||
label:
|
||||
sidebar: "Software"
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
|
||||
backend: pacman
|
||||
|
||||
skip_if_no_internet: false
|
||||
update_db: true
|
||||
update_system: true
|
|
@ -0,0 +1,59 @@
|
|||
modules-search: [ local ]
|
||||
|
||||
|
||||
instances:
|
||||
- id: software
|
||||
module: netinstall
|
||||
config: netinstall-software.conf
|
||||
|
||||
- id: forum-sign-on
|
||||
module: webview
|
||||
config: forum-sign-on.conf
|
||||
|
||||
|
||||
sequence:
|
||||
- show:
|
||||
- welcome
|
||||
- users
|
||||
- locale
|
||||
- keyboard
|
||||
- netinstall@software
|
||||
- partition
|
||||
- summary
|
||||
- exec:
|
||||
- partition
|
||||
- mount
|
||||
- unpackfs
|
||||
- machineid
|
||||
- fstab
|
||||
- locale
|
||||
- keyboard
|
||||
- localecfg
|
||||
- luksopenswaphookcfg
|
||||
- luksbootkeyfile
|
||||
- plymouthcfg
|
||||
- initcpiocfg
|
||||
- initcpio
|
||||
- users
|
||||
- displaymanager
|
||||
- mhwdcfg
|
||||
- networkcfg
|
||||
- hwclock
|
||||
- services
|
||||
- grubcfg
|
||||
- bootloader
|
||||
- postcfg
|
||||
- packages
|
||||
- umount
|
||||
- show:
|
||||
#- webview@forum-sign-on
|
||||
- finished
|
||||
|
||||
|
||||
branding: manjaro
|
||||
prompt-install: false
|
||||
dont-chroot: false
|
||||
# oem-setup: true
|
||||
disable-cancel: false
|
||||
disable-cancel-during-exec: false
|
||||
quit-at-end: false
|
|
@ -6,7 +6,9 @@
|
|||
#multilib="true"
|
||||
|
||||
# use extra packages as defined in pkglist to activate a full profile
|
||||
extra="true"
|
||||
# for remote netinstall, comment line 388(write_settings_conf "$1") in /usr/lib/manjaro-tools/util-yaml.sh
|
||||
# or delete /livefs/etc/calamares/settings.conf
|
||||
extra="false"
|
||||
|
||||
################ install ################
|
||||
|
||||
|
@ -31,7 +33,7 @@ custom_boot_args="'quiet'"
|
|||
#oem_used="true"
|
||||
|
||||
# configure calamares for netinstall
|
||||
# netinstall="false"
|
||||
#netinstall="true"
|
||||
|
||||
# configure calamares to use chrootcfg instead of unpackfs
|
||||
# chrootcfg="false"
|
||||
|
@ -92,4 +94,4 @@ login_shell="/bin/zsh"
|
|||
# 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')
|
||||
# enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live')
|
||||
# enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live')
|
|
@ -0,0 +1,9 @@
|
|||
[Desktop Entry]
|
||||
Terminal=false
|
||||
Name=mntray
|
||||
Type=Application
|
||||
Exec=/usr/bin/mntray --delay
|
||||
Icon=mntray
|
||||
Comment=A Manjaro Linux announcements notification app
|
||||
X-GNOME-Autostart-enabled=false
|
||||
|
Loading…
Reference in New Issue