Add configuration for Go
This commit is contained in:
+20
-4
@@ -1,14 +1,30 @@
|
|||||||
|
# General Environment Variables
|
||||||
export EDITOR=vim
|
export EDITOR=vim
|
||||||
export PS1='[\h:\w]\$ '
|
export PS1='[\h:\w]\$ '
|
||||||
export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$HOME/node_modules/.bin
|
export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
|
||||||
|
|
||||||
|
# Aliases
|
||||||
alias l='ls -GhHl'
|
alias l='ls -GhHl'
|
||||||
alias la='ls -aGhHl'
|
alias la='ls -aGhHl'
|
||||||
alias clear='clear && printf "\e[3J"'
|
alias clear='clear && printf "\e[3J"'
|
||||||
|
|
||||||
|
# Machine-Specific Configuration
|
||||||
[[ -e "$HOME/.profile.local" ]] && source $HOME/.profile.local
|
[[ -e "$HOME/.profile.local" ]] && source $HOME/.profile.local
|
||||||
|
|
||||||
export PYTHONSTARTUP="$(python -m jedi repl)"
|
# Git Config
|
||||||
export PYTHONPATH=./src
|
|
||||||
|
|
||||||
source ~/bin/git-completion.sh
|
source ~/bin/git-completion.sh
|
||||||
|
|
||||||
|
# Go Config
|
||||||
|
export GOPATH=/src/go
|
||||||
|
export GOBIN=/src/go/bin
|
||||||
|
export PATH=$PATH:$GOBIN
|
||||||
|
|
||||||
|
# NodeJS Config
|
||||||
|
export PATH=$PATH:$HOME/node_modules/.bin
|
||||||
|
|
||||||
|
# Python Config
|
||||||
|
export PYTHONSTARTUP="$(python -m jedi repl)"
|
||||||
|
|
||||||
|
# Ruby Config
|
||||||
|
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
|
||||||
|
export PATH=$PATH:$HOME/.rvm/bin
|
||||||
|
|||||||
+34
-12
@@ -96,7 +96,7 @@ let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
|
|||||||
let s:plug_tab = get(s:, 'plug_tab', -1)
|
let s:plug_tab = get(s:, 'plug_tab', -1)
|
||||||
let s:plug_buf = get(s:, 'plug_buf', -1)
|
let s:plug_buf = get(s:, 'plug_buf', -1)
|
||||||
let s:mac_gui = has('gui_macvim') && has('gui_running')
|
let s:mac_gui = has('gui_macvim') && has('gui_running')
|
||||||
let s:is_win = has('win32') || has('win64')
|
let s:is_win = has('win32')
|
||||||
let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
|
let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
|
||||||
let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
|
let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
|
||||||
let s:me = resolve(expand('<sfile>:p'))
|
let s:me = resolve(expand('<sfile>:p'))
|
||||||
@@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...)
|
|||||||
endtry
|
endtry
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
function! s:lazy(plug, opt)
|
||||||
|
return has_key(a:plug, a:opt) &&
|
||||||
|
\ (empty(s:to_a(a:plug[a:opt])) ||
|
||||||
|
\ !isdirectory(a:plug.dir) ||
|
||||||
|
\ len(s:glob(s:rtp(a:plug), 'plugin')) ||
|
||||||
|
\ len(s:glob(s:rtp(a:plug), 'after/plugin')))
|
||||||
|
endfunction
|
||||||
|
|
||||||
function! plug#end()
|
function! plug#end()
|
||||||
if !exists('g:plugs')
|
if !exists('g:plugs')
|
||||||
return s:err('Call plug#begin() first')
|
return s:err('Call plug#begin() first')
|
||||||
@@ -214,7 +222,7 @@ function! plug#end()
|
|||||||
continue
|
continue
|
||||||
endif
|
endif
|
||||||
let plug = g:plugs[name]
|
let plug = g:plugs[name]
|
||||||
if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
|
if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
|
||||||
let s:loaded[name] = 1
|
let s:loaded[name] = 1
|
||||||
continue
|
continue
|
||||||
endif
|
endif
|
||||||
@@ -763,6 +771,9 @@ function! s:prepare(...)
|
|||||||
execute 'silent! unmap <buffer>' k
|
execute 'silent! unmap <buffer>' k
|
||||||
endfor
|
endfor
|
||||||
setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
|
setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
|
||||||
|
if exists('+colorcolumn')
|
||||||
|
setlocal colorcolumn=
|
||||||
|
endif
|
||||||
setf vim-plug
|
setf vim-plug
|
||||||
if exists('g:syntax_on')
|
if exists('g:syntax_on')
|
||||||
call s:syntax()
|
call s:syntax()
|
||||||
@@ -799,7 +810,7 @@ function! s:bang(cmd, ...)
|
|||||||
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||||
if s:is_win
|
if s:is_win
|
||||||
let batchfile = tempname().'.bat'
|
let batchfile = tempname().'.bat'
|
||||||
call writefile(['@echo off', cmd], batchfile)
|
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||||
let cmd = batchfile
|
let cmd = batchfile
|
||||||
endif
|
endif
|
||||||
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
|
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
|
||||||
@@ -1008,6 +1019,8 @@ function! s:update_impl(pull, force, args) abort
|
|||||||
let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
|
let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
|
||||||
|
|
||||||
" Python version requirement (>= 2.7)
|
" Python version requirement (>= 2.7)
|
||||||
if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
|
if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
|
||||||
redir => pyv
|
redir => pyv
|
||||||
@@ -1099,7 +1112,7 @@ function! s:update_finish()
|
|||||||
if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
|
if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
|
||||||
\ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
|
\ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
|
||||||
call s:log4(name, 'Updating submodules. This may take a while.')
|
call s:log4(name, 'Updating submodules. This may take a while.')
|
||||||
let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir)
|
let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
|
||||||
endif
|
endif
|
||||||
let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
|
let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
|
||||||
if v:shell_error
|
if v:shell_error
|
||||||
@@ -1196,7 +1209,7 @@ function! s:spawn(name, cmd, opts)
|
|||||||
let s:jobs[a:name] = job
|
let s:jobs[a:name] = job
|
||||||
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
|
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
|
||||||
if !empty(job.batchfile)
|
if !empty(job.batchfile)
|
||||||
call writefile(['@echo off', cmd], job.batchfile)
|
call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
|
||||||
let cmd = job.batchfile
|
let cmd = job.batchfile
|
||||||
endif
|
endif
|
||||||
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
|
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
|
||||||
@@ -1318,7 +1331,7 @@ while 1 " Without TCO, Vim stack is bound to explode
|
|||||||
|
|
||||||
let name = keys(s:update.todo)[0]
|
let name = keys(s:update.todo)[0]
|
||||||
let spec = remove(s:update.todo, name)
|
let spec = remove(s:update.todo, name)
|
||||||
let new = !isdirectory(spec.dir)
|
let new = empty(globpath(spec.dir, '.git', 1))
|
||||||
|
|
||||||
call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
|
call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
|
||||||
redraw
|
redraw
|
||||||
@@ -2023,7 +2036,7 @@ function! s:system(cmd, ...)
|
|||||||
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
|
||||||
if s:is_win
|
if s:is_win
|
||||||
let batchfile = tempname().'.bat'
|
let batchfile = tempname().'.bat'
|
||||||
call writefile(['@echo off', cmd], batchfile)
|
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||||
let cmd = batchfile
|
let cmd = batchfile
|
||||||
endif
|
endif
|
||||||
return system(s:is_win ? '('.cmd.')' : cmd)
|
return system(s:is_win ? '('.cmd.')' : cmd)
|
||||||
@@ -2211,7 +2224,7 @@ function! s:upgrade()
|
|||||||
let new = tmp . '/plug.vim'
|
let new = tmp . '/plug.vim'
|
||||||
|
|
||||||
try
|
try
|
||||||
let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp))
|
let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp)))
|
||||||
if v:shell_error
|
if v:shell_error
|
||||||
return s:err('Error upgrading vim-plug: '. out)
|
return s:err('Error upgrading vim-plug: '. out)
|
||||||
endif
|
endif
|
||||||
@@ -2357,7 +2370,7 @@ function! s:preview_commit()
|
|||||||
let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
|
||||||
if s:is_win
|
if s:is_win
|
||||||
let batchfile = tempname().'.bat'
|
let batchfile = tempname().'.bat'
|
||||||
call writefile(['@echo off', cmd], batchfile)
|
call writefile(["@echo off\r", cmd . "\r"], batchfile)
|
||||||
let cmd = batchfile
|
let cmd = batchfile
|
||||||
endif
|
endif
|
||||||
execute 'silent %!' cmd
|
execute 'silent %!' cmd
|
||||||
@@ -2407,7 +2420,11 @@ function! s:diff()
|
|||||||
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
|
call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
|
||||||
for [k, v] in plugs
|
for [k, v] in plugs
|
||||||
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
|
let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
|
||||||
let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir)
|
let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
|
||||||
|
if has_key(v, 'rtp')
|
||||||
|
let cmd .= ' -- '.s:shellesc(v.rtp)
|
||||||
|
endif
|
||||||
|
let diff = s:system_chomp(cmd, v.dir)
|
||||||
if !empty(diff)
|
if !empty(diff)
|
||||||
let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
|
let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
|
||||||
call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
|
call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
|
||||||
@@ -2426,8 +2443,13 @@ function! s:diff()
|
|||||||
\ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
|
\ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
|
||||||
|
|
||||||
if cnts[0] || cnts[1]
|
if cnts[0] || cnts[1]
|
||||||
nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
|
nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
|
||||||
nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr>
|
if empty(maparg("\<cr>", 'n'))
|
||||||
|
nmap <buffer> <cr> <plug>(plug-preview)
|
||||||
|
endif
|
||||||
|
if empty(maparg('o', 'n'))
|
||||||
|
nmap <buffer> o <plug>(plug-preview)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
if cnts[0]
|
if cnts[0]
|
||||||
nnoremap <silent> <buffer> X :call <SID>revert()<cr>
|
nnoremap <silent> <buffer> X :call <SID>revert()<cr>
|
||||||
|
|||||||
+23
-15
@@ -22,19 +22,20 @@ Plug 'vim-airline/vim-airline'
|
|||||||
Plug 'w0rp/ale'
|
Plug 'w0rp/ale'
|
||||||
|
|
||||||
" Language Support Plugins
|
" Language Support Plugins
|
||||||
Plug 'HerringtonDarkholme/yats.vim' " typescript
|
Plug 'HerringtonDarkholme/yats.vim' " typescript
|
||||||
Plug 'davidhalter/jedi-vim' " python autocomplete
|
Plug 'davidhalter/jedi-vim' " python autocomplete
|
||||||
Plug 'digitaltoad/vim-pug' " pug
|
Plug 'digitaltoad/vim-pug' " pug
|
||||||
Plug 'elzr/vim-json' " json
|
Plug 'elzr/vim-json' " json
|
||||||
Plug 'gisraptor/vim-lilypond-integrator' " lilypond
|
Plug 'fatih/vim-go' " go
|
||||||
Plug 'google/yapf' " python
|
Plug 'gisraptor/vim-lilypond-integrator' " lilypond
|
||||||
Plug 'isRuslan/vim-es6' " javascript
|
Plug 'google/yapf' " python
|
||||||
Plug 'kchmck/vim-coffee-script' " coffeescript
|
Plug 'isRuslan/vim-es6' " javascript
|
||||||
Plug 'vim-scripts/mako.vim' " mako
|
Plug 'kchmck/vim-coffee-script' " coffeescript
|
||||||
Plug 'plasticboy/vim-markdown' " markdown
|
Plug 'ljfa-ag/minetweaker-highlighting' " ZenScript
|
||||||
Plug 'slim-template/vim-slim' " slim
|
Plug 'plasticboy/vim-markdown' " markdown
|
||||||
Plug 'statianzo/vim-jade' " jade
|
Plug 'slim-template/vim-slim' " slim
|
||||||
Plug 'ljfa-ag/minetweaker-highlighting' " ZenScript
|
Plug 'statianzo/vim-jade' " jade
|
||||||
|
Plug 'vim-scripts/mako.vim' " mako
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
@@ -122,12 +123,18 @@ let NERDTreeIgnore = ['__pycache__', '\.pyc$']
|
|||||||
let g:airline#extensions#ale#enabled = 1
|
let g:airline#extensions#ale#enabled = 1
|
||||||
let g:ale_completion_delay = 500
|
let g:ale_completion_delay = 500
|
||||||
let g:ale_completion_enabled = 1
|
let g:ale_completion_enabled = 1
|
||||||
|
let g:ale_fix_on_save = 1
|
||||||
let g:ale_lint_on_text_changed = 'never'
|
let g:ale_lint_on_text_changed = 'never'
|
||||||
let g:ale_open_list = 1
|
let g:ale_open_list = 1
|
||||||
let g:ale_set_loclist = 0
|
let g:ale_set_loclist = 0
|
||||||
let g:ale_sign_column_always = 1
|
let g:ale_sign_column_always = 1
|
||||||
|
|
||||||
|
let g:ale_fixers = {
|
||||||
|
\'*': ['remove_trailing_lines', 'trim_whitespace'],
|
||||||
|
\'go': ['gofmt', 'goimports']
|
||||||
|
\}
|
||||||
let g:ale_linters = {
|
let g:ale_linters = {
|
||||||
|
\'go': ['gobuild', 'golint', 'govet'],
|
||||||
\'html': [],
|
\'html': [],
|
||||||
\'typescript': ['tslint', 'tsserver'],
|
\'typescript': ['tslint', 'tsserver'],
|
||||||
\'python': ['pyls']
|
\'python': ['pyls']
|
||||||
@@ -138,7 +145,7 @@ let g:ale_virtualenv_dir_names = ['usr']
|
|||||||
|
|
||||||
map <F1> :NERDTreeToggle<CR>
|
map <F1> :NERDTreeToggle<CR>
|
||||||
map <F2> :NERDTreeFind<CR>
|
map <F2> :NERDTreeFind<CR>
|
||||||
map <F3> :'a,.!sort<CR>
|
map <F3> :'a,.!sort -fg<CR>
|
||||||
map <F4> :IndentGuidesToggle<CR>
|
map <F4> :IndentGuidesToggle<CR>
|
||||||
map <F5> :e!<CR>
|
map <F5> :e!<CR>
|
||||||
map <F6> :set hlsearch!<CR>
|
map <F6> :set hlsearch!<CR>
|
||||||
@@ -146,7 +153,6 @@ map <F7> :cp<CR>
|
|||||||
map <F8> :copen<CR>
|
map <F8> :copen<CR>
|
||||||
map <F9> :cn<CR>
|
map <F9> :cn<CR>
|
||||||
map <F10> :tselect<CR>
|
map <F10> :tselect<CR>
|
||||||
map <F11> :!ctags -R src test<CR>
|
|
||||||
|
|
||||||
nmap ; :BufExplorer<CR>
|
nmap ; :BufExplorer<CR>
|
||||||
|
|
||||||
@@ -160,4 +166,6 @@ endif
|
|||||||
|
|
||||||
autocmd BufRead COMMIT_EDITMSG set textwidth=70 colorcolumn=70
|
autocmd BufRead COMMIT_EDITMSG set textwidth=70 colorcolumn=70
|
||||||
autocmd BufRead *.mako set syntax=mako
|
autocmd BufRead *.mako set syntax=mako
|
||||||
|
autocmd BufRead *.go set noexpandtab
|
||||||
|
autocmd BufRead *.go set listchars=tab:\ \ ,
|
||||||
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
|
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ which -s ag || brew install ag
|
|||||||
which -s ctags || brew install ctags
|
which -s ctags || brew install ctags
|
||||||
which -s fswatch || brew install fswatch
|
which -s fswatch || brew install fswatch
|
||||||
which -s gcc || brew install gcc
|
which -s gcc || brew install gcc
|
||||||
|
which -s go || brew install go
|
||||||
which -s python3 || brew install python3 # must preceed macvim
|
which -s python3 || brew install python3 # must preceed macvim
|
||||||
which -s gvim || brew install macvim --with-python3
|
which -s gvim || brew install macvim --with-python3
|
||||||
which -s node || brew install node
|
which -s node || brew install node
|
||||||
|
|||||||
Reference in New Issue
Block a user