Merge branch 'master' of github.com:aarongut/dotfiles

This commit is contained in:
2018-02-09 10:39:46 -08:00
5 changed files with 7 additions and 9 deletions

6
.gitmodules vendored
View File

@@ -19,12 +19,6 @@
[submodule ".vim/bundle/vim-ispc"] [submodule ".vim/bundle/vim-ispc"]
path = .vim/bundle/vim-ispc path = .vim/bundle/vim-ispc
url = git@github.com:jez/vim-ispc url = git@github.com:jez/vim-ispc
[submodule ".vim/bundle/vim-easytags"]
path = .vim/bundle/vim-easytags
url = git@github.com:xolox/vim-easytags.git
[submodule ".vim/bundle/vim-misc"]
path = .vim/bundle/vim-misc
url = git@github.com:xolox/vim-misc.git
[submodule ".vim/bundle/vim-airline"] [submodule ".vim/bundle/vim-airline"]
path = .vim/bundle/vim-airline path = .vim/bundle/vim-airline
url = git@github.com:vim-airline/vim-airline.git url = git@github.com:vim-airline/vim-airline.git

6
.vim/ftplugin/mail.vim Normal file
View File

@@ -0,0 +1,6 @@
set wrap
set linebreak
set nolist
set textwidth=0
set wrapmargin=0
set spell

2
.zshrc
View File

@@ -26,7 +26,7 @@ export GIT_PS1_SHOWSTASHSTATE=1
export GIT_PS1_SHOWUPSTREAM="auto" export GIT_PS1_SHOWUPSTREAM="auto"
export GIT_PS1_SHOWCOLORHINTS=1 export GIT_PS1_SHOWCOLORHINTS=1
PS1=$'\n╭%{$fg[yellow]%}$(__git_ps1 "(%s)")%{$fg[green]%}[%~]%{$reset_color%}\n╰%# ' PS1=$'\n╭%{$fg[yellow]%}$(__git_ps1 "(%s)")%{$fg[green]%}[%~]%{$reset_color%}\n╰%{$fg[cyan]%}%n%{$fg[yellow]%}@%{%F{214}%}%m%f%{$reset_color%}%# '
# set window title to working directory # set window title to working directory
precmd () { print -Pn "\e]0;%~\a" } precmd () { print -Pn "\e]0;%~\a" }