From 8baf85ecc3577f601b1e5d8221eef926a3df10b3 Mon Sep 17 00:00:00 2001 From: Stefano Capitani Date: Thu, 28 May 2020 22:16:40 +0200 Subject: [PATCH 1/5] Removed manjaro-gdm-tweak https://forum.manjaro.org/t/user-120-service-failed/145070 if needed users can self install Signed-off-by: Stefano Capitani --- manjaro/gnome/Packages-Desktop | 1 - 1 file changed, 1 deletion(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 4a2a1119..037c6785 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -13,7 +13,6 @@ evince >extra firefox-gnome-theme-maia >extra rygel gdm -manjaro-gdm-tweak manjaro-gdm-theme gedit gtksourceview-pkgbuild #highlight for PKGBUILD From a1d97eb236157845cd1fa66bb6de42b85de96521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 30 May 2020 11:45:50 +0200 Subject: [PATCH 2/5] Revert "[nxd] pdemo apps 1" This reverts commit 9facbc54b2ff27f2e640ab657a74e10275be2b2f. --- manjaro/nxd/Packages-Desktop | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/manjaro/nxd/Packages-Desktop b/manjaro/nxd/Packages-Desktop index 6b6bb5f3..7da3598c 100644 --- a/manjaro/nxd/Packages-Desktop +++ b/manjaro/nxd/Packages-Desktop @@ -92,7 +92,6 @@ terminus-font ## Package management #appimagelauncher -bauh pamac pamac-tray-appindicator pamac-cli @@ -100,7 +99,6 @@ pamac-cli >extra snapd >extra snapd-glib >extra pamac-snap-plugin ->extra pamac-flatpak-plugin #discover-snap #discover #packagekit-qt5 @@ -194,16 +192,6 @@ plasma-nota #nx-appimages startup-notification # needed for waterfox -## Extra Demo Apps -obs-studio -signal-desktop -telegram-desktop -microsoft-office-web-jak -skype-web-jak -slack-web-jak -onlyoffice-desktopeditors -elisa - ## Themes QT/GTK/SDDM #breeze #breeze-gtk @@ -303,13 +291,13 @@ dmidecode # for inxi -m output htop #imagewriter inxi ->extra krita ->extra firefox +#>extra krita +#>extra firefox #>basic falkon #ms-office-online #>extra freeoffice #>extra libreoffice-still ->extra calligra +#>extra calligra #manjaro-hello manjaro-settings-manager-kcm manjaro-settings-manager-knotifier @@ -317,9 +305,9 @@ powertop #>extra qbittorrent #screenfetch systemd-kcm ->extra thunderbird ->extra vlc -#vlcy +#>extra thunderbird +#>extra vlc +#vlc-nightly #yakuake ## Optional dependencis for cantata From 955a40730293970f2be9feaed597b89a346942d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 30 May 2020 11:41:04 +0200 Subject: [PATCH 3/5] [prepare] 20.0.2 - remove xdg-su - disable steam due to vulkan-driver dependency --- manjaro/gnome/Packages-Desktop | 3 +-- manjaro/kde/Packages-Desktop | 2 +- manjaro/nxd/Packages-Desktop | 7 ++++++- manjaro/xfce/Packages-Desktop | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 037c6785..3712a69d 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -144,7 +144,6 @@ ttf-indic-otf ttf-liberation usb_modeswitch >extra vino -xdg-su xdg-user-dirs xdg-user-dirs-gtk xdg-utils @@ -178,7 +177,7 @@ xorg-xinit #>extra jre8-openjdk #>extra jre8-openjdk-headless >extra libdvdcss ->x86_64 >extra steam-manjaro +#>x86_64 >extra steam-manjaro >extra manjaro-printer >extra simple-scan >extra ffmpegthumbnailer diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 2818b8bc..23c7a1b6 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -87,7 +87,7 @@ terminus-font >extra ttf-droid ## Games ->x86_64 >extra steam-manjaro +#>x86_64 >extra steam-manjaro ## Package management >extra appimagelauncher diff --git a/manjaro/nxd/Packages-Desktop b/manjaro/nxd/Packages-Desktop index 7da3598c..45450123 100644 --- a/manjaro/nxd/Packages-Desktop +++ b/manjaro/nxd/Packages-Desktop @@ -92,7 +92,12 @@ terminus-font ## Package management #appimagelauncher +<<<<<<< HEAD pamac +======= +bauh +pamac-gtk +>>>>>>> ce5f3cd... [prepare] 20.0.2 pamac-tray-appindicator pamac-cli >extra apparmor @@ -351,7 +356,7 @@ xorg-xkill ## Desktop Utils perl-file-mimeinfo xdg-utils -xdg-su +#xdg-su >extra timeshift >extra kernel-alive diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index d5b057df..e0d20e71 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -79,7 +79,7 @@ ttf-bitstream-vera # xfce4-terminal default Monospace >extra ttf-droid ## Games ->x86_64 >extra steam-manjaro +#>x86_64 >extra steam-manjaro ## Package management >extra apparmor From 134267e6806bd0b9cbacae54d763b73c7f65fa85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 30 May 2020 11:49:37 +0200 Subject: [PATCH 4/5] [nxd] fix merge conflict --- manjaro/nxd/Packages-Desktop | 5 ----- 1 file changed, 5 deletions(-) diff --git a/manjaro/nxd/Packages-Desktop b/manjaro/nxd/Packages-Desktop index 45450123..63c60575 100644 --- a/manjaro/nxd/Packages-Desktop +++ b/manjaro/nxd/Packages-Desktop @@ -92,12 +92,7 @@ terminus-font ## Package management #appimagelauncher -<<<<<<< HEAD -pamac -======= -bauh pamac-gtk ->>>>>>> ce5f3cd... [prepare] 20.0.2 pamac-tray-appindicator pamac-cli >extra apparmor From 3af4486c8e4695c613d92f707b48a494f2b2e534 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Mon, 1 Jun 2020 12:27:37 +0200 Subject: [PATCH 5/5] i3 20.0.2 --- community/i3/Packages-Desktop | 2 -- community/i3/profile.conf | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop index d85e78ea..5a3c7306 100644 --- a/community/i3/Packages-Desktop +++ b/community/i3/Packages-Desktop @@ -98,7 +98,6 @@ networkmanager-pptp networkmanager-vpnc nss-mdns ntp -open-fuse-iso openresolv openssh p7zip @@ -146,7 +145,6 @@ wmutils xautolock >extra xcursor-chameleon-pearl >extra xcursor-maia -xdg-su xdg-utils xdotool xf86-input-elographics diff --git a/community/i3/profile.conf b/community/i3/profile.conf index cf1e5fd5..b5256e9b 100644 --- a/community/i3/profile.conf +++ b/community/i3/profile.conf @@ -31,7 +31,7 @@ nonfree_mhwd="true" # 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' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd' 'fstrim.timer') disable_systemd=('pacman-init') # add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"