Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffknupp committed Jun 21, 2016
1 parent 06c1585 commit d23e0d5
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
17 changes: 13 additions & 4 deletions .vimrc
Expand Up @@ -24,9 +24,10 @@ Plugin 'Lokaltog/vim-distinguished'
Plugin 'wincent/Command-T'
"Plugin 'editorconfig/editorconfig-vim'
Plugin 'vim-scripts/vcscommand.vim'
"Plugin 'fatih/vim-go'
Plugin 'fatih/vim-go'
Plugin 'Gundo'
Plugin 'reedes/vim-wordy'
Plugin 'powerline/powerline', {'rtp': 'powerline/bindings/vim/'}
"Plugin 'wting/rust.vim'

call vundle#end()
Expand Down Expand Up @@ -170,13 +171,21 @@ hi DiffText gui=underline guibg=red guifg=black

" syntastic: show errors from all linters at once
let g:syntastic_aggregate_errors = 1
let g:syntastic_always_populate_loc_list = 1
let g:syntastic_auto_loc_list = 0
let g:syntastic_check_on_open = 1
let g:syntastic_check_on_wq = 0
let g:syntastic_go_checkers = ['go', 'golint']

let g:syntastic_enable_signs = 1
let g:syntastic_enable_balloons = 1
let g:syntastic_error_symbol = ""
let g:syntastic_warning_symbol = ""

" Set CtrlP to search by filename rather than path
let g:ctrlp_by_filename = 0

" Preview Markdown files with QuickLook
map <Leader>v :write<cr>:sil !/usr/bin/qlmanage -p % > /dev/null &<cr>:redraw!<cr>
set guifont=Sauce\ Code\ Powerline\ Semibold:h12

set guifont=Sauce\ Code\ Powerline:h14
"autocmd FileType go autocmd BufWritePre <buffer> GoFmt
set expandtab " Use spaces, not tabs, for autoindent/tab key.
8 changes: 5 additions & 3 deletions .zshrc
Expand Up @@ -7,20 +7,20 @@

# Include stuff that needs to be set before sourcing init.zsh
module_path=($module_path /usr/local/lib/zpython)
fpath+=("/usr/local/share/zsh/site-functions")

# Source Prezto.
if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
fi

# Pure theme
autoload -U promptinit && promptinit
prompt sorin

# Include machine specific options (i.e. one for work, one for home, one for VPS
# hosts, etc.)

# antigen package management
source ~/config_files/antigen/antigen.zsh
source ~/dotfiles/antigen/antigen.zsh

antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle jeffknupp/prezto
Expand Down Expand Up @@ -64,3 +64,5 @@ alias reload='source ~/.zshrc'

# Ctrl-R for incremental search in both vi modes
bindkey "^R" history-incremental-search-backward

test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"

0 comments on commit d23e0d5

Please sign in to comment.