some changes

This commit is contained in:
Em 2017-12-22 16:44:06 -05:00
parent 0971ffc037
commit 536becf0d7
3 changed files with 4 additions and 2 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
.vim/bundle/
*.netrwhist

1
.vimrc
View File

@ -134,6 +134,7 @@ set grepprg=grep\ -nH\ $*
filetype plugin indent on
let g:powerline_pycmd = "py3"
let loaded_matchparen = 1
let g:vimtex_view_general_viewer = 'qpdfview'
let g:vimtex_compiler_latexmk = {'callback' : 0}

4
.zshrc
View File

@ -1,4 +1,4 @@
export PATH=$HOME/Documents/bin:/usr/local/bin:/usr/bin:/bin
export PATH=$HOME/Documents/bin:/usr/local/bin:/usr/bin:/bin:/home/emerson/.gem/ruby/2.4.0/bin
export ZSH=$HOME/.oh-my-zsh
export TEXMFHOME=$HOME/.texmf
ZSH_THEME=""
@ -65,5 +65,5 @@ alias gfiles='git ls-tree --name-only -r $(git name-rev --name-only HEAD)'
alias gours='git ls-files --unmerged | cut -f2 | uniq | xargs git checkout --ours'
alias gstage='git diff-index --cached --name-only HEAD'
alias gtheirs='git ls-files --unmerged | cut -f2 | uniq | xargs git checkout --theirs'
alias gtree='git log --graph --all --pretty=format:"%Cred%h%Creset - %Cgreen(%cr)%Creset %s%C(yellow)%d %an%Creset" --abbrev-commit --date=relative'
alias gtree='git log --graph --all --pretty=format:"%Cred%h%Creset - %Cgreen(%cd - %cr)%Creset %s%C(yellow)%d %an%Creset" --abbrev-commit --date=iso'
alias gauthors="git log --format='%aN <%aE>' | sort -u | egrep -v '\+ed'"