aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-05-19 13:22:22 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2017-05-19 13:22:22 +0200
commitb421b06686607c0fa13ec0ce99b33d1c9fc728e7 (patch)
treed51648b99883715caa8a634f00ab87126705147b
parent00220edef758a75306e51f38db71adb83fec2c44 (diff)
downloadalpine-conf-b421b06686607c0fa13ec0ce99b33d1c9fc728e7.tar.bz2
alpine-conf-b421b06686607c0fa13ec0ce99b33d1c9fc728e7.tar.xz
setup-xorg-base: use libinput and modesetting
also try figure out a good video driver from lspci outout
-rw-r--r--setup-xorg-base.in20
1 files changed, 12 insertions, 8 deletions
diff --git a/setup-xorg-base.in b/setup-xorg-base.in
index b7c6bc0..9d50ebe 100644
--- a/setup-xorg-base.in
+++ b/setup-xorg-base.in
@@ -3,18 +3,22 @@
# simple script to setup x basic org server
# you will still need a window manager and login manager or xinit
-base_pkgs="xorg-server xf86-video-vesa xf86-video-modesetting
- xf86-input-evdev xf86-input-mouse xf86-input-keyboard udev"
+base_pkgs="xorg-server xf86-input-libinput eudev"
-# TODO: detect graphics card and pick proper xf86-video-* driver based on that
+apk add pciutils
+vgaline=$(lspci | grep -w VGA)
-# TODO: detect if we need xf86-input-synaptics
+case "$vgaline" in
+*Intel*) videodrv="xf86-video-intel";;
+*AMD*) videodrv="xf86-video-amdgpu";;
+*NVIDIA*) videodrv="xf86-video-nouveau";;
+*VMware*) videodrv="xf86-video-vmware";;
+esac
-# ps mouse
-modprobe psmouse
-grep -q -w psmouse /etc/modules || echo "psmouse" >> /etc/modules
+# fallback driver
+videodrv="$videodrv xf86-video-modesetting"
# install packages
-apk add $base_pkgs $@
+apk add $base_pkgs $videodrv $@
setup-udev