diff --git a/.gitignore b/.gitignore index 4c2a1cf..248bc3a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ procmailrc .*.swp *~ *.pyc +gitconfig diff --git a/Makefile b/Makefile index 571d884..a568535 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ifeq ($(OS),Windows_NT) HOME = $(HOMEDRIVE)$(HOMEPATH) -install-conf: +install-conf: $(FILES) $(FILES2) cp gitconfig $(HOME)\.gitconfig cp vimrc $(HOME)\_vimrc cp gvimrc $(HOME)\_gvimrc @@ -24,8 +24,7 @@ install-vim-plug: else -install-conf: $(FILES) - mkdir -p ~/.ssh +install-conf: $(FILES) $(FILES2) for i in $(FILES); do install -m0644 $$i ~/.$$i; done for i in $(FILES2); do install -m0600 $$i ~/.$$i; done diff --git a/commonshrc b/commonshrc index 054f667..177f274 100644 --- a/commonshrc +++ b/commonshrc @@ -75,3 +75,6 @@ test -x /usr/bin/vim && alias vi=vim passc() { pass show "$1" | (read i; cat; echo -n "$i" | xclip -l 1 -se c) } + + +add_to PATH /opt/ghc/7.8.3/bin diff --git a/gitconfig b/gitconfig.m4 similarity index 57% rename from gitconfig rename to gitconfig.m4 index d2895b6..6a2922d 100644 --- a/gitconfig +++ b/gitconfig.m4 @@ -8,3 +8,5 @@ diff = auto [push] default = simple +[credential] + helper = syscmd(`find /usr/share/git /usr/share/doc/git -name git-credential-gnome-keyring')