Merge branch 'master' of git.friedersdorff.com:max/dotfiles

[max/dotfiles.git] / X / .xinitrc

diff --git a/X/.xinitrc b/X/.xinitrc
index d04b5df0186b17ef58b22fe2855109c5f9118f0e..86cfd39a5d3f3711885d7071fd5ad16fd6e06f23 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,7 +16,7 @@ fi
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
 if [ -f ~/.Xresources.$HOSTNAME ]; then
-    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+  xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
 fi
 
 # Set keyboard layout
@@ -34,15 +34,16 @@ case $HOSTNAME in
        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 
-       ;;
-    *)
-       ;;
+  beryllium)
+    xrandr --output HDMI-1 --left-of DVI-I-1 
+    ;;
+  *)
+    ;;
 esac
 
 # Set java font option
@@ -56,8 +57,8 @@ 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")
+  #                 --use-standard-socket \
+  #                 --write-env-file "${HOME}/.gpg-agent-info")
 #fi
 #
 #gpg-connect-agent updatestartuptty /bye >/dev/null
@@ -71,6 +72,7 @@ case $HOSTNAME in
                ~/.local/bin/bat_mgt.sh&
                ;;
        *)
+                ;;
 esac
 
 cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc