Skip to content

Commit

Permalink
update from ubuntu for vim question
Browse files Browse the repository at this point in the history
  • Loading branch information
mjedmonds committed Nov 29, 2016
1 parent 75884f4 commit fbea3d6
Show file tree
Hide file tree
Showing 20 changed files with 221 additions and 122 deletions.
257 changes: 171 additions & 86 deletions vim/.vim/autoload/plug.vim

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions vim/.vim/autoload/plug.vim.old
Expand Up @@ -508,14 +508,17 @@ function! s:lod_map(map, names, prefix)
endif
let extra .= nr2char(c)
endwhile
if v:count
call feedkeys(v:count, 'n')
endif
call feedkeys('"'.v:register, 'n')

let prefix = v:count ? v:count : ''
let prefix .= '"'.v:register.a:prefix
if mode(1) == 'no'
call feedkeys(v:operator)
if v:operator == 'c'
let prefix = "\<esc>" . prefix
endif
let prefix .= v:operator
endif
call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
call feedkeys(prefix, 'n')
call feedkeys(substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
endfunction

function! plug#(repo, ...)
Expand Down Expand Up @@ -1086,7 +1089,7 @@ function! s:job_handler(job_id, data, event) abort

if a:event == 'stdout'
let complete = empty(a:data[-1])
let lines = map(filter(a:data, 'len(v:val) > 0'), 'split(v:val, "[\r\n]")[-1]')
let lines = map(filter(a:data, 'v:val =~ "[^\r\n]"'), 'split(v:val, "[\r\n]")[-1]')
call extend(self.lines, lines)
let self.result = join(self.lines, "\n")
if !complete
Expand Down
2 changes: 1 addition & 1 deletion vim/.vim/plugged/auto-pairs
Submodule auto-pairs updated from 1b3a1e to 845181
2 changes: 1 addition & 1 deletion vim/.vim/plugged/base16-vim
Submodule base16-vim updated from acf210 to 0c4834
2 changes: 1 addition & 1 deletion vim/.vim/plugged/indentLine
Submodule indentLine updated from 4b654e to 86b982
2 changes: 1 addition & 1 deletion vim/.vim/plugged/lightline.vim
Submodule lightline.vim updated from 0f2a26 to 479a1f
2 changes: 1 addition & 1 deletion vim/.vim/plugged/neocomplete.vim
Submodule neocomplete.vim updated from 75b2ea to ee442a
2 changes: 1 addition & 1 deletion vim/.vim/plugged/nerdcommenter
Submodule nerdcommenter updated from fdc611 to 057f61
1 change: 0 additions & 1 deletion vim/.vim/plugged/spacegray
Submodule spacegray deleted from dd6c1e
2 changes: 1 addition & 1 deletion vim/.vim/plugged/syntastic
Submodule syntastic updated from 2b84b1 to dfb263
2 changes: 1 addition & 1 deletion vim/.vim/plugged/tagbar
Submodule tagbar updated from b7f147 to 01f57a
2 changes: 1 addition & 1 deletion vim/.vim/plugged/targets.vim
Submodule targets.vim updated from 80cafa to c12d4e
2 changes: 1 addition & 1 deletion vim/.vim/plugged/ultisnips
Submodule ultisnips updated from 97a280 to 9a670c
2 changes: 1 addition & 1 deletion vim/.vim/plugged/vim-abolish
Submodule vim-abolish updated from 0d6316 to 05c7d3
2 changes: 1 addition & 1 deletion vim/.vim/plugged/vim-autoformat
Submodule vim-autoformat updated from f6faba to 15ee79
1 change: 0 additions & 1 deletion vim/.vim/plugged/vim-clang
Submodule vim-clang deleted from 32291b
2 changes: 1 addition & 1 deletion vim/.vim/plugged/vimtex
Submodule vimtex updated from 5816eb to 491057
28 changes: 20 additions & 8 deletions vim/.vimrc
Expand Up @@ -14,7 +14,6 @@ Plug 'tomasr/molokai'
Plug 'Shougo/neocomplete.vim'
Plug 'scrooloose/nerdcommenter'
Plug 'gorkunov/smartpairs.vim'
Plug 'kkga/spacegray'
Plug 'scrooloose/syntastic'
Plug 'majutsushi/tagbar'
Plug 'wellle/targets.vim'
Expand All @@ -29,7 +28,8 @@ Plug 'JamshedVesuna/vim-markdown-preview'
Plug 'xolox/vim-misc'
Plug 'xolox/vim-session'
Plug 'lervag/vimtex'
Plug 'justmao945/vim-clang'
Plug 'chriskempson/base16-vim'
"Plug 'justmao945/vim-clang'

call plug#end()

Expand Down Expand Up @@ -80,16 +80,19 @@ set wildmenu
set wildmode=full
"set wildmode=longest:full,full

" Disable annoying beeping
set noerrorbells
set vb t_vb=
" Disable annoying beeping (causes strange 001B character in terminal)
set noerrorbells visualbell t_vb=
autocmd GUIEnter * set visualbell t_vb=

"spelling colors/options
autocmd colorscheme * hi clear SpellBad

"leader key
let g:mapleader=","

"unicode
set encoding=utf-8

"cursorline settings
"set cursorline
"hi CursorLine term=none cterm=none ctermbg=3
Expand Down Expand Up @@ -203,9 +206,8 @@ if has("gui_running")
set guifont=Monospace\ 11
endif

autocmd GUIEnter * set vb t_vb=
" Set undercurl as error indicator in gui
autocmd colorscheme * hi SpellBad gui=undercurl guisp=red
"autocmd colorscheme * hi SpellBad gui=undercurl guisp=red
" Terminal specific settings
"else
"autocmd colorscheme * hi SpellBad cterm=undercurl
Expand Down Expand Up @@ -383,11 +385,14 @@ map <C-K> :call FormatFile()<cr>
imap <C-K> <c-o>:call FormatFile()<cr>
"-----------------------------------------------------------------------


"-----------------------------------------------------------------------
" vim-clang
"-----------------------------------------------------------------------
let g:clang_auto = 1
let g:clang_cpp_options = '-std=c++ -stdlib=libc++'
"-----------------------------------------------------------------------


"-----------------------------------------------------------------------
" Indent guides
Expand Down Expand Up @@ -445,11 +450,18 @@ let g:syntastic_check_on_wq = 0
colorscheme base16-ocean
set background=dark

let base16colorspace=256

" load colorscheme from base16-shell (loads base16-ocean)
if filereadable(expand("~/.vimrc_background"))
let base16colorspace=256
source ~/.vimrc_background
endif

" enable 256 colors for gnome-terminal
"if $COLORTERM == 'gnome-terminal'
"set t_Co=256
"endif

"-----------------------------------------------------------------------


Expand Down
2 changes: 1 addition & 1 deletion zsh/.oh-my-zsh
11 changes: 6 additions & 5 deletions zsh/.zshrc
Expand Up @@ -56,7 +56,7 @@ plugins=(git brew)
#

source $ZSH/oh-my-zsh.sh
export CFLAGS=-I/usr/lib/python2.7/site-packages/numpy/core/include/
#export CFLAGS=-I/usr/lib/python2.7/site-packages/numpy/core/include/

# Share history aross zsh sessions
# Appends every command to the history file once it is executed
Expand Down Expand Up @@ -97,11 +97,11 @@ alias ytrip="youtube-dl -f 'bestaudio' --extract-audio --audio-format mp3 --audi
BASE16_SHELL=$HOME/.config/base16-shell/
[ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)"

# enable 256 colors
export TERM=xterm-256color

# OS X sepcific settings
if [[ "$OSTYPE" = "darwin"* ]]; then
#Set colors to match iTerm2 Terminal Colors
export TERM=xterm-256color

#alias python="python3.5"
#alias pip="pip3.5"
alias matlab="/Applications/MATLAB_R2015b.app/bin/matlab -nodesktop"
Expand All @@ -119,7 +119,7 @@ fi

#linux specific settings
if [[ "$OSTYPE" = "linux"* ]]; then
LD_LIBRARY_PATH=/usr/local/lib:LD_LIBRARY_PATH:/usr/local/cuda-7.5/lib64
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:/usr/local/cuda/lib64
# pkg-config path (for OMPL)
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH

Expand All @@ -135,6 +135,7 @@ if [[ "$OSTYPE" = "linux"* ]]; then
# (you can explicitly run rm with \rm)
alias rm='safe-rm'
alias trash="trash-put"
alias gvir="gvim --remote-tab"
fi


Expand Down

0 comments on commit fbea3d6

Please sign in to comment.