Added adk command and disabled vim automatic comments

This commit is contained in:
Austen Adler 2014-07-14 12:57:10 -04:00
parent 4b755ea54a
commit e4e9605e76
2 changed files with 4 additions and 2 deletions

1
bashrc
View File

@ -117,6 +117,7 @@ alias mv="mv -v"
alias la='ls -lah $LS_COLOR' alias la='ls -lah $LS_COLOR'
alias dt='date "+%F %T"' alias dt='date "+%F %T"'
alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done' alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done'
alias adk='/home/stonewareslord/applications/adk/bin/studio.sh>/dev/null&'
alias resource='. ~/.bashrc' alias resource='. ~/.bashrc'
alias install='sudo apt-get install' alias install='sudo apt-get install'
alias search='sudo apt-cache search' alias search='sudo apt-cache search'

5
vimrc
View File

@ -4,6 +4,7 @@ if has('conceal')
endif endif
nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/ = /= nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/ = /=
command! W %!sudo tee > /dev/null % command! W %!sudo tee > /dev/null %
autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
au VimResized * exe "normal! \<c-w>=" au VimResized * exe "normal! \<c-w>="
"match Error /\s\+$/ "match Error /\s\+$/
"nnoremap s xa "nnoremap s xa
@ -11,8 +12,8 @@ au VimResized * exe "normal! \<c-w>="
inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Right>" inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Right>"
imap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>" imap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>" smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
nnoremap <C-w>\| <C-w>v nnoremap <C-w>\| <C-w>v<C-w>l
nnoremap <C-w>- <C-w>s nnoremap <C-w>- <C-w>s<C-w>j
nnoremap <C-d> <C-w>q nnoremap <C-d> <C-w>q
nnoremap <F3> :!make&&echo "Uploading robot code";wput ./PPC603gnu/src/Debug/src.out ftp://frc:frc@10.20.59.2/ni-rt/system/FRC_UserProgram.out<CR> nnoremap <F3> :!make&&echo "Uploading robot code";wput ./PPC603gnu/src/Debug/src.out ftp://frc:frc@10.20.59.2/ni-rt/system/FRC_UserProgram.out<CR>
nnoremap G G$ nnoremap G G$