mirror of https://github.com/JPyke3/mbp-manjaro
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
a35d9b05e5
|
@ -112,7 +112,6 @@ pamac
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common # For hplip
|
|
||||||
>extra python-pillow # For hplip
|
>extra python-pillow # For hplip
|
||||||
>extra python-pip # For hplip
|
>extra python-pip # For hplip
|
||||||
>extra python-pyqt5 # For hplip gui
|
>extra python-pyqt5 # For hplip gui
|
||||||
|
|
|
@ -112,7 +112,6 @@ mattercontrol
|
||||||
#avrdude
|
#avrdude
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common # For hplip
|
|
||||||
>extra python-pillow # For hplip
|
>extra python-pillow # For hplip
|
||||||
>extra python-pip # For hplip
|
>extra python-pip # For hplip
|
||||||
>extra python-pyqt5 # For hplip gui
|
>extra python-pyqt5 # For hplip gui
|
||||||
|
|
|
@ -114,7 +114,6 @@ octopi-notifier-frameworks
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common
|
|
||||||
>extra python-pillow
|
>extra python-pillow
|
||||||
>extra python-pip
|
>extra python-pip
|
||||||
>extra python-pyqt5
|
>extra python-pyqt5
|
||||||
|
|
|
@ -113,7 +113,6 @@ octopi
|
||||||
>extra splix
|
>extra splix
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common
|
|
||||||
>extra python-pillow
|
>extra python-pillow
|
||||||
>extra python-pip
|
>extra python-pip
|
||||||
>extra python-pyqt5
|
>extra python-pyqt5
|
||||||
|
|
|
@ -97,6 +97,8 @@ flatpak
|
||||||
xdg-desktop-portal
|
xdg-desktop-portal
|
||||||
xdg-desktop-portal-kde
|
xdg-desktop-portal-kde
|
||||||
fwupd
|
fwupd
|
||||||
|
pamac-cli
|
||||||
|
octopi
|
||||||
|
|
||||||
## Printing
|
## Printing
|
||||||
#>extra cups
|
#>extra cups
|
||||||
|
@ -109,7 +111,6 @@ fwupd
|
||||||
#>extra splix
|
#>extra splix
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
#>extra pyqt5-common
|
|
||||||
#>extra python-pillow
|
#>extra python-pillow
|
||||||
#>extra python-pip
|
#>extra python-pip
|
||||||
#>extra python-pyqt5
|
#>extra python-pyqt5
|
||||||
|
@ -157,8 +158,8 @@ breeze-icons-git
|
||||||
gnome-icon-theme
|
gnome-icon-theme
|
||||||
gnome-themes-standard
|
gnome-themes-standard
|
||||||
#gtk-theme-breath
|
#gtk-theme-breath
|
||||||
>extra oxygen-git
|
oxygen-git
|
||||||
>extra oxygen-icons-git
|
oxygen-icons-git
|
||||||
#plasma5-themes-breath # Default
|
#plasma5-themes-breath # Default
|
||||||
#sddm-breath-theme # Default
|
#sddm-breath-theme # Default
|
||||||
grub-theme-manjaro
|
grub-theme-manjaro
|
||||||
|
@ -256,15 +257,14 @@ inxi
|
||||||
#>extra libreoffice-fresh
|
#>extra libreoffice-fresh
|
||||||
>extra calligra
|
>extra calligra
|
||||||
#manjaro-hello
|
#manjaro-hello
|
||||||
#manjaro-settings-manager-kcm
|
manjaro-settings-manager-kcm
|
||||||
#manjaro-settings-manager-knotifier
|
manjaro-settings-manager-knotifier
|
||||||
powertop
|
powertop
|
||||||
#>extra qbittorrent
|
#>extra qbittorrent
|
||||||
screenfetch
|
screenfetch
|
||||||
systemd-kcm
|
systemd-kcm
|
||||||
#>extra thunderbird
|
#>extra thunderbird
|
||||||
vlc
|
vlc
|
||||||
#vlc-nightly
|
|
||||||
yakuake
|
yakuake
|
||||||
|
|
||||||
## Optional dependencis for cantata
|
## Optional dependencis for cantata
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
calamares-git
|
calamares
|
||||||
>manjaro grub-theme-live-manjaro
|
>manjaro grub-theme-live-manjaro
|
||||||
gsmartcontrol
|
gsmartcontrol
|
||||||
#manjaro-architect
|
#manjaro-architect
|
||||||
|
|
|
@ -123,7 +123,6 @@ manjaro-application-utility
|
||||||
>extra splix
|
>extra splix
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common
|
|
||||||
>extra python-pillow
|
>extra python-pillow
|
||||||
>extra python-pip
|
>extra python-pip
|
||||||
>extra python-pyqt5
|
>extra python-pyqt5
|
||||||
|
|
|
@ -127,7 +127,7 @@ plasma-settings # Settings application and modules.
|
||||||
plasma-camera # Camera application.
|
plasma-camera # Camera application.
|
||||||
marble # Maps application.
|
marble # Maps application.
|
||||||
koko # Gallery application.
|
koko # Gallery application.
|
||||||
#vvave # Music player.
|
vvave # Music player.
|
||||||
okular # Document Viewer.
|
okular # Document Viewer.
|
||||||
#discover # Software Center.
|
#discover # Software Center.
|
||||||
plasma-angelfish # Webbrowser for phones.
|
plasma-angelfish # Webbrowser for phones.
|
||||||
|
@ -139,7 +139,7 @@ peruse # A comic book viewer.
|
||||||
calindori # Calendar and todo management application.
|
calindori # Calendar and todo management application.
|
||||||
#plasmatube # Work-in-progress youtube client.
|
#plasmatube # Work-in-progress youtube client.
|
||||||
index # File manager.
|
index # File manager.
|
||||||
#plasma-pix # Maui Image Gallery.
|
plasma-pix # Maui Image Gallery.
|
||||||
#qrca # QR Code scanner.
|
#qrca # QR Code scanner.
|
||||||
keysmith # OTP client.
|
keysmith # OTP client.
|
||||||
plasma-nano
|
plasma-nano
|
||||||
|
|
|
@ -6,7 +6,7 @@ Relogin=false
|
||||||
Session=plasma-mobile.desktop
|
Session=plasma-mobile.desktop
|
||||||
|
|
||||||
# Username for autologin session
|
# Username for autologin session
|
||||||
User=manjaro
|
# User=manjaro
|
||||||
|
|
||||||
[General]
|
[General]
|
||||||
# Halt command
|
# Halt command
|
||||||
|
|
|
@ -108,7 +108,6 @@ pamac
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common # For hplip
|
|
||||||
>extra python-pillow # For hplip
|
>extra python-pillow # For hplip
|
||||||
>extra python-pip # For hplip
|
>extra python-pip # For hplip
|
||||||
>extra python-pyqt5 # For hplip gui
|
>extra python-pyqt5 # For hplip gui
|
||||||
|
|
|
@ -114,7 +114,6 @@ pamac-tray-appindicator
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common
|
|
||||||
>extra python-pillow
|
>extra python-pillow
|
||||||
>extra python-pip
|
>extra python-pip
|
||||||
>extra python-pyqt5
|
>extra python-pyqt5
|
||||||
|
|
|
@ -102,7 +102,6 @@ flatpak
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common # For hplip
|
|
||||||
>extra python-pillow # For hplip
|
>extra python-pillow # For hplip
|
||||||
>extra python-pip # For hplip
|
>extra python-pip # For hplip
|
||||||
>extra python-pyqt5 # For hplip gui
|
>extra python-pyqt5 # For hplip gui
|
||||||
|
|
|
@ -123,7 +123,6 @@ manjaro-application-utility
|
||||||
>extra splix
|
>extra splix
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common
|
|
||||||
>extra python-pillow
|
>extra python-pillow
|
||||||
>extra python-pip
|
>extra python-pip
|
||||||
>extra python-pyqt5
|
>extra python-pyqt5
|
||||||
|
|
|
@ -21,6 +21,8 @@ extra="true"
|
||||||
# unset defaults to given value
|
# unset defaults to given value
|
||||||
# efi_boot_loader="grub"
|
# efi_boot_loader="grub"
|
||||||
|
|
||||||
|
custom_boot_args="'acpi_osi='"
|
||||||
|
|
||||||
# configure calamares for mhwd
|
# configure calamares for mhwd
|
||||||
mhwd_used="false"
|
mhwd_used="false"
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,6 @@ bauh
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common # For hplip
|
|
||||||
>extra python-pillow # For hplip
|
>extra python-pillow # For hplip
|
||||||
>extra python-pip # For hplip
|
>extra python-pip # For hplip
|
||||||
>extra python-pyqt5 # For hplip gui
|
>extra python-pyqt5 # For hplip gui
|
||||||
|
@ -176,6 +175,7 @@ xfce4-whiskermenu-plugin
|
||||||
xfce4-xkb-plugin
|
xfce4-xkb-plugin
|
||||||
xfce4-pulseaudio-plugin
|
xfce4-pulseaudio-plugin
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
xcape
|
||||||
|
|
||||||
## Themes
|
## Themes
|
||||||
>extra manjaro-wallpapers-18.0
|
>extra manjaro-wallpapers-18.0
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
GRUB_DEFAULT=saved
|
||||||
|
GRUB_TIMEOUT=10
|
||||||
|
GRUB_TIMEOUT_STYLE=hidden
|
||||||
|
GRUB_DISTRIBUTOR="Manjaro"
|
||||||
|
GRUB_CMDLINE_LINUX_DEFAULT="acpi_osi="
|
||||||
|
GRUB_CMDLINE_LINUX=""
|
||||||
|
|
||||||
|
# If you want to enable the save default function, uncomment the following
|
||||||
|
# line, and set GRUB_DEFAULT to saved.
|
||||||
|
GRUB_SAVEDEFAULT=true
|
||||||
|
|
||||||
|
# Preload both GPT and MBR modules so that they are not missed
|
||||||
|
GRUB_PRELOAD_MODULES="part_gpt part_msdos"
|
||||||
|
|
||||||
|
# Uncomment to enable Hidden Menu, and optionally hide the timeout count
|
||||||
|
#GRUB_HIDDEN_TIMEOUT=5
|
||||||
|
#GRUB_HIDDEN_TIMEOUT_QUIET=true
|
||||||
|
|
||||||
|
# Uncomment to use basic console
|
||||||
|
GRUB_TERMINAL_INPUT=console
|
||||||
|
|
||||||
|
# Uncomment to disable graphical terminal
|
||||||
|
#GRUB_TERMINAL_OUTPUT=console
|
||||||
|
|
||||||
|
# The resolution used on graphical terminal
|
||||||
|
# note that you can use only modes which your graphic card supports via VBE
|
||||||
|
# you can see them in real GRUB with the command `vbeinfo'
|
||||||
|
GRUB_GFXMODE=auto
|
||||||
|
|
||||||
|
# Uncomment to allow the kernel use the same resolution used by grub
|
||||||
|
GRUB_GFXPAYLOAD_LINUX=keep
|
||||||
|
|
||||||
|
# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
|
||||||
|
# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
|
||||||
|
#GRUB_DISABLE_LINUX_UUID=true
|
||||||
|
|
||||||
|
# Uncomment to disable generation of recovery mode menu entries
|
||||||
|
GRUB_DISABLE_RECOVERY=true
|
||||||
|
|
||||||
|
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
|
||||||
|
# modes only. Entries specified as foreground/background.
|
||||||
|
GRUB_COLOR_NORMAL="light-gray/black"
|
||||||
|
GRUB_COLOR_HIGHLIGHT="green/black"
|
||||||
|
|
||||||
|
# Uncomment one of them for the gfx desired, a image background or a gfxtheme
|
||||||
|
#GRUB_BACKGROUND="/usr/share/grub/background.png"
|
||||||
|
#GRUB_THEME="/path/to/gfxtheme"
|
||||||
|
|
||||||
|
# Uncomment to get a beep at GRUB start
|
||||||
|
#GRUB_INIT_TUNE="480 440 1"
|
|
@ -21,6 +21,8 @@ extra="true"
|
||||||
# unset defaults to given value
|
# unset defaults to given value
|
||||||
# efi_boot_loader="grub"
|
# efi_boot_loader="grub"
|
||||||
|
|
||||||
|
custom_boot_args="'acpi_osi='"
|
||||||
|
|
||||||
# configure calamares for mhwd
|
# configure calamares for mhwd
|
||||||
mhwd_used="false"
|
mhwd_used="false"
|
||||||
|
|
||||||
|
|
|
@ -123,7 +123,6 @@ manjaro-application-utility
|
||||||
>extra splix
|
>extra splix
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common
|
|
||||||
>extra python-pillow
|
>extra python-pillow
|
||||||
>extra python-pip
|
>extra python-pip
|
||||||
>extra python-pyqt5
|
>extra python-pyqt5
|
||||||
|
|
|
@ -101,7 +101,6 @@ bauh
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common # For hplip
|
|
||||||
>extra python-pillow # For hplip
|
>extra python-pillow # For hplip
|
||||||
>extra python-pip # For hplip
|
>extra python-pip # For hplip
|
||||||
>extra python-pyqt5 # For hplip gui
|
>extra python-pyqt5 # For hplip gui
|
||||||
|
@ -176,6 +175,7 @@ xfce4-whiskermenu-plugin
|
||||||
xfce4-xkb-plugin
|
xfce4-xkb-plugin
|
||||||
xfce4-pulseaudio-plugin
|
xfce4-pulseaudio-plugin
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
xcape
|
||||||
|
|
||||||
## Themes
|
## Themes
|
||||||
>extra manjaro-wallpapers-18.0
|
>extra manjaro-wallpapers-18.0
|
||||||
|
|
|
@ -105,7 +105,6 @@ pamac
|
||||||
>extra system-config-printer
|
>extra system-config-printer
|
||||||
|
|
||||||
## Optional dependencies for hplip
|
## Optional dependencies for hplip
|
||||||
>extra pyqt5-common # For hplip
|
|
||||||
>extra python-pillow # For hplip
|
>extra python-pillow # For hplip
|
||||||
>extra python-pip # For hplip
|
>extra python-pip # For hplip
|
||||||
>extra python-pyqt5 # For hplip gui
|
>extra python-pyqt5 # For hplip gui
|
||||||
|
|
Loading…
Reference in New Issue