Make the startup script segregate commands for different hosts.

3 files changed, 28 insertions, 16 deletions

diff --git a/src/Internal/Keys.hs b/src/Internal/Keys.hs
index c385539..91d033d 100644
--- a/src/Internal/Keys.hs
+++ b/src/Internal/Keys.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE RankNTypes #-}
 module Internal.Keys where
 
+import Graphics.X11.ExtraTypes.XorgDefault
 import System.Process
 import XMonad.Util.Ungrab
 import Internal.XPlus
diff --git a/startup b/startup
index 7383d00..5c59e4d 100755
--- a/startup
+++ b/startup
@@ -1,24 +1,35 @@
 #!/bin/bash
 
-# Switch the displays around because the default state is for them to be reversed.
-xrandr --output DP-2 --left-of DVI-I-1 --mode 2560x1440
 
-# Change the background image using 'feh'
-feh --bg-scale "$HOME/.xmonad/wallpaper.jpg"
+common
 
-# Increase the kebyoard repeat rate and decrease the repeat time.
-xset r rate 200 60
+hostname_fn="hostname_$(hostname)"
 
-# Run the screensaver so I can lock it.
-nohup xscreensaver -no-splash & > /dev/null
+if [[ typeset -f "$hostname_fn" ]] ; then
+  "$hostname_fn" 
+fi
 
-# Run a compositer to make things a little prettier.
+common() {
+  # Startup commands common to all the hosts.
+  xsetroot -cursor_name left_ptr
+  xset r rate 200 60
+}
 
-if [ ! -z "$(ps aux | grep compton | grep -v grep)" ] ; then
-  killall compton
-fi
+hostname_rahm1() {
+  # Startup commands specific to my worktop.
+
+  xinput set-prop "TPPS/2 Elan TrackPoint" "Coordinate Transformation Matrix" 3 0 0 0 3 0 0 0 1
+  xinput set-prop "SYNA8004:00 06CB:CD8B Touchpad" "Coordinate Transformation Matrix" 3 0 0 0 3 0 0 0 1
+
+  feh --bg-scale "/home/rahm/.xmonad/assets/Death-Valley-desert-USA_3840x2160.jpg"
+}
 
-nohup compton --backend glx & > /dev/null
+hostname_photon() {
+  # Startup commands specific to my desktop.
 
-# Set the cursor to not be a big X
-xsetroot -cursor_name left_ptr
+  if [ ! -z "$(ps aux | grep compton | grep -v grep)" ] ; then
+    nohup compton --backend glx & > /dev/null
+  fi
+  xrandr --output DVI-I-1 --right-of DP-5 --mode 2560x1440
+  feh --bg-scale "/home/rahm/.xmonad/wallpaper.jpg"
+}
diff --git a/xmobarrc b/xmobarrc
index 64c90ce..9c0b7f8 100644
--- a/xmobarrc
+++ b/xmobarrc
@@ -1,5 +1,5 @@
 Config
-   { font = "xft:Ubuntu Mono:size=14"
+   { font = "xft:Ubuntu Mono:size=20"
    , additionalFonts = ["xft:Lato:style=bold"]        -- default: []
    , borderColor = "#ffd9bf"
    , border = BottomB