Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ fi

# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
export PATH="$PATH:$HOME/.rvm/bin"

[ -f ~/.fzf.bash ] && source ~/.fzf.bash
2 changes: 2 additions & 0 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,5 @@ export PATH="$PATH:$HOME/.rvm/bin"

# Makes <C-a> <C-e> work in zsh+tmux
bindkey -e

[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
10 changes: 5 additions & 5 deletions vim/mappings.vim
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ noremap <leader><leader> :e #<CR>
" ctags
nnoremap <C-b> <C-]>

"--- Comments
" Clear all comment markers
map - <leader>ci
" Comment code
"map - <leader>cl"

"--- Whitespace
" To make it show up in new tabs - use Ctrl-E
Expand All @@ -34,3 +29,8 @@ nnoremap <leader>sv :source $MYVIMRC<cr>
" omg, so much easier to see next occurance!
nnoremap n nzz
nnoremap N Nzz

" quickfix shortcuts
map <C-n> :cnext<CR>
map <C-m> :cprevious<CR>
nnoremap <C-q> :cclose<CR>
7 changes: 0 additions & 7 deletions vim/plugin.ag.vim

This file was deleted.

9 changes: 0 additions & 9 deletions vim/plugin.ctrlp.vim

This file was deleted.

1 change: 0 additions & 1 deletion vim/plugin.deocomplete.vim

This file was deleted.

2 changes: 0 additions & 2 deletions vim/plugin.deoplete-go.vim

This file was deleted.

7 changes: 7 additions & 0 deletions vim/plugin.fzf.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
" extra key bindings
let g:fzf_action = {
\ 'ctrl-t': 'tab split',
\ 'ctrl-x': 'split',
\ 'ctrl-v': 'vsplit' }

nnoremap <C-p> :FZF<CR>
2 changes: 0 additions & 2 deletions vim/plugin.jsx.vim

This file was deleted.

14 changes: 0 additions & 14 deletions vim/plugin.neomake.vim
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,3 @@ let g:neomake_verbose = 1

" autocmd! BufWritePost * Neomake
command Errors lopen


" options for runnign neomake on save
" autocmd BufWritePost * call neomake#Make(1, [], function('s:Neomake_callback'))
" call neomake#configure#automake('w')
" autocmd BufWritePost * Neomake

function! s:Neomake_callback(options)
if(a:options.status == 0)
edit
checktime
endif
endfunction

5 changes: 0 additions & 5 deletions vim/plugin.neosnippet.vim

This file was deleted.

3 changes: 3 additions & 0 deletions vim/plugin.nerdcommenter.vim
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
let NERDSpaceDelims=1 " Add a space before comments

" Clear all comment markers
map - <leader>ci
5 changes: 2 additions & 3 deletions vim/plugin.nerdtree.vim
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
map <C-n> :NERDTreeToggle<CR>
map <C-m> :NERDTreeFind<CR>
" map <C-n> :NERDTreeToggle<CR>:NERDTreeMirror<CR>
map <leader>n :NERDTreeToggle<CR>
map <leader>m :NERDTreeFind<CR>
6 changes: 0 additions & 6 deletions vim/plugin.test.vim

This file was deleted.

1 change: 0 additions & 1 deletion vim/plugin.vim-closetag.vim

This file was deleted.

5 changes: 0 additions & 5 deletions vim/plugin.vim-go.vim
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ let g:go_fmt_command = "goimports"
" save automatically before :make
set autowrite

" quickfix shortcuts
map <leader>n :cnext<CR>
map <leader>m :cprevious<CR>
nnoremap <leader>q :cclose<CR>

" ---------- shortcuts
" run :GoBuild or :GoTestCompile based on the go file
function! s:build_go_files()
Expand Down
45 changes: 7 additions & 38 deletions vim/plugins.vim
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,21 @@ Plug 'airblade/vim-gitgutter'
Plug 'itchyny/lightline.vim'

" Tools
Plug 'ctrlpvim/ctrlp.vim'
Plug 'scrooloose/nerdcommenter'
Plug 'scrooloose/nerdtree'
Plug 'nathanaelkane/vim-indent-guides'
Plug 'tpope/vim-fugitive'
Plug 'tpope/vim-surround'
Plug 'tpope/vim-endwise'
Plug 'vim-scripts/Align'
Plug 'jiangmiao/auto-pairs'
Plug 'tpope/vim-repeat'
Plug 'alvan/vim-closetag'
Plug 'gcmt/taboo.vim'
Plug 'sickill/vim-pasta'
Plug 'sjl/gundo.vim'
Plug 'scrooloose/nerdcommenter'
Plug 'christoomey/vim-tmux-navigator'
Plug 'editorconfig/editorconfig-vim'
Plug 'tpope/vim-unimpaired'

Plug 'tpope/vim-fugitive'
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
Plug 'wincent/ferret' "ripgrep
Plug 'neomake/neomake' " easily run linters/compilers sync

" Neovim only
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'zchee/deoplete-go', { 'do': 'make'}
Plug 'Shougo/neosnippet'
Plug 'Shougo/neosnippet-snippets'
Plug 'jiangmiao/auto-pairs'

" Languages
Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
Plug 'pangloss/vim-javascript'
Plug 'tpope/vim-rails'
Plug 'vim-ruby/vim-ruby'
Plug 'mxw/vim-jsx'


call plug#end()

"-------------------------
" Retired plugins - still interesting
" cTags
" Plug 'xolox/vim-easytags'
" Plug 'xolox/vim-misc'
" Plug 'majutsushi/tagbar'

" find/replace
" Plug 'brooth/far.vim', { 'do': ':UpdateRemotePlugins' } "interactive find and replace
" Plug 'dkprice/vim-easygrep'

" testing
" Plug 'janko-m/vim-test'
" visible indent guides
" Plug 'nathanaelkane/vim-indent-guides'