systemSetup

commit 23006abd5d81a852c03fa9b4fcf63c3b89e16bfb
parent 5925689838e0a99efafafb0a5f365e2668830a9c
Author: Remy Noulin <loader2x@gmail.com>
Date:   Fri, 17 Nov 2017 12:28:16 +0100

add diff-so-fancy and r alias for ranger

debian/1-system.sh     |  5 +++++
debian/3-home.sh       | 20 ++++++++++++++++++++
dotfiles/.bash_aliases |  1 +
3 files changed, 26 insertions(+)

Diffstat:
M
debian/1-system.sh
 | 
5
+++++
M
debian/3-home.sh
 | 
20
++++++++++++++++++++
M
dotfiles/.bash_aliases
 | 
1
+

3 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/debian/1-system.sh b/debian/1-system.sh
@@ -60,6 +60,11 @@ export DEBIAN_FRONTEND=noninteractive ; \
 	apt-get update -y -q;\
 	apt-get install --allow-unauthenticated -y -q docker-engine
 
+# diff-so-fancy
+git clone https://github.com/so-fancy/diff-so-fancy.git
+cp diff-so-fancy/diff-so-fancy /usr/local/bin/
+mkdir /usr/local/bin/lib
+cp diff-so-fancy/lib/DiffHighlight.pm /usr/local/bin/lib/
 
 # end
 apt-get autoremove -y
diff --git a/debian/3-home.sh b/debian/3-home.sh
@@ -18,3 +18,23 @@ sudo gpasswd -a $USER docker
 # reinitialize environment to load the new group
 # starts a new shell - not good
 # newgrp -
+
+# setup diff-so-fancy in gitconfig
+git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
+git config --global color.ui true
+
+git config --global color.diff-highlight.oldNormal "red bold"
+git config --global color.diff-highlight.oldHighlight "red bold 52"
+git config --global color.diff-highlight.newNormal "green bold"
+git config --global color.diff-highlight.newHighlight "green bold 22"
+
+git config --global color.diff.meta "227"
+git config --global color.diff.frag "magenta bold"
+git config --global color.diff.commit "227 bold"
+git config --global color.diff.old "red bold"
+git config --global color.diff.new "green bold"
+git config --global color.diff.whitespace "red reverse"
+#git config --bool --global diff-so-fancy.markEmptyLines false
+#git config --bool --global diff-so-fancy.changeHunkIndicators false
+#git config --bool --global diff-so-fancy.stripLeadingSymbols false
+#git config --bool --global diff-so-fancy.useUnicodeRuler false
diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases
@@ -14,6 +14,7 @@ alias objdump='objdump -M intel'
 alias g='git'
 alias csv='scim --txtdelim=";"'
 alias new='~/bin/new.sh'
+alias r='ranger'
 
 # Display colors in less :
 alias less="less -R"