From 8e4e193460e2b9c1197713d75ec2a02ffef779c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 28 Jul 2019 19:36:36 +0200 Subject: [PATCH 1/4] [shared] disable catalyst --- manjaro/xfce/Packages-Desktop | 12 ++++++++---- shared/Packages-Mhwd | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 81a8266..a1acbef 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -210,8 +210,8 @@ htop qpdfview inxi #>extra libreoffice-still -#ms-office-online -freeoffice +#microsoft-office-online-jak +>extra freeoffice manjaro-hello manjaro-application-utility manjaro-settings-manager @@ -278,5 +278,9 @@ xdg-su gtkhash-thunar manjaro-hotfixes -## Workarounds -boost-libs # needed to fix systemd-journal on live-boot +## Handshake tools +#faucet-tool +#hnsd-git +#hsd-git +#veracrypt +#cryptoseed diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd index 56f360c..3d1cfba 100644 --- a/shared/Packages-Mhwd +++ b/shared/Packages-Mhwd @@ -16,15 +16,15 @@ mesa-vdpau >multilib lib32-mesa-vdpau >multilib lib32-libxvmc >multilib lib32-primus ->nonfree_default catalyst-utils ->nonfree_default KERNEL-catalyst +#>nonfree_default catalyst-utils +#>nonfree_default KERNEL-catalyst >nonfree_default KERNEL-nvidia >nonfree_default KERNEL-nvidia-340xx >nonfree_default KERNEL-nvidia-390xx >nonfree_default nvidia-340xx-utils >nonfree_default nvidia-390xx-utils >nonfree_default nvidia-utils ->nonfree_multilib lib32-catalyst-utils +#>nonfree_multilib lib32-catalyst-utils >nonfree_multilib lib32-nvidia-utils >nonfree_multilib lib32-nvidia-340xx-utils >nonfree_multilib lib32-nvidia-390xx-utils From 38f1c865efb9fc6d8d7fb0a9b3b2bc60a8f5b141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Mon, 29 Jul 2019 07:51:10 +0200 Subject: [PATCH 2/4] [profiles] use fpakman for snap and flatpak --- manjaro/gnome/Packages-Desktop | 8 +++++--- manjaro/kde/Packages-Desktop | 14 ++++++++------ manjaro/xfce/Packages-Desktop | 10 ++++++---- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 9cd06e8..ef9fb97 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -101,9 +101,11 @@ networkmanager-vpnc nss-mdns numlockx openresolv -gnome-software-snap -pamac +#gnome-software-snap flatpak +fpakman +pamac +snapd polkit-gnome powertop pulseaudio-bluetooth @@ -147,7 +149,7 @@ xorg-xinit >extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. ) yelp -#ms-office-online +ms-office-online freeoffice #extra depends for file-roller diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 3c0cde1..16403c2 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -91,16 +91,18 @@ terminus-font >extra steam-manjaro ## Package management -appimagelauncher -pamac-cli -packagekit-qt5 +#appimagelauncher +pamac +#pamac-cli apparmor snapd -discover-snap +#discover-snap #discover -#flatpak +#packagekit-qt5 +flatpak +fpakman fwupd -octopi +#octopi #octopi-cachecleaner #octopi-repoeditor #octopi-notifier-frameworks diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index a1acbef..f1d8117 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -82,10 +82,12 @@ ttf-bitstream-vera # xfce4-terminal default Monospace >extra steam-manjaro ## Package management -gnome-software-snap -pamac -flatpak apparmor +#gnome-software-snap +flatpak +fpakman +pamac +snapd ## Java >extra jdk8-openjdk @@ -210,7 +212,7 @@ htop qpdfview inxi #>extra libreoffice-still -#microsoft-office-online-jak +microsoft-office-online-jak >extra freeoffice manjaro-hello manjaro-application-utility From 9074df4aeba1ee710e93e3daa7b2a179e87e701a Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Mon, 29 Jul 2019 21:13:58 +0200 Subject: [PATCH 3/4] [Cinnamon] prepare 18.1 --- community/cinnamon/Packages-Desktop | 8 ++++++-- community/cinnamon/profile.conf | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop index a4f2057..d6ca24b 100644 --- a/community/cinnamon/Packages-Desktop +++ b/community/cinnamon/Packages-Desktop @@ -1,6 +1,7 @@ adapta-maia-theme alsa-firmware alsa-utils +apparmor autoconf automake avahi @@ -18,7 +19,10 @@ dmidecode fakeroot >extra ffmpegthumbnailer >extra firefox +flatpak flex +fpakman +>extra freeoffice >extra galculator >extra gcc >extra >multilib gcc-libs-multilib @@ -57,7 +61,6 @@ inxi libtool >extra libdvdcss >extra libgsf ->extra libreoffice-fresh lightdm-settings lightdm-slick-greeter m4 @@ -116,6 +119,7 @@ python2-ptyprocess python-ptyprocess qt5-styleplugins screenfetch +snapd >extra subversion >extra system-config-printer >extra terminus-font @@ -130,7 +134,6 @@ ttf-bitstream-vera >extra ttf-liberation >extra udiskie vi ->extra vlc >extra xcursor-chameleon-pearl-deepin xdg-su xdg-user-dirs-gtk @@ -144,6 +147,7 @@ xf86-input-mouse xf86-input-void xorg-twm xorg-xinit +>extra xplayer >extra xreader >extra xviewer-plugins xdg-user-dirs diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf index 4b91012..f2d3171 100644 --- a/community/cinnamon/profile.conf +++ b/community/cinnamon/profile.conf @@ -31,9 +31,16 @@ 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' 'ufw') +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd') disable_systemd=('pacman-init') +# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store" +strict_snaps="snapd core18 snap-store core gnome-3-28-1804 gtk-common-themes" +# add classic snaps: classic_snaps="code" +# classic_snaps="" +# choose the snap channel. Possible options are: stable, candidate, beta, edge +# snap_channel="stable" + # unset defaults to given values # addgroups="lp,network,power,wheel" From a64f77a11e8e1f017fcbba1fd46cc135259cfbb0 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Mon, 29 Jul 2019 21:20:40 +0200 Subject: [PATCH 4/4] [Cinnamon] add yelp --- community/cinnamon/Packages-Desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop index 5765f1a..8e190b8 100644 --- a/community/cinnamon/Packages-Desktop +++ b/community/cinnamon/Packages-Desktop @@ -154,4 +154,5 @@ xorg-server xorg-xhost xorg-xkill >extra yay +yelp zensu