From 068c47a4ec1dbbca87a1e8aad9aa635224bdaa7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 11 Dec 2019 15:55:08 +0100 Subject: [PATCH 1/5] [kde] update mobile and vanilla --- manjaro/kde-vanilla/Packages-Desktop | 11 ++++++----- manjaro/kde-vanilla/Packages-Live | 2 +- manjaro/plasma-mobile/Packages-Desktop | 4 ++-- manjaro/plasma-mobile/desktop-overlay/etc/sddm.conf | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/manjaro/kde-vanilla/Packages-Desktop b/manjaro/kde-vanilla/Packages-Desktop index 60b6a39..a0f2033 100644 --- a/manjaro/kde-vanilla/Packages-Desktop +++ b/manjaro/kde-vanilla/Packages-Desktop @@ -97,6 +97,8 @@ flatpak xdg-desktop-portal xdg-desktop-portal-kde fwupd +pamac-cli +octopi ## Printing #>extra cups @@ -157,8 +159,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 +258,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 diff --git a/manjaro/kde-vanilla/Packages-Live b/manjaro/kde-vanilla/Packages-Live index df7f529..82f8ce2 100644 --- a/manjaro/kde-vanilla/Packages-Live +++ b/manjaro/kde-vanilla/Packages-Live @@ -1,4 +1,4 @@ -calamares-git +calamares >manjaro grub-theme-live-manjaro gsmartcontrol #manjaro-architect diff --git a/manjaro/plasma-mobile/Packages-Desktop b/manjaro/plasma-mobile/Packages-Desktop index 263783d..6b295f8 100644 --- a/manjaro/plasma-mobile/Packages-Desktop +++ b/manjaro/plasma-mobile/Packages-Desktop @@ -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 diff --git a/manjaro/plasma-mobile/desktop-overlay/etc/sddm.conf b/manjaro/plasma-mobile/desktop-overlay/etc/sddm.conf index 93d52a8..88e29b7 100644 --- a/manjaro/plasma-mobile/desktop-overlay/etc/sddm.conf +++ b/manjaro/plasma-mobile/desktop-overlay/etc/sddm.conf @@ -6,7 +6,7 @@ Relogin=false Session=plasma-mobile.desktop # Username for autologin session -User=manjaro +# User=manjaro [General] # Halt command From 4543c80e928a87e92d90a9aa188d323a7259e437 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Wed, 11 Dec 2019 17:48:56 +0100 Subject: [PATCH 2/5] infbook config acpi_osi= --- .../desktop-overlay/etc/default/grub | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 oem/infinitybook14-oem-xfce/desktop-overlay/etc/default/grub diff --git a/oem/infinitybook14-oem-xfce/desktop-overlay/etc/default/grub b/oem/infinitybook14-oem-xfce/desktop-overlay/etc/default/grub new file mode 100644 index 0000000..944fd54 --- /dev/null +++ b/oem/infinitybook14-oem-xfce/desktop-overlay/etc/default/grub @@ -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" From f6ce42d9080c7c4eca42c98afc09302833564e9b Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Sun, 15 Dec 2019 00:37:21 +0100 Subject: [PATCH 3/5] infinity add param 'acpi_osi=' --- oem/infinitybook14-oem-kde/profile.conf | 2 ++ oem/infinitybook14-oem-xfce/profile.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/oem/infinitybook14-oem-kde/profile.conf b/oem/infinitybook14-oem-kde/profile.conf index ae0f40f..ce0e918 100644 --- a/oem/infinitybook14-oem-kde/profile.conf +++ b/oem/infinitybook14-oem-kde/profile.conf @@ -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" diff --git a/oem/infinitybook14-oem-xfce/profile.conf b/oem/infinitybook14-oem-xfce/profile.conf index f054d76..6554558 100644 --- a/oem/infinitybook14-oem-xfce/profile.conf +++ b/oem/infinitybook14-oem-xfce/profile.conf @@ -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" From 7ee8e7faf7697578fde06bbcfd0f047626f9a36d Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Sun, 15 Dec 2019 00:59:13 +0100 Subject: [PATCH 4/5] infinity xfce add xcape --- oem/infinitybook14-oem-xfce/Packages-Desktop | 1 + oem/infinitybookpro-oem-xfce/Packages-Desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/oem/infinitybook14-oem-xfce/Packages-Desktop b/oem/infinitybook14-oem-xfce/Packages-Desktop index c46ba92..f2cb0a7 100644 --- a/oem/infinitybook14-oem-xfce/Packages-Desktop +++ b/oem/infinitybook14-oem-xfce/Packages-Desktop @@ -176,6 +176,7 @@ xfce4-whiskermenu-plugin xfce4-xkb-plugin xfce4-pulseaudio-plugin pavucontrol +xcape ## Themes >extra manjaro-wallpapers-18.0 diff --git a/oem/infinitybookpro-oem-xfce/Packages-Desktop b/oem/infinitybookpro-oem-xfce/Packages-Desktop index c0ee9e4..f46fd3f 100644 --- a/oem/infinitybookpro-oem-xfce/Packages-Desktop +++ b/oem/infinitybookpro-oem-xfce/Packages-Desktop @@ -176,6 +176,7 @@ xfce4-whiskermenu-plugin xfce4-xkb-plugin xfce4-pulseaudio-plugin pavucontrol +xcape ## Themes >extra manjaro-wallpapers-18.0 From aea625dae14496b312231b6aee2d54aa9577dcf5 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Sun, 15 Dec 2019 01:11:25 +0100 Subject: [PATCH 5/5] rm deprecated pyqt5-common --- community/awesome/Packages-Desktop | 1 - community/webdad/Packages-Desktop | 1 - manjaro/bladebook/Packages-Desktop | 1 - manjaro/kde-dev/Packages-Desktop | 1 - manjaro/kde-vanilla/Packages-Desktop | 1 - manjaro/kde/Packages-Desktop | 1 - manjaro/xfce/Packages-Desktop | 1 - oem/bladebook-oem-kde/Packages-Desktop | 1 - oem/bladebook-oem-xfce/Packages-Desktop | 1 - oem/infinitybook14-oem-kde/Packages-Desktop | 1 - oem/infinitybook14-oem-xfce/Packages-Desktop | 1 - oem/infinitybookpro-oem-kde/Packages-Desktop | 1 - oem/infinitybookpro-oem-xfce/Packages-Desktop | 1 - oem/spitfire-oem-xfce/Packages-Desktop | 1 - 14 files changed, 14 deletions(-) diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop index da025c1..417af85 100644 --- a/community/awesome/Packages-Desktop +++ b/community/awesome/Packages-Desktop @@ -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 diff --git a/community/webdad/Packages-Desktop b/community/webdad/Packages-Desktop index edd2193..1f3b6ee 100644 --- a/community/webdad/Packages-Desktop +++ b/community/webdad/Packages-Desktop @@ -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 diff --git a/manjaro/bladebook/Packages-Desktop b/manjaro/bladebook/Packages-Desktop index 2b9f8bd..b5b25d2 100644 --- a/manjaro/bladebook/Packages-Desktop +++ b/manjaro/bladebook/Packages-Desktop @@ -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 diff --git a/manjaro/kde-dev/Packages-Desktop b/manjaro/kde-dev/Packages-Desktop index 58386ab..d904abf 100644 --- a/manjaro/kde-dev/Packages-Desktop +++ b/manjaro/kde-dev/Packages-Desktop @@ -113,7 +113,6 @@ octopi >extra splix ## Optional dependencies for hplip ->extra pyqt5-common >extra python-pillow >extra python-pip >extra python-pyqt5 diff --git a/manjaro/kde-vanilla/Packages-Desktop b/manjaro/kde-vanilla/Packages-Desktop index a0f2033..94f706a 100644 --- a/manjaro/kde-vanilla/Packages-Desktop +++ b/manjaro/kde-vanilla/Packages-Desktop @@ -111,7 +111,6 @@ octopi #>extra splix ## Optional dependencies for hplip -#>extra pyqt5-common #>extra python-pillow #>extra python-pip #>extra python-pyqt5 diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 56b0a8f..fa1d1f3 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -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 diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index ce7b19f..e2d5e1a 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -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 diff --git a/oem/bladebook-oem-kde/Packages-Desktop b/oem/bladebook-oem-kde/Packages-Desktop index 24b3185..38f40f8 100644 --- a/oem/bladebook-oem-kde/Packages-Desktop +++ b/oem/bladebook-oem-kde/Packages-Desktop @@ -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 diff --git a/oem/bladebook-oem-xfce/Packages-Desktop b/oem/bladebook-oem-xfce/Packages-Desktop index 4da2f52..1b3f81c 100644 --- a/oem/bladebook-oem-xfce/Packages-Desktop +++ b/oem/bladebook-oem-xfce/Packages-Desktop @@ -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 diff --git a/oem/infinitybook14-oem-kde/Packages-Desktop b/oem/infinitybook14-oem-kde/Packages-Desktop index 0997c9a..88806f5 100644 --- a/oem/infinitybook14-oem-kde/Packages-Desktop +++ b/oem/infinitybook14-oem-kde/Packages-Desktop @@ -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 diff --git a/oem/infinitybook14-oem-xfce/Packages-Desktop b/oem/infinitybook14-oem-xfce/Packages-Desktop index f2cb0a7..24df52d 100644 --- a/oem/infinitybook14-oem-xfce/Packages-Desktop +++ b/oem/infinitybook14-oem-xfce/Packages-Desktop @@ -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 diff --git a/oem/infinitybookpro-oem-kde/Packages-Desktop b/oem/infinitybookpro-oem-kde/Packages-Desktop index 0a4d393..840f265 100644 --- a/oem/infinitybookpro-oem-kde/Packages-Desktop +++ b/oem/infinitybookpro-oem-kde/Packages-Desktop @@ -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 diff --git a/oem/infinitybookpro-oem-xfce/Packages-Desktop b/oem/infinitybookpro-oem-xfce/Packages-Desktop index f46fd3f..6018367 100644 --- a/oem/infinitybookpro-oem-xfce/Packages-Desktop +++ b/oem/infinitybookpro-oem-xfce/Packages-Desktop @@ -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 diff --git a/oem/spitfire-oem-xfce/Packages-Desktop b/oem/spitfire-oem-xfce/Packages-Desktop index bef5bf9..638f906 100644 --- a/oem/spitfire-oem-xfce/Packages-Desktop +++ b/oem/spitfire-oem-xfce/Packages-Desktop @@ -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