Merge branch 'master' of https://git.gebner.org/gebner/etc
This commit is contained in:
		
						commit
						5573b0e965
					
				
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
								
								
								
								
								
									
									
								
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -2,3 +2,4 @@ procmailrc
 | 
				
			|||||||
.*.swp
 | 
					.*.swp
 | 
				
			||||||
*~
 | 
					*~
 | 
				
			||||||
*.pyc
 | 
					*.pyc
 | 
				
			||||||
 | 
					gitconfig
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										5
									
								
								Makefile
									
									
									
									
									
								
							
							
								
								
								
								
								
									
									
								
							
						
						
									
										5
									
								
								Makefile
									
									
									
									
									
								
							@ -10,7 +10,7 @@ ifeq ($(OS),Windows_NT)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
HOME = $(HOMEDRIVE)$(HOMEPATH)
 | 
					HOME = $(HOMEDRIVE)$(HOMEPATH)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
install-conf:
 | 
					install-conf: $(FILES) $(FILES2)
 | 
				
			||||||
	cp gitconfig $(HOME)\.gitconfig
 | 
						cp gitconfig $(HOME)\.gitconfig
 | 
				
			||||||
	cp vimrc $(HOME)\_vimrc
 | 
						cp vimrc $(HOME)\_vimrc
 | 
				
			||||||
	cp gvimrc $(HOME)\_gvimrc
 | 
						cp gvimrc $(HOME)\_gvimrc
 | 
				
			||||||
@ -24,8 +24,7 @@ install-vim-plug:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
 | 
					
 | 
				
			||||||
install-conf: $(FILES)
 | 
					install-conf: $(FILES) $(FILES2)
 | 
				
			||||||
	mkdir -p ~/.ssh
 | 
					 | 
				
			||||||
	for i in $(FILES); do install -m0644 $$i ~/.$$i; done
 | 
						for i in $(FILES); do install -m0644 $$i ~/.$$i; done
 | 
				
			||||||
	for i in $(FILES2); do install -m0600 $$i ~/.$$i; done
 | 
						for i in $(FILES2); do install -m0600 $$i ~/.$$i; done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -75,3 +75,6 @@ test -x /usr/bin/vim && alias vi=vim
 | 
				
			|||||||
passc() {
 | 
					passc() {
 | 
				
			||||||
  pass show "$1" | (read i; cat; echo -n "$i" | xclip -l 1 -se c)
 | 
					  pass show "$1" | (read i; cat; echo -n "$i" | xclip -l 1 -se c)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					add_to PATH /opt/ghc/7.8.3/bin
 | 
				
			||||||
 | 
				
			|||||||
@ -8,3 +8,5 @@
 | 
				
			|||||||
	diff = auto
 | 
						diff = auto
 | 
				
			||||||
[push]
 | 
					[push]
 | 
				
			||||||
	default = simple
 | 
						default = simple
 | 
				
			||||||
 | 
					[credential]
 | 
				
			||||||
 | 
						helper = syscmd(`find /usr/share/git /usr/share/doc/git -name git-credential-gnome-keyring')
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user