Skip to content

Commit

Permalink
Update the config to match new vim plugins.
Browse files Browse the repository at this point in the history
- Add support for Elixir, SBT and Elm
- Update tmux.conf to match new version of tmux
- Add extended globbing to zsh
  • Loading branch information
Tomasz Janeczko authored and Tomasz Janeczko committed Jul 13, 2016
1 parent a9c9274 commit a38fa68
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 4 deletions.
2 changes: 2 additions & 0 deletions tmux/tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ set-option -g default-terminal "screen-256color"

# Enables mouse interaction
set-option -g -q mouse on
set-option -g mouse-select-pane on
set-option -g mouse-select-window on

# soften status bar color from harsh green to light gray
set -g status-bg '#666666'
Expand Down
16 changes: 14 additions & 2 deletions vim/vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ set expandtab
let mapleader = ','

nmap <Leader>m :NERDTreeToggle<CR>
nmap <Leader>j :NERDTreeFind<CR><CR>
nmap <Leader>j :NERDTreeFind<CR>
" Map Y to act like D and C, i.e. to yank until EOL, rather than act as yy,
" which is the default
Expand All @@ -155,7 +155,10 @@ let g:EasyMotion_leader_key = '<Leader><Leader>'
"------------------------------------------------------------
"
let g:ctrlp_map = '<Leader>t'
let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']

if executable("ag")
let g:ctrlp_user_command = 'ag %s -l --nocolor --hidden -g ""'
endif

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

Expand Down Expand Up @@ -214,6 +217,15 @@ let g:jsx_ext_required = 0
colorscheme solarized
set background=light

" vim-airline theme
let g:airline_theme='solarized'

" Start interactive EasyAlign in visual mode (e.g. vipga)
xmap ga <Plug>(EasyAlign)
" Start interactive EasyAlign for a motion/text object (e.g. gaip)
nmap ga <Plug>(EasyAlign)
" Set Solarized Light when ambient light is strong, dark otherwise.
" let hour = strftime("%H")
" if 6 <= hour && hour < 19
Expand Down
19 changes: 17 additions & 2 deletions vim/vimrc.bundles
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ Plugin 'tpope/vim-repeat'
" Solarized vim theme
Plugin 'altercation/vim-colors-solarized'

" Airline status line
" Airline status line plus themes
Plugin 'bling/vim-airline'
Plugin 'vim-airline/vim-airline-themes'

" vim-bufferline for display of used buffers
Plugin 'bling/vim-bufferline'
Expand All @@ -34,7 +35,7 @@ Plugin 'Lokaltog/vim-easymotion'
Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}

" CtrlP for fuzzy filename search
Plugin 'kien/ctrlp.vim'
Plugin 'ctrlpvim/ctrlp.vim'

" Matchit for better % behaviour - tags, etc.
Plugin 'matchit.zip'
Expand Down Expand Up @@ -120,4 +121,18 @@ Plugin 'mhinz/vim-startify'
" JSX support for React.js
Plugin 'mxw/vim-jsx'

" Support for sbt syntax
Plugin 'derekwyatt/vim-sbt'

" Support for puppet
Plugin 'rodjek/vim-puppet'

" Easy alignment in vim
Plugin 'junegunn/vim-easy-align'

" Support for Elixir
Plugin 'elixir-lang/vim-elixir'

" Support for elm
Plugin 'lambdatoast/elm.vim'

3 changes: 3 additions & 0 deletions zsh/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ if [[ -d "$USER_SCRIPTS_PATH" ]]; then
done
fi

# Finally, set extended globbing
setopt extendedglob

0 comments on commit a38fa68

Please sign in to comment.