X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=0546ebfcdc8327150247cc01e398c0390765899e;hb=b28b7f5e03078286af4f00e3ff7e5f4158e61975;hp=f218e36333b5a0bddb0a6f78303aae027ddaa3bb;hpb=0ecccc64a36eef486719d85644e77b73a0585e67;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index f218e36..0546ebf 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,27 +21,24 @@ fi
 
 # Set keyboard layout
 case $HOSTNAME in
-    palladium|platinum|iridium)
-	setxkbmap -variant colemak gb
-	xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
-	xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
-	xmodmap -e "add Control = Control_L Control_R"
-	;;
-    beryllium|magnesium)
-	setxkbmap -variant colemak us
-	xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
-	xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
-	xmodmap -e "add Control = Control_L Control_R"
-	;;
-    *)
-        ;;
+  platinum)
+    setxkbmap -variant colemak gb
+    xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
+    xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
+    xmodmap -e "add Control = Control_L Control_R"
+    ;;
+  magnesium)
+    setxkbmap -variant colemak us
+    xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
+    xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
+    xmodmap -e "add Control = Control_L Control_R"
+    ;;
+  *)
+    ;;
 esac
 
 # Set screen layout
 case $HOSTNAME in
-  beryllium)
-    xrandr --output HDMI-1 --left-of DVI-I-1 
-    ;;
   magnesium)
     xrandr --output VGA1 --right-of HDMI2
     ;;
@@ -58,31 +55,20 @@ feh --bg-scale ~/Pictures/background.jpg&
 
 xset -b
 
-#if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
-#    eval $(gpg-agent --daemon \
-  #		     --use-standard-socket \
-  #		     --write-env-file "${HOME}/.gpg-agent-info")
-#fi
-#
-#gpg-connect-agent updatestartuptty /bye >/dev/null
-
 # Battery monitoring
 case $HOSTNAME in
-	palladium)
-		xbattmon&
-		;;
-	iridium|platinum)
-		~/.local/bin/bat_mgt.sh&
-		;;
-	*)
-                ;;
+  platinum)
+    ~/.local/bin/bat_mgt.sh&
+    ;;
+  *)
+    ;;
 esac
 
 cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
 
 # run xcreensaver
 if [ -x $(which xscreensaver) ]; then
-	xscreensaver&
+  xscreensaver&
 fi
 
 # configure i3
@@ -92,10 +78,14 @@ if [ -f ~/.config/i3/config.base ]; then
 fi
 
 case $HOSTNAME in
-        magnesium|platinum|plutonium)
-          exec i3
-          ;;
-        *)
-          exec ratpoison
-          ;;
+  magnesium|platinum|plutonium)
+    exec i3
+    ;;
+  *)
+    exec ratpoison
+    ;;
 esac
+
+
+
+# vim: set expandtab tabstop=2 smarttab: