From 7c2f9b629554db0d358b2038d852c7f2f7b21fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Fri, 11 Oct 2019 13:57:36 +0200 Subject: [PATCH 1/2] [manjaro/oem] small adjustments --- manjaro/gnome/Packages-Desktop | 2 +- manjaro/kde/Packages-Desktop | 4 ++-- manjaro/xfce/Packages-Desktop | 2 +- .../usr/share/calamares/branding/manjaro/branding.desc | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 53482c9..d8802ed 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -106,7 +106,7 @@ openresolv pamac >extra snapd >extra snapd-glib -#>extra pamac-snap-plugin +>extra pamac-snap-plugin polkit-gnome powertop pulseaudio-bluetooth diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 6948c71..f70fcca 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -94,11 +94,11 @@ terminus-font #appimagelauncher pamac pamac-tray-appindicator -#pamac-cli +pamac-cli >extra apparmor >extra snapd >extra snapd-glib -#>extra pamac-snap-plugin +>extra pamac-snap-plugin #discover-snap #discover #packagekit-qt5 diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 400c0f2..f56956a 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -89,7 +89,7 @@ ttf-bitstream-vera # xfce4-terminal default Monospace pamac >extra snapd >extra snapd-glib -#>extra pamac-snap-plugin +>extra pamac-snap-plugin ## Java >extra jdk8-openjdk diff --git a/shared/oem/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/shared/oem/live-overlay/usr/share/calamares/branding/manjaro/branding.desc index 98cef27..1679da7 100644 --- a/shared/oem/live-overlay/usr/share/calamares/branding/manjaro/branding.desc +++ b/shared/oem/live-overlay/usr/share/calamares/branding/manjaro/branding.desc @@ -4,10 +4,10 @@ componentName: manjaro strings: productName: Manjaro Linux shortProductName: Manjaro - version: 18 OEM - shortVersion: 18 OEM - versionedName: Manjaro Linux 18 "Illyria" OEM - shortVersionedName: Manjaro 18 OEM + version: 18.1 OEM + shortVersion: 18.1 OEM + versionedName: Manjaro Linux 18.1 "Juhraya" OEM + shortVersionedName: Manjaro 18.1 OEM bootloaderEntryName: Manjaro images: From c0be3eccd85e9d5fa7fdae8d5cb4db9c35a5b634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 22 Oct 2019 13:39:05 +0200 Subject: [PATCH 2/2] [KDE] add oxygen by default - see also https://gitlab.manjaro.org/profiles-and-settings/iso-profiles/issues/139 --- manjaro/kde-dev/Packages-Desktop | 2 +- manjaro/kde/Packages-Desktop | 6 ++++-- manjaro/xfce/Packages-Desktop | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/manjaro/kde-dev/Packages-Desktop b/manjaro/kde-dev/Packages-Desktop index c565226..58386ab 100644 --- a/manjaro/kde-dev/Packages-Desktop +++ b/manjaro/kde-dev/Packages-Desktop @@ -99,7 +99,7 @@ octopi #octopi-cachecleaner #octopi-repoeditor #octopi-notifier-frameworks -pamac-qt +#pamac-qt #manjaro-application-utility ## Printing diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index f70fcca..56b0a8f 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -169,8 +169,8 @@ user-manager gnome-icon-theme gnome-themes-standard gtk-theme-breath -#>extra oxygen -#>extra oxygen-icons +oxygen # needed to provide KDE system sounds +oxygen-icons plasma5-themes-breath # Default sddm-breath-theme # Default grub-theme-manjaro @@ -325,6 +325,8 @@ xorg-xkill perl-file-mimeinfo xdg-utils xdg-su +>extra timeshift +>extra kernel-alive ## Misc manjaro-hotfixes diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index f56956a..ce7b19f 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -274,6 +274,8 @@ xorg-xkill perl-file-mimeinfo xdg-utils xdg-su +>extra timeshift +>extra kernel-alive ## Misc gtkhash-thunar