summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rwxr-xr-xx11/Xresources (renamed from x11/Xresources.T495)0
-rwxr-xr-xx11/xprofile5
-rwxr-xr-xx11/xprofile.hp-envy-office6
3 files changed, 9 insertions, 2 deletions
diff --git a/x11/Xresources.T495 b/x11/Xresources
index 93dbf48..93dbf48 100755
--- a/x11/Xresources.T495
+++ b/x11/Xresources
diff --git a/x11/xprofile b/x11/xprofile
index 9560f3a..af4895c 100755
--- a/x11/xprofile
+++ b/x11/xprofile
@@ -1,5 +1,8 @@
#!/bin/sh
-xrdb -merge $X11CONFIG/Xresources -merge $X11CONFIG/Xresources.$(hostname) 2>/dev/null & xrdbpid=$!
+# TODO make nicer
+XRESOURCES=$X11CONFIG/Xresources.$(hostname); [ -f "$XRESOURCES" ] || XRESOURCES=$X11CONFIG/Xresources
+#xrdb -merge $X11CONFIG/Xresources -merge $X11CONFIG/Xresources.$(hostname) 2>/dev/null & xrdbpid=$!
+xrdb -merge $XRESOURCES 2>/dev/null & xrdbpid=$!
redshift &
unclutter -noevents &
xkeyconf &
diff --git a/x11/xprofile.hp-envy-office b/x11/xprofile.hp-envy-office
index fca8ecd..4236f3c 100755
--- a/x11/xprofile.hp-envy-office
+++ b/x11/xprofile.hp-envy-office
@@ -1,4 +1,8 @@
#!/bin/sh
-xinput set-prop "pointer:Unicomp Inc Unicomp 10x Kbrd R7_2_w_PS_R7_38" "libinput Accel Speed" 1 # make trackpoint accelerate more
+xrdb -merge $X11CONFIG/Xresources.desktop 2>/dev/null & xrdbpid=$!
+
+# set options for unicomp pointer
xinput set-prop "pointer:Unicomp Inc Unicomp 10x Kbrd R7_2_w_PS_R7_38" "libinput Scroll Method Enabled" 0 0 1 # enable scroll while holding left + right mouse
xinput set-prop "pointer:Unicomp Inc Unicomp 10x Kbrd R7_2_w_PS_R7_38" "Coordinate Transformation Matrix" 2.5 0 0 0 2.5 0 0 0 1 # speed up trackpoint
+
+wait $xrdbpid # wait for xrdb like in base xprofile