From 466c8a6b31a98a461b250743718084d79f67f640 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 9 Oct 2019 19:39:45 +0200 Subject: Added git config --- .gitconfig | 8 ++++++++ Makefile | 32 +++++++++++++++++++------------- 2 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..577206f --- /dev/null +++ b/.gitconfig @@ -0,0 +1,8 @@ +[user] + name = Charles + email = sircharlesaze@gmail.com +[credential] + helper = cache + username = HappyTramp +[log] + decorate = full diff --git a/Makefile b/Makefile index 5d218e3..6a759c0 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,10 @@ BASHALIAS = .bash_aliases PROFILE = .profile GHCI = .ghci GDB = .gdbinit +GITCONFIG = .gitconfig CONFFILES = $(HOME)/$(ZSHRC) $(HOME)/$(VIMRC) $(HOME)/$(TMUXCONF) $(HOME)/$(BASHRC) \ - $(HOME)/$(BASHALIAS) $(HOME)/$(PROFILE) $(HOME)/$(GHCI) $(HOME)/$(GDB) + $(HOME)/$(BASHALIAS) $(HOME)/$(PROFILE) $(HOME)/$(GHCI) $(HOME)/$(GDB) \ + $(HOME)/$(GITCONFIG) .PHONY: all all: $(CONFFILES) @@ -45,6 +47,10 @@ $(HOME)/$(GDB): $(DOTDIR)/$(GDB) touch $@ cat $< > $@ +$(HOME)/$(GITCONFIG): $(DOTDIR)/$(GITCONFIG) + touch $@ + cat $< >> $@ + .PHONY: clean clean: rm -f $(CONFFILES) @@ -52,15 +58,15 @@ clean: .PHONY: re re: clean all -.PHONY: dependencies -dependencies: - @echo "Installing vim-plug (plugin manager)" - curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - @echo "Installing vim plugins" - vim -c "PlugInstall" -c "qa" - @echo "Installing oh-my-zsh" - sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" - @echo "Installing zsh-syntax-highlighting" - git clone https://github.com/zsh-users/zsh-syntax-highlighting.git \ - ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting +# .PHONY: dependencies +# dependencies: +# @echo "Installing vim-plug (plugin manager)" +# curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ +# https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +# @echo "Installing vim plugins" +# vim -c "PlugInstall" -c "qa" +# @echo "Installing oh-my-zsh" + # sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" + # @echo "Installing zsh-syntax-highlighting" + # git clone https://github.com/zsh-users/zsh-syntax-highlighting.git \ + # ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting -- cgit