mirror of https://github.com/JPyke3/mbp-manjaro
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Frede Hundewadt
commit
f1e06a0188
|
|
@ -45,7 +45,6 @@ dconf-editor
|
|||
feh
|
||||
gnome-keyring
|
||||
gksu
|
||||
gtk3-classic
|
||||
android-tools
|
||||
android-udev
|
||||
gvfs
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
>extra firefox
|
||||
>extra gestures
|
||||
>extra gnome-disk-utility
|
||||
>extra gtk3-classic
|
||||
>extra gufw
|
||||
>extra gvfs
|
||||
>extra gvfs-afc
|
||||
|
|
@ -123,4 +122,4 @@ xorg-xprop
|
|||
xorg-xsetroot
|
||||
zensu
|
||||
zsh-completions
|
||||
highlight
|
||||
highlight
|
||||
|
|
|
|||
|
|
@ -207,7 +207,6 @@ freetype2
|
|||
accountsservice
|
||||
gksu-polkit
|
||||
gnome-keyring
|
||||
gtk3-classic
|
||||
manjaro-hotfixes
|
||||
perl-file-mimeinfo
|
||||
polkit
|
||||
|
|
|
|||
|
|
@ -0,0 +1,165 @@
|
|||
## Network
|
||||
avahi
|
||||
networkmanager
|
||||
#networkmanager-openconnect
|
||||
#networkmanager-openvpn
|
||||
#networkmanager-pptp
|
||||
#networkmanager-vpnc
|
||||
nss-mdns # NSS support for mDNS (optdepend for avahi)
|
||||
ntp
|
||||
mobile-broadband-provider-info
|
||||
modemmanager
|
||||
openresolv
|
||||
openssh
|
||||
samba
|
||||
usb_modeswitch
|
||||
|
||||
## Libraries for Sound/Audio/Video
|
||||
alsa-firmware
|
||||
alsa-utils
|
||||
ffmpeg
|
||||
gst-libav
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
libcanberra
|
||||
>multilib lib32-libcanberra
|
||||
libcanberra-pulse
|
||||
>multilib lib32-libcanberra-pulse
|
||||
libcanberra-gstreamer
|
||||
libdvdcss
|
||||
manjaro-alsa
|
||||
manjaro-pulse
|
||||
phonon-qt5-gstreamer
|
||||
pulseaudio-bluetooth
|
||||
pulseaudio-ctl
|
||||
pulseaudio-zeroconf
|
||||
|
||||
## Connect Packages
|
||||
android-tools
|
||||
android-udev
|
||||
gvfs
|
||||
gvfs-afc
|
||||
gvfs-gphoto2
|
||||
gvfs-mtp
|
||||
gvfs-nfs
|
||||
gvfs-smb
|
||||
kamera
|
||||
mtpfs
|
||||
udiskie
|
||||
udisks2
|
||||
|
||||
## 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
|
||||
#yaourt
|
||||
|
||||
## Fonts
|
||||
# cantarell-fonts # Installed as gnome-themes-standard dependency
|
||||
noto-fonts # default font
|
||||
noto-fonts-cjk # asian fonts - needed big package, ~76 mb compressed
|
||||
>extra noto-fonts-emoji
|
||||
terminus-font
|
||||
>extra ttf-bitstream-vera
|
||||
# ttf-dejavu # Installed as gnome-themes-standard dependency
|
||||
# ttf-hack # Installed as plasma-integration dependency
|
||||
>extra ttf-inconsolata
|
||||
>extra ttf-indic-otf
|
||||
>extra ttf-liberation
|
||||
>extra ttf-droid
|
||||
|
||||
## Xorg Input Drivers
|
||||
xf86-input-elographics
|
||||
xf86-input-evdev
|
||||
xf86-input-keyboard
|
||||
xf86-input-libinput
|
||||
xf86-input-mouse
|
||||
xf86-input-void
|
||||
|
||||
## Xorg Server and Graphics
|
||||
>multilib lib32-libva-intel-driver
|
||||
>multilib lib32-libva-mesa-driver
|
||||
>multilib lib32-libva-vdpau-driver
|
||||
libva-intel-driver
|
||||
libva-mesa-driver
|
||||
libva-vdpau-driver
|
||||
mesa-demos
|
||||
>multilib lib32-mesa-demos
|
||||
numlockx
|
||||
xdg-user-dirs
|
||||
xorg-server
|
||||
xorg-server-xwayland
|
||||
xorg-twm
|
||||
xorg-xinit
|
||||
xorg-xkill
|
||||
|
||||
## Themes
|
||||
|
||||
breath-icon-theme
|
||||
plasma5-themes-breath
|
||||
sddm-breath-theme
|
||||
|
||||
## Display manager
|
||||
sddm
|
||||
#sddm-kcm
|
||||
|
||||
## Plasma5
|
||||
plasma-settings # Settings application and modules.
|
||||
plasma-camera # Camera application.
|
||||
marble # Maps application.
|
||||
koko # Gallery application.
|
||||
#vvave # Music player.
|
||||
okular # Document Viewer.
|
||||
#discover # Software Center.
|
||||
plasma-angelfish # Webbrowser for phones.
|
||||
#plasma-samegame # Small example game, pure QML.
|
||||
#mtp-server # Fork of Ubuntu’s MTP server
|
||||
kaidan # XMPP based Messenger.
|
||||
qmlkonsole # Terminal application.
|
||||
peruse # A comic book viewer.
|
||||
calindori # Calendar and todo management application.
|
||||
#plasmatube # Work-in-progress youtube client.
|
||||
index # File manager.
|
||||
#plasma-pix # Maui Image Gallery.
|
||||
#qrca # QR Code scanner.
|
||||
keysmith # OTP client.
|
||||
plasma-nano
|
||||
|
||||
## Plasma phone components
|
||||
#simplelogin # Display manager for launching the plasma-phone shell
|
||||
plasma-phone-components # Dialer and Phone shell QtQuick code, application launcher model, etc.
|
||||
kpeoplevcard # Provides the vCard based contact management backend used by the dialer, plasma-phonebook and others.
|
||||
plasma-phonebook # Contact management application.
|
||||
spacebar # Work-in-progress SMS application.
|
||||
|
||||
## Applications
|
||||
qt5-virtualkeyboard
|
||||
phonesim
|
||||
ofono
|
||||
libqofono
|
||||
konsole
|
||||
|
||||
## Maui Applications
|
||||
dialer
|
||||
|
||||
## Optional dependencies for okular
|
||||
poppler-data # encoding data to display PDF documents containing CJK characters
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../shared/Packages-Live
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../shared/Packages-Mhwd
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../shared/Packages-Root
|
||||
|
|
@ -3,11 +3,10 @@
|
|||
Relogin=false
|
||||
|
||||
# Name of session file for autologin session (if empty try last logged in)
|
||||
Session=plasma.desktop
|
||||
Session=plasma-mobile.desktop
|
||||
|
||||
# Username for autologin session
|
||||
User=
|
||||
|
||||
User=manjaro
|
||||
|
||||
[General]
|
||||
# Halt command
|
||||
|
|
@ -24,7 +23,6 @@ Numlock=none
|
|||
# Reboot command
|
||||
RebootCommand=/usr/bin/systemctl reboot
|
||||
|
||||
|
||||
[Theme]
|
||||
# Current theme name
|
||||
Current=breath
|
||||
|
|
@ -125,5 +123,4 @@ XauthPath=/usr/bin/xauth
|
|||
|
||||
# Path to Xephyr binary
|
||||
XephyrPath=/usr/bin/Xephyr
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
QT_QPA_PLATFORM=wayland
|
||||
QT_QPA_PLATFORMTHEME=KDE
|
||||
QT_WAYLAND_DISABLE_WINDOWDECORATION=1
|
||||
XDG_CURRENT_DESKTOP=KDE
|
||||
KSCREEN_BACKEND=QScreen
|
||||
KDE_FULL_SESSION=1
|
||||
KDE_SESSION_VERSION=5
|
||||
|
|
@ -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/pam.d
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
[X11]
|
||||
exportKDEColors=true
|
||||
exportKDEFonts=false
|
||||
|
||||
[DisplayEnergy]
|
||||
displayEnergySaving=false
|
||||
displayStandby=7
|
||||
displaySuspend=13
|
||||
displayPowerOff=19
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
[Daemon]
|
||||
Autolock=false
|
||||
Timeout=0
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[Wallet]
|
||||
Close When Idle=false
|
||||
Close on Screensaver=false
|
||||
Enabled=false
|
||||
Idle Timeout=10
|
||||
Launch Manager=false
|
||||
Leave Manager Open=false
|
||||
Leave Open=true
|
||||
Prompt on Open=false
|
||||
Use One Wallet=true
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../../../../../shared/manjaro/live-overlay/etc/skel/.config/manjaro
|
||||
|
|
@ -0,0 +1,81 @@
|
|||
##########################################
|
||||
###### 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="true"
|
||||
|
||||
# use extra packages as defined in pkglist to activate a full profile
|
||||
# extra="false"
|
||||
# extra="true"
|
||||
|
||||
################ 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'
|
||||
|
||||
# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
|
||||
# strict_snaps=""
|
||||
# add classic snaps: classic_snaps="code"
|
||||
# classic_snaps=""
|
||||
# choose the snap channel. Possible options are: stable, candidate, beta, edge
|
||||
# snap_channel="candidate"
|
||||
|
||||
# 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' 'haveged' 'apparmor' 'snapd.apparmor' 'snapd')
|
||||
#enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged')
|
||||
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')
|
||||
|
||||
# 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')
|
||||
|
|
@ -44,7 +44,6 @@ grub-theme-manjaro-dev
|
|||
>extra gst-plugins-good
|
||||
>extra gst-plugins-ugly
|
||||
>extra gstreamer
|
||||
gtk3-classic
|
||||
>extra gtksourceview-pkgbuild
|
||||
>extra gufw
|
||||
gvfs
|
||||
|
|
|
|||
|
|
@ -114,10 +114,6 @@ lightdm-gtk-greeter
|
|||
lightdm-gtk-greeter-settings
|
||||
accountsservice # Enhanced user accounts handling
|
||||
|
||||
## GTK3
|
||||
gtk3-classic
|
||||
>multilib lib32-gtk3-classic
|
||||
|
||||
## XFCE Group
|
||||
exo-gtk3
|
||||
garcon-gtk3
|
||||
|
|
|
|||
|
|
@ -87,9 +87,12 @@ terminus-font
|
|||
>extra ttf-liberation
|
||||
>extra ttf-droid
|
||||
|
||||
## Games
|
||||
>x86_64 >extra steam-manjaro
|
||||
|
||||
## Package management
|
||||
#appimagelauncher
|
||||
pamac-gtk
|
||||
pamac
|
||||
pamac-tray-appindicator
|
||||
pamac-cli
|
||||
>extra apparmor
|
||||
|
|
@ -166,11 +169,9 @@ user-manager
|
|||
gnome-icon-theme
|
||||
gnome-themes-standard
|
||||
gtk-theme-breath
|
||||
manjaro-icons-tx
|
||||
oxygen # needed to provide KDE system sounds
|
||||
oxygen-icons
|
||||
plasma5-themes-breath # Default
|
||||
sddm-breath-theme # Default
|
||||
sddm-breath2-theme
|
||||
grub-theme-manjaro
|
||||
illyria-wallpaper
|
||||
>extra wallpapers-juhraya
|
||||
|
|
@ -264,9 +265,9 @@ inxi
|
|||
#>extra krita
|
||||
>extra firefox
|
||||
>basic falkon
|
||||
ms-office-online
|
||||
#ms-office-online
|
||||
#>extra freeoffice
|
||||
>extra libreoffice-still
|
||||
#>extra libreoffice-still
|
||||
#>extra calligra
|
||||
manjaro-hello
|
||||
manjaro-settings-manager-kcm
|
||||
|
|
@ -324,16 +325,16 @@ perl-file-mimeinfo
|
|||
xdg-utils
|
||||
xdg-su
|
||||
>extra timeshift
|
||||
>extra kernel-alive
|
||||
|
||||
## Misc
|
||||
manjaro-hotfixes
|
||||
>basic squashfs-tools
|
||||
|
||||
## Flatpak support
|
||||
>extra flatpak
|
||||
>extra xdg-desktop-portal
|
||||
>extra xdg-desktop-portal-kde
|
||||
|
||||
## OEM
|
||||
calamares-oem-modules
|
||||
calamares-oem-infbkpro-kde-settings
|
||||
grub-theme-live-manjaro
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ Session=plasma.desktop
|
|||
# Username for autologin session
|
||||
User=
|
||||
|
||||
|
||||
[General]
|
||||
# Halt command
|
||||
HaltCommand=/usr/bin/systemctl poweroff
|
||||
|
|
@ -24,10 +23,9 @@ Numlock=none
|
|||
# Reboot command
|
||||
RebootCommand=/usr/bin/systemctl reboot
|
||||
|
||||
|
||||
[Theme]
|
||||
# Current theme name
|
||||
Current=breath
|
||||
Current=breath2
|
||||
|
||||
# Cursor theme used in the greeter
|
||||
CursorTheme=breeze_cursors
|
||||
|
|
@ -47,7 +45,6 @@ FacesDir=/usr/share/sddm/faces
|
|||
# Theme directory path
|
||||
ThemeDir=/usr/share/sddm/themes
|
||||
|
||||
|
||||
[Users]
|
||||
# Default $PATH for logged in users
|
||||
DefaultPath=/usr/local/sbin:/usr/local/bin:/usr/bin
|
||||
|
|
@ -74,7 +71,6 @@ RememberLastUser=true
|
|||
# When logging in as the same user twice, restore the original session, rather than create a new one
|
||||
ReuseSession=false
|
||||
|
||||
|
||||
[Wayland]
|
||||
# Enable Qt's automatic high-DPI scaling
|
||||
EnableHiDPI=false
|
||||
|
|
@ -88,7 +84,6 @@ SessionDir=/usr/share/wayland-sessions
|
|||
# Path to the user session log file
|
||||
SessionLogFile=.local/share/sddm/wayland-session.log
|
||||
|
||||
|
||||
[X11]
|
||||
# Path to a script to execute when starting the display server
|
||||
DisplayCommand=/usr/share/sddm/scripts/Xsetup
|
||||
|
|
@ -125,5 +120,3 @@ XauthPath=/usr/bin/xauth
|
|||
|
||||
# Path to Xephyr binary
|
||||
XephyrPath=/usr/bin/Xephyr
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
vm.swappiness=10
|
||||
vm.swappiness=10
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
#!/bin/bash
|
||||
|
||||
sudo -E calamares
|
||||
|
|
@ -171,8 +171,7 @@ gnome-themes-standard
|
|||
gtk-theme-breath
|
||||
oxygen # needed to provide KDE system sounds
|
||||
oxygen-icons
|
||||
plasma5-themes-breath # Default
|
||||
sddm-breath-theme # Default
|
||||
sddm-breath2-theme
|
||||
grub-theme-manjaro
|
||||
illyria-wallpaper
|
||||
>extra wallpapers-juhraya
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
grub-theme-live-manjaro
|
||||
manjaro-live-skel
|
||||
manjaro-live-systemd
|
||||
mkinitcpio-nfs-utils
|
||||
nbd
|
||||
|
|
@ -0,0 +1 @@
|
|||
../infinitybook14-oem-kde/Packages-Live
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../infinitybook14-oem-kde/desktop-overlay/etc/
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
Section "InputClass"
|
||||
Identifier "touchpad"
|
||||
Driver "libinput"
|
||||
MatchIsTouchpad "on"
|
||||
Option "Tapping" "on"
|
||||
EndSection
|
||||
|
|
@ -1 +0,0 @@
|
|||
vm.swappiness=10
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../infinitybook14-oem-kde/desktop-overlay/usr/
|
||||
|
|
@ -1 +1 @@
|
|||
../../../shared/oem/live-overlay/usr
|
||||
../../infinitybook14-oem-kde/live-overlay/usr/
|
||||
|
|
@ -117,10 +117,6 @@ lightdm-slick-greeter
|
|||
lightdm-settings
|
||||
accountsservice # Enhanced user accounts handling
|
||||
|
||||
## GTK3
|
||||
gtk3-classic
|
||||
>multilib lib32-gtk3-classic
|
||||
|
||||
## XFCE Group
|
||||
exo-gtk3
|
||||
garcon-gtk3
|
||||
|
|
|
|||
Loading…
Reference in New Issue