From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 7 Dec 2017 13:59:05 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=1b17ece26e2019c0d2d2eb3d612e2dff5cca0169;hp=b9b6476b92399c6c0188dbe1fc36b36850d1b2d2;p=max%2Fdotfiles.git

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

diff --git a/X/.xinitrc b/X/.xinitrc
index d04b5df..86cfd39 100644
--- 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
diff --git a/ratpoison/.ratpoisonrc.base b/ratpoison/.ratpoisonrc.base
index 5e1404b..e749519 100644
--- a/ratpoison/.ratpoisonrc.base
+++ b/ratpoison/.ratpoisonrc.base
@@ -1,7 +1,6 @@
 # Set the colors for ratpoison text!
 set bgcolor red
 set fwcolor red
-set font "Liberation Mono:size=20"
 
 bind f exec firefox --remote "openurl(`$RATPOISON -c getsel`,new-tab)"
 
diff --git a/ratpoison/.ratpoisonrc.beryllium b/ratpoison/.ratpoisonrc.beryllium
new file mode 100644
index 0000000..63e807f
--- /dev/null
+++ b/ratpoison/.ratpoisonrc.beryllium
@@ -0,0 +1 @@
+set font "Liberation Mono:size=12"
diff --git a/ratpoison/.ratpoisonrc.iridium b/ratpoison/.ratpoisonrc.iridium
new file mode 100644
index 0000000..504f152
--- /dev/null
+++ b/ratpoison/.ratpoisonrc.iridium
@@ -0,0 +1 @@
+set font "Liberation Mono:size=20"
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index df38b87..fb8ba84 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -9,4 +9,4 @@ bind C-a send-prefix
 
 set -g default-terminal "screen-256color"
 
-set -s escape-time 0
\ No newline at end of file
+set -s escape-time 0