From d54fe3e9717501c0bb79998aea2a25b62d3b8032 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sun, 03 Jun 2018 15:30:55 -0400
Subject: .fluxbox/startup: Move some WM-agnostic commands to .xinitrc

---
diff --git a/.fluxbox/startup b/.fluxbox/startup
index 946c5cf..3569b03 100755
--- a/.fluxbox/startup
+++ b/.fluxbox/startup
@@ -2,14 +2,6 @@
 
 set -eu
 
-xmodmap "${HOME}/.Xmodmap"
-export GTK_IM_MODULE='xim'
-export QT_IM_MODULE='xim'
-xinput set-prop 'TPPS/2 IBM TrackPoint' 'Evdev Wheel Emulation' 1
-xinput set-prop 'TPPS/2 IBM TrackPoint' 'Evdev Wheel Emulation Button' 2
-xinput set-prop 'TPPS/2 IBM TrackPoint' 'Evdev Wheel Emulation Timeout' 200
-xinput set-prop 'TPPS/2 IBM TrackPoint' 'Evdev Wheel Emulation Axes' 6 7 4 5
-
 fluxbox &
 
 while ! wmctrl -m 1>/dev/null 2>&1; do
@@ -22,5 +14,3 @@ dunst &
 clipit &
 redshift-gtk -c "${HOME}/.redshift.conf" &
 connman-gtk --tray &
-
-xscreensaver &
diff --git a/.xinitrc b/.xinitrc
index 376fc08..7bfeeb9 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -9,8 +9,18 @@ mkdir -p ~/.local/share/mpd/
 mkdir -p ~/music/library/ ~/music/playlists/
 mpd
 
+xmodmap "${HOME}/.Xmodmap"
+export GTK_IM_MODULE='xim'
+export QT_IM_MODULE='xim'
+xinput set-prop 'TPPS/2 IBM TrackPoint' 'Evdev Wheel Emulation' 1
+xinput set-prop 'TPPS/2 IBM TrackPoint' 'Evdev Wheel Emulation Button' 2
+xinput set-prop 'TPPS/2 IBM TrackPoint' 'Evdev Wheel Emulation Timeout' 200
+xinput set-prop 'TPPS/2 IBM TrackPoint' 'Evdev Wheel Emulation Axes' 6 7 4 5
+
 startfluxbox
 
+xscreensaver &
+
 rm -f ~/.xsessionmanage
 mkfifo -m 0600 ~/.xsessionmanage
 while read action; do
--
cgit v0.9.1