x11-drivers/nvidia-drivers: merge with upstream and remove unneeded files