From 0f7dc40eff37096e23dff3a672096e4d054a10ff Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Thu, 31 Dec 2020 00:54:56 +0000 Subject: [PATCH] xinitrc: Add NetBSD-specific part, switch to tcwm --- xinitrc | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/xinitrc b/xinitrc index 803fdbf..36c5326 100644 --- a/xinitrc +++ b/xinitrc @@ -1,10 +1,19 @@ -xset fp+ /usr/local/share/fonts/terminus -xset fp+ /usr/local/share/fonts/mscorefont -xset fp+ /usr/local/share/fonts/noto +if [ "$(uname)" = "NetBSD" ]; then + echo "EXECUTING" >/tmp/foo + xset fp+ /usr/pkg/share/fonts/X11/misc +elif [ "$(uname)" = "OpenBSD" ]; then + xset fp+ /usr/local/share/fonts/terminus + xset fp+ /usr/local/share/fonts/mscorefont + xset fp+ /usr/local/share/fonts/noto + + xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1 + xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Button" 2 + xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Axes" 7 6 5 4 +fi + xmodmap "$HOME/.Xmodmap" -xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1 -xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Button" 2 -xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Axes" 7 6 5 4 -export GNUSTEP_USER_ROOT="$HOME/.gnustep" -xidle -program "/usr/X11R6/bin/xlock -usefirst" -timeout 300 & -exec dbus-launch ssh-agent wmaker +if type -q xidle && type -q xlock; then + xidle -program "$(which xlock) -usefirst" -timeout 300 & +fi + +exec ssh-agent ctwm -W