Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Frede Hundewadt 2019-12-15 08:15:10 +01:00
commit a35d9b05e5
No known key found for this signature in database
GPG Key ID: 7605992471F3F073
20 changed files with 66 additions and 23 deletions

View File

@ -112,7 +112,6 @@ pamac
>extra system-config-printer
## Optional dependencies for hplip
>extra pyqt5-common # For hplip
>extra python-pillow # For hplip
>extra python-pip # For hplip
>extra python-pyqt5 # For hplip gui

View File

@ -112,7 +112,6 @@ mattercontrol
#avrdude
## Optional dependencies for hplip
>extra pyqt5-common # For hplip
>extra python-pillow # For hplip
>extra python-pip # For hplip
>extra python-pyqt5 # For hplip gui

View File

@ -114,7 +114,6 @@ octopi-notifier-frameworks
>extra system-config-printer
## Optional dependencies for hplip
>extra pyqt5-common
>extra python-pillow
>extra python-pip
>extra python-pyqt5

View File

@ -113,7 +113,6 @@ octopi
>extra splix
## Optional dependencies for hplip
>extra pyqt5-common
>extra python-pillow
>extra python-pip
>extra python-pyqt5

View File

@ -97,6 +97,8 @@ flatpak
xdg-desktop-portal
xdg-desktop-portal-kde
fwupd
pamac-cli
octopi
## Printing
#>extra cups
@ -109,7 +111,6 @@ fwupd
#>extra splix
## Optional dependencies for hplip
#>extra pyqt5-common
#>extra python-pillow
#>extra python-pip
#>extra python-pyqt5
@ -157,8 +158,8 @@ breeze-icons-git
gnome-icon-theme
gnome-themes-standard
#gtk-theme-breath
>extra oxygen-git
>extra oxygen-icons-git
oxygen-git
oxygen-icons-git
#plasma5-themes-breath # Default
#sddm-breath-theme # Default
grub-theme-manjaro
@ -256,15 +257,14 @@ inxi
#>extra libreoffice-fresh
>extra calligra
#manjaro-hello
#manjaro-settings-manager-kcm
#manjaro-settings-manager-knotifier
manjaro-settings-manager-kcm
manjaro-settings-manager-knotifier
powertop
#>extra qbittorrent
screenfetch
systemd-kcm
#>extra thunderbird
vlc
#vlc-nightly
yakuake
## Optional dependencis for cantata

View File

@ -1,4 +1,4 @@
calamares-git
calamares
>manjaro grub-theme-live-manjaro
gsmartcontrol
#manjaro-architect

View File

@ -123,7 +123,6 @@ manjaro-application-utility
>extra splix
## Optional dependencies for hplip
>extra pyqt5-common
>extra python-pillow
>extra python-pip
>extra python-pyqt5

View File

@ -127,7 +127,7 @@ plasma-settings # Settings application and modules.
plasma-camera # Camera application.
marble # Maps application.
koko # Gallery application.
#vvave # Music player.
vvave # Music player.
okular # Document Viewer.
#discover # Software Center.
plasma-angelfish # Webbrowser for phones.
@ -139,7 +139,7 @@ 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.
plasma-pix # Maui Image Gallery.
#qrca # QR Code scanner.
keysmith # OTP client.
plasma-nano

View File

@ -6,7 +6,7 @@ Relogin=false
Session=plasma-mobile.desktop
# Username for autologin session
User=manjaro
# User=manjaro
[General]
# Halt command

View File

@ -108,7 +108,6 @@ pamac
>extra system-config-printer
## Optional dependencies for hplip
>extra pyqt5-common # For hplip
>extra python-pillow # For hplip
>extra python-pip # For hplip
>extra python-pyqt5 # For hplip gui

View File

@ -114,7 +114,6 @@ pamac-tray-appindicator
>extra system-config-printer
## Optional dependencies for hplip
>extra pyqt5-common
>extra python-pillow
>extra python-pip
>extra python-pyqt5

View File

@ -102,7 +102,6 @@ flatpak
>extra system-config-printer
## Optional dependencies for hplip
>extra pyqt5-common # For hplip
>extra python-pillow # For hplip
>extra python-pip # For hplip
>extra python-pyqt5 # For hplip gui

View File

@ -123,7 +123,6 @@ manjaro-application-utility
>extra splix
## Optional dependencies for hplip
>extra pyqt5-common
>extra python-pillow
>extra python-pip
>extra python-pyqt5

View File

@ -21,6 +21,8 @@ extra="true"
# unset defaults to given value
# efi_boot_loader="grub"
custom_boot_args="'acpi_osi='"
# configure calamares for mhwd
mhwd_used="false"

View File

@ -101,7 +101,6 @@ bauh
>extra system-config-printer
## Optional dependencies for hplip
>extra pyqt5-common # For hplip
>extra python-pillow # For hplip
>extra python-pip # For hplip
>extra python-pyqt5 # For hplip gui
@ -176,6 +175,7 @@ xfce4-whiskermenu-plugin
xfce4-xkb-plugin
xfce4-pulseaudio-plugin
pavucontrol
xcape
## Themes
>extra manjaro-wallpapers-18.0

View File

@ -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"

View File

@ -21,6 +21,8 @@ extra="true"
# unset defaults to given value
# efi_boot_loader="grub"
custom_boot_args="'acpi_osi='"
# configure calamares for mhwd
mhwd_used="false"

View File

@ -123,7 +123,6 @@ manjaro-application-utility
>extra splix
## Optional dependencies for hplip
>extra pyqt5-common
>extra python-pillow
>extra python-pip
>extra python-pyqt5

View File

@ -101,7 +101,6 @@ bauh
>extra system-config-printer
## Optional dependencies for hplip
>extra pyqt5-common # For hplip
>extra python-pillow # For hplip
>extra python-pip # For hplip
>extra python-pyqt5 # For hplip gui
@ -176,6 +175,7 @@ xfce4-whiskermenu-plugin
xfce4-xkb-plugin
xfce4-pulseaudio-plugin
pavucontrol
xcape
## Themes
>extra manjaro-wallpapers-18.0

View File

@ -105,7 +105,6 @@ pamac
>extra system-config-printer
## Optional dependencies for hplip
>extra pyqt5-common # For hplip
>extra python-pillow # For hplip
>extra python-pip # For hplip
>extra python-pyqt5 # For hplip gui