systemSetup

commit 7e529a95907bf787731c5598d6611a0154431f1c
parent b29f909837cd797ef6ca4e41ec0882192ac01271
Author: Remy Noulin <loader2x@gmail.com>
Date:   Wed, 22 Nov 2017 13:24:19 +0100

add diff script to find missing updates in configs

move diff-so-fancy config to .gitconfig

add systemSetupCommit.sh to save current commit sha in home
~/.systemSetupCommit.txt

debian/3-home.sh            | 29 +++++++++++++++--------------
debian/diffHome.sh          | 40 ++++++++++++++++++++++++++++++++++++++++
debian/systemSetupCommit.sh |  2 ++
debian/updateHome.sh        |  3 +++
dotfiles/.gitconfig         | 13 +++++++++++++
5 files changed, 73 insertions(+), 14 deletions(-)

Diffstat:
M
debian/3-home.sh
 | 
29
+++++++++++++++--------------
A
debian/diffHome.sh
 | 
40
++++++++++++++++++++++++++++++++++++++++
A
debian/systemSetupCommit.sh
 | 
2
++
M
debian/updateHome.sh
 | 
3
+++
M
dotfiles/.gitconfig
 | 
13
+++++++++++++

5 files changed, 73 insertions(+), 14 deletions(-)
diff --git a/debian/3-home.sh b/debian/3-home.sh
@@ -20,20 +20,21 @@ sudo gpasswd -a $USER docker
 # 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"
+## commented because it is 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
diff --git a/debian/diffHome.sh b/debian/diffHome.sh
@@ -0,0 +1,40 @@
+echo diff ../dotfiles/.bash_aliases ~/.bash_aliases
+diff ../dotfiles/.bash_aliases ~/.bash_aliases
+echo diff ../dotfiles/.bashrc ~/.bashrc
+diff ../dotfiles/.bashrc ~/.bashrc
+echo diff ../dotfiles/.gdbinit ~/.gdbinit
+diff ../dotfiles/.gdbinit ~/.gdbinit
+echo diff ../dotfiles/.gitconfig ~/.gitconfig
+diff ../dotfiles/.gitconfig ~/.gitconfig
+echo diff ../dotfiles/.gittemplates/hooks/prepare-commit-msg ~/.gittemplates/hooks/prepare-commit-msg
+diff ../dotfiles/.gittemplates/hooks/prepare-commit-msg ~/.gittemplates/hooks/prepare-commit-msg
+echo diff ../dotfiles/.tmux.conf ~/.tmux.conf
+diff ../dotfiles/.tmux.conf ~/.tmux.conf
+#diff -R ../dotfiles/.vim/* ~/.vim/
+echo diff ../dotfiles/.vimrc ~/.vimrc
+diff ../dotfiles/.vimrc ~/.vimrc
+#diff ../dotfiles/new.sh ~/bin/
+#diff ../dotfiles/updateXapianIndex.sh ~/bin/
+#diff ../dotfiles/xapianOmegaSearch.sh ~/bin/
+echo diff ../dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf
+diff ../dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf
+echo diff ../dotfiles/.ssh/config ~/.ssh/config
+diff ../dotfiles/.ssh/config ~/.ssh/config
+
+# i3
+#diff -R ../dotfiles/.i3/* ~/.i3/
+
+# fluxbox
+#diff -R ../dotfiles/.fluxbox/* ~/.fluxbox/
+
+# mc
+#diff -R ../dotfiles/mc/* ~/.config/mc/
+
+# ranger sixel/mlterm configuration
+echo diff ../dotfiles/rc.conf ~/.config/ranger/rc.conf
+diff ../dotfiles/rc.conf ~/.config/ranger/rc.conf
+echo diff ../dotfiles/default.py ~/.config/ranger/colorschemes/default.py
+diff ../dotfiles/default.py ~/.config/ranger/colorschemes/default.py
+
+echo ****
+echo run ./systemSetupCommit.sh when the config is synchronized with latest commit
diff --git a/debian/systemSetupCommit.sh b/debian/systemSetupCommit.sh
@@ -0,0 +1,2 @@
+echo "last setup from commit:" > ~/.systemSetupCommit.txt
+git show --oneline -s >> ~/.systemSetupCommit.txt
diff --git a/debian/updateHome.sh b/debian/updateHome.sh
@@ -34,3 +34,6 @@ cp -R ../dotfiles/mc/* ~/.config/mc/
 mkdir -p ~/.config/ranger/colorschemes
 cp ../dotfiles/rc.conf ~/.config/ranger/
 cp ../dotfiles/default.py ~/.config/ranger/colorschemes/
+
+# save current commit in home
+./systemSetupCommit.sh
diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
@@ -2,6 +2,7 @@
 	ui = auto
 [core]
 	editor = vim
+	pager = diff-so-fancy | less --tabs=4 -RFX
 [diff]
 	tool = meld
 [difftool]
@@ -40,3 +41,15 @@
 	whitespace = fix
 [init]
 	templatedir=~/.gittemplates/
+[color "diff-highlight"]
+	oldNormal = red bold
+	oldHighlight = red bold 52
+	newNormal = green bold
+	newHighlight = green bold 22
+[color "diff"]
+	meta = 227
+	frag = magenta bold
+	commit = 227 bold
+	old = red bold
+	new = green bold
+	whitespace = red reverse