Merge branch 'master' of https://git.gebner.org/gebner/etc

.gitignore

@@ -2,3 +2,4 @@ procmailrc
 .*.swp
 *~
 *.pyc
+gitconfig

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
 

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

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')