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=3fb14a61f995eb873eb128f9ff05f628198a62e7;p=max%2Fdotfiles.git

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

diff --git a/X/.Xresources.platinum b/X/.Xresources.platinum
new file mode 100644
index 0000000..8e08745
--- /dev/null
+++ b/X/.Xresources.platinum
@@ -0,0 +1 @@
+*faceSize: 20
diff --git a/X/.xinitrc b/X/.xinitrc
index 1b907ff..86cfd39 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -21,25 +21,20 @@ fi
 
 # Set keyboard layout
 case $HOSTNAME in
-  palladium)
-    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"
-    ;;
-  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)
-    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"
-    ;;
-  *)
+    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)
+	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
@@ -70,13 +65,14 @@ xset -b
 
 # Battery monitoring
 case $HOSTNAME in
-  palladium)
-    xbattmon&
-    ;;
-  iridium)
-    ~/.local/bin/bat_mgt.sh&
-    ;;
-  *)
+	palladium)
+		xbattmon&
+		;;
+	iridium|platinum)
+		~/.local/bin/bat_mgt.sh&
+		;;
+	*)
+                ;;
 esac
 
 cat ~/.ratpoisonrc.base ~/.ratpoisonrc.$HOSTNAME > ~/.ratpoisonrc
diff --git a/bash/.bash_aliases b/bash/.bash_aliases
index 041788c..de52567 100644
--- a/bash/.bash_aliases
+++ b/bash/.bash_aliases
@@ -21,4 +21,6 @@ function la {
     fi
 }
 alias tmux='TERM=xterm-256color tmux'
-alias vim='gvim -v'
+if [ -x /usr/bin/gvim ]; then 
+  alias vim='gvim -v'
+fi
diff --git a/bash/.bashrc b/bash/.bashrc
index dd39849..249787c 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -24,7 +24,11 @@ HISTFILESIZE=2000
 shopt -s checkwinsize
 
 # make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+if [ -x /usr/bin/lesspipe ]; then 
+  export LESSOPEN="|lesspipe %s"
+elif [ -x /usr/bin/lesspipe.sh ]; then 
+  export LESSOPEN="|lesspipe %s"
+fi
 
 # set variable identifying the chroot you work in (used in the prompt below)
 if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
diff --git a/git/.gitconfig b/git/.gitconfig
index 778a220..d5e5f81 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -8,7 +8,7 @@
 	name = Maximilian Friedersdorff
 	email = max@friedersdorff.com
 [core]
-	editor = emc
+	editor = vim
 	excludesfile = /home/max/.gitignore
 [merge]
 	tool = diffuse