michael/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Conditionally support some nvim bindings

Browse Source
This commit is contained in:
Michael Campagnaro 2015-12-02 10:21:05 -05:00
parent d2d78133f9
commit 41f798b6e9
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vimrc
View File

@ -228,17 +228,19 @@ command! Qall qall
" Disable Ex mode " Disable Ex mode
map Q <Nop> map Q <Nop>
" Terminal mapping if exists(':terminal')
map <leader>t :terminal<cr> " Terminal mapping
tnoremap <leader>e <C-\><C-n> map <leader>t :terminal<cr>
tnoremap <A-h> <C-\><C-n><C-w>h tnoremap <leader>e <C-\><C-n>
tnoremap <A-j> <C-\><C-n><C-w>j tnoremap <A-h> <C-\><C-n><C-w>h
tnoremap <A-k> <C-\><C-n><C-w>k tnoremap <A-j> <C-\><C-n><C-w>j
tnoremap <A-l> <C-\><C-n><C-w>l tnoremap <A-k> <C-\><C-n><C-w>k
nnoremap <A-h> <C-w>h tnoremap <A-l> <C-\><C-n><C-w>l
nnoremap <A-j> <C-w>j nnoremap <A-h> <C-w>h
nnoremap <A-k> <C-w>k nnoremap <A-j> <C-w>j
nnoremap <A-l> <C-w>l nnoremap <A-k> <C-w>k
nnoremap <A-l> <C-w>l
endif
" Map ctrl-movement keys to window switching " Map ctrl-movement keys to window switching
map <c-k> <c-w><Up> map <c-k> <c-w><Up>

17
zsh/aliases
View File

@ -19,7 +19,7 @@ alias cd...='cd ../..'
alias cd....='cd ../../..' alias cd....='cd ../../..'
alias cd.....='cd ../../../..' alias cd.....='cd ../../../..'
alias aliases='nvim ~/.dotfiles/zsh/aliases' alias aliases='vim ~/.dotfiles/zsh/aliases'
alias al='aliases' alias al='aliases'
alias b='bundle' alias b='bundle'
alias be='bundle exec' alias be='bundle exec'
@ -37,7 +37,7 @@ alias cpr='cp -r'
alias cw='compass watch' alias cw='compass watch'
alias dot='cd ~/.' alias dot='cd ~/.'
alias duh='du -csh' alias duh='du -csh'
alias functions='nvim ~/.dotfiles/zsh/functions' alias functions='vim ~/.dotfiles/zsh/functions'
alias f='fg' alias f='fg'
alias gib='gem install bundler' alias gib='gem install bundler'
alias history='fc -l 1' alias history='fc -l 1'
@ -71,6 +71,7 @@ alias patch='git format-patch HEAD^ --stdout > patch.diff'
alias pi='yaourt -S' # wrapper around Arch Pacman alias pi='yaourt -S' # wrapper around Arch Pacman
alias pr='yaourt -R' alias pr='yaourt -R'
alias po='pacman -Qdt' # see orphaned packages alias po='pacman -Qdt' # see orphaned packages
alias pu='yaourt -U'
alias reguard='killall -9 ruby ; guard' alias reguard='killall -9 ruby ; guard'
alias r='rails' alias r='rails'
alias rr='bundle exec rake release' alias rr='bundle exec rake release'
@ -85,16 +86,16 @@ alias rc='rails console'
alias rs='rails server' alias rs='rails server'
alias reload='source ~/.zshrc' alias reload='source ~/.zshrc'
alias s='cd ~/.ssh' alias s='cd ~/.ssh'
alias sc='nvim ~/.ssh/config' alias sc='vim ~/.ssh/config'
alias t='tree' alias t='tree'
alias u='cd ..' alias u='cd ..'
alias v='nvim' alias v='vim'
alias vi='nvim' alias vi='vim'
alias vim='nvim' alias vim='vim'
alias vh='vagrant halt' alias vh='vagrant halt'
alias vs='vagrant ssh' alias vs='vagrant ssh'
alias vu='vagrant up' alias vu='vagrant up'
alias vimrc='nvim ~/.vimrc' alias vimrc='vim ~/.vimrc'
# Git # Git
alias am='git commit --amend' alias am='git commit --amend'
@ -212,7 +213,7 @@ alias gwip="git add . && git commit -m \"WIP\""
# Notes # Notes
alias notes='cd ~/.personal-files/documents' alias notes='cd ~/.personal-files/documents'
alias pn='nvim ~/.personal-files/documents/Notes/stack.txt' alias pn='vim ~/.personal-files/documents/Notes/stack.txt'
alias writing='cd ~/.personal-files/brain/writing' alias writing='cd ~/.personal-files/brain/writing'
# Projects # Projects