From ddfe72305b93692be15805e38bc05694679ecf65 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Thu, 27 Aug 2020 10:50:06 +0100 Subject: [PATCH] core: add 'delta' to tools installed --- .gitignore | 1 + install | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 34e2bbc..cf2f3d9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ emacs.d/elpa/ emacs.d/auto-save-list emacs.d/history emacs.d/recentf +bin/delta* diff --git a/install b/install index c2fe7d5..5ac99e3 100755 --- a/install +++ b/install @@ -22,6 +22,17 @@ for rc in *rc *profile tmux.conf bashrc.d mutt ; do fi done +# Delta +DELTA_VER=0.4.1 +if [ "$(uname -s)" == 'Darwin' ]; then + DELTA_PATH=delta-${DELTA_VER}-x86_64-apple-darwin +elif [ "$(uname -s)" == 'Linux' ] ; then + DELTA_PATH=delta-${DELTA_VER}-x86_64-unknown-linux-gnu +fi +DELTA_URL=https://github.com/dandavison/delta/releases/download/${DELTA_VER}/${DELTA_PATH}.tar.gz +echo "Installing Delta $DELTA_PATH" +(curl -L ${DELTA_URL} | tar xzf - "${DELTA_PATH}/delta") && mv ${DELTA_PATH}/delta $BASE/bin/delta-${DELTA_VER} && ln -s $BASE/bin/delta-${DELTA_VER} $BASE/bin/delta && rm -r ${DELTA_PATH} + # git-prompt # if [ ! -e ~/.git-prompt.sh ]; then # curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh -o ~/.git-prompt.sh @@ -49,7 +60,7 @@ if [ "$(uname -s)" = 'Darwin' ]; then brew install \ fd ag wget git bat tmux bash-completion \ - vim macvim + vim macvim jq # ripgrep ant cmake cmus coreutils cscope exiftool doxygen liboauth \ # fish graphviz imagemagick leiningen sbt gnupg \ @@ -69,6 +80,8 @@ fi git config --global user.email "paul@blacksun.org.uk" git config --global user.name "Paul Walker" +git config --global core.pager "delta --line-numbers --dark" +git config --global delta.side-by-side true # git config --global user.signingKey FEF9C627 # git config --global commit.gpgsign true