a bunch of changes

2021-01-06 01:30:19 +01:00
parent c4de8885ed
commit 8c0693f810
4 changed files with 20 additions and 33 deletions
--- a/shared/Packages-Live
+++ b/shared/Packages-Live
@ -1,4 +1,4 @@
-calamares-git
+calamares
 gsmartcontrol
 manjaro-architect
 manjaro-live-skel
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@ -21,18 +21,12 @@ mesa-vdpau
 >multilib lib32-mesa-vdpau
 >multilib lib32-libxvmc
 >multilib lib32-primus
-#>nonfree_default catalyst-utils
-#>nonfree_default KERNEL-catalyst
-#>nonfree_default KERNEL-nvidia-340xx
-#>nonfree_default KERNEL-nvidia-390xx
-#>nonfree_x86_64 KERNEL-nvidia-455xx
-#>nonfree_default nvidia-340xx-utils
-#>nonfree_default nvidia-390xx-utils
-#>nonfree_x86_64 nvidia-455xx-utils
-#>nonfree_multilib lib32-catalyst-utils
-#>nonfree_multilib lib32-nvidia-455xx-utils
-#>nonfree_multilib lib32-nvidia-340xx-utils
-#>nonfree_multilib lib32-nvidia-390xx-utils
+>nonfree_default KERNEL-nvidia-390xx
+>nonfree_x86_64 KERNEL-nvidia
+>nonfree_default nvidia-390xx-utils
+>nonfree_x86_64 nvidia-utils
+>nonfree_multilib lib32-nvidia-utils
+>nonfree_multilib lib32-nvidia-390xx-utils
 opencl-mesa
 open-vm-tools
 primus
--- a/shared/Packages-Root
+++ b/shared/Packages-Root
@ -1,5 +1,3 @@
-linux54-zfs
-
 #sonar sonar-release
 >i686 archlinux32-keyring
 >multilib gcc-libs-multilib
@ -51,6 +49,7 @@ man-db
 man-pages
 manjaro-firmware
 manjaro-system
+manjaro-zsh-config
 mdadm
 memtest86+
 mhwd