Merge branch 'master' of 98.26.78.121:stonewareslord/Sync
Merging from MacMiniUbuntu
This commit is contained in:
commit
4b755ea54a
1
bashrc
1
bashrc
@ -100,6 +100,7 @@ if [ -x /usr/bin/dircolors ]; then
|
||||
alias egrep='egrep --color=auto'
|
||||
fi
|
||||
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
||||
alias vim='vim +"au BufWritePost .vimrc so ~/.vimrc" +"au BufWritePost vimrc so ~/.vimrc"'
|
||||
alias disphost='export DISPLAY=:0.0'
|
||||
alias ll='ls -alF'
|
||||
alias la='ls -A'
|
||||
|
||||
@ -65,6 +65,7 @@ owncloud-client
|
||||
exiv2
|
||||
xdotool
|
||||
htop
|
||||
nload
|
||||
#IN STARTUP ITEMS: gtk-redshift -l 36.3:-80.3 -t 6500:4000
|
||||
#FOR CAFFEINE sudo add-apt-repository ppa:caffeine-developers/ppa
|
||||
#caffeine
|
||||
|
||||
@ -31,3 +31,4 @@ lynx-cur
|
||||
lm-sensors
|
||||
openvpn
|
||||
autojump
|
||||
nload
|
||||
|
||||
5
sync.sh
5
sync.sh
@ -26,7 +26,7 @@ while getopts ":hbsdtclw" VALUE "$@"; do
|
||||
echo "Installing vundle"
|
||||
git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
|
||||
fi
|
||||
vim +BundleInstall +qa
|
||||
vim +BundleClean +BundleInstall +qa
|
||||
fi
|
||||
if [ "$VALUE" = "s" ] ; then
|
||||
if [ "$(uname)" != "Darwin" ]; then
|
||||
@ -58,8 +58,7 @@ while getopts ":hbsdtclw" VALUE "$@"; do
|
||||
fi
|
||||
if [ "$VALUE" = "c" ] ; then
|
||||
echo "Syncing config files"
|
||||
rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.gitignore_global ~/.bashrc
|
||||
ln -s ${PWD}/gitignore_global ~/.gitignore_global
|
||||
rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.bashrc
|
||||
ln -s ${PWD}/vimrc ~/.vimrc
|
||||
ln -s ${PWD}/vimperatorrc ~/.vimperatorrc
|
||||
ln -s ${PWD}/gitconfig ~/.gitconfig
|
||||
|
||||
40
vimrc
40
vimrc
@ -4,16 +4,16 @@ if has('conceal')
|
||||
endif
|
||||
nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/ = /=
|
||||
command! W %!sudo tee > /dev/null %
|
||||
au BufWritePost .vimrc so ~/.vimrc
|
||||
au VimResized * exe "normal! \<c-w>="
|
||||
"match Error /\s\+$/
|
||||
"nnoremap s xa
|
||||
"nnoremap <F5> :UndotreeToggle<CR>
|
||||
inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<TAB>"
|
||||
inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Right>"
|
||||
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>"
|
||||
"nnoremap <C-w>| <C-w>v
|
||||
"nnoremap <C-w>- <C-w>s
|
||||
nnoremap <C-w>\| <C-w>v
|
||||
nnoremap <C-w>- <C-w>s
|
||||
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 G G$
|
||||
vnoremap G G$
|
||||
@ -62,7 +62,7 @@ vnoremap gk k
|
||||
vnoremap j gj
|
||||
vnoremap k gk
|
||||
vnoremap H ^
|
||||
vnoremap L $
|
||||
vnoremap L $h
|
||||
nnoremap gj j
|
||||
nnoremap gk k
|
||||
nnoremap j gj
|
||||
@ -127,11 +127,18 @@ set history=200
|
||||
set ttyfast
|
||||
set ff=unix
|
||||
syntax on
|
||||
let g:airline_left_sep='▶'
|
||||
let g:airline_right_sep='◀'
|
||||
let g:airline#extensions#syntastic#enabled = 1
|
||||
let g:airline#extensions#whitespace#enabled = 0
|
||||
let g:airline#extensions#whitespace#show_message = 0
|
||||
let g:airline#extensions#tmuxline#enabled = 1
|
||||
let g:formatprg_cpp = "astyle"
|
||||
let g:formatprg_args_expr_cpp = " --mode=c --style=1tbs -xe -k1 -j"
|
||||
let g:syntastic_java_javac_classpath = "/Applications/Android Studio.app/sdk/platforms/android-19/*.jar"
|
||||
" These flags don't work for some reason
|
||||
" -xn -xc -xl -S
|
||||
let g:airline#extensions#tabline#enabled=1
|
||||
"let g:airline#extensions#tabline#enabled=1
|
||||
let g:Powerline_symbols = 'fancy'
|
||||
set encoding=utf-8
|
||||
set laststatus=2
|
||||
@ -165,7 +172,6 @@ filetype off " required!
|
||||
set rtp+=~/.vim/bundle/vundle/
|
||||
call vundle#rc()
|
||||
Bundle 'gmarik/vundle'
|
||||
"Bundle 'Floobits/floobits-vim'
|
||||
Bundle 'Chiel92/vim-autoformat'
|
||||
Bundle 'tpope/vim-surround'
|
||||
Bundle 'scrooloose/syntastic'
|
||||
@ -185,20 +191,21 @@ Bundle 'spf13/vim-colors'
|
||||
Bundle 'spf13/PIV'
|
||||
Bundle 'vim-scripts/AutoTag'
|
||||
Bundle 'Lokaltog/vim-easymotion'
|
||||
"Bundle 'tsaleh/vim-matchit'
|
||||
Bundle 'mbbill/undotree'
|
||||
Bundle 'vim-php/vim-php-refactoring'
|
||||
Bundle 'tpope/vim-fugitive'
|
||||
Bundle 'kien/ctrlp.vim'
|
||||
"Bundle 'vim-scripts/YankRing.vim'
|
||||
Bundle 'majutsushi/tagbar'
|
||||
Bundle 'sjl/gundo.vim'
|
||||
Bundle 'tommcdo/vim-exchange'
|
||||
Bundle 'tpope/vim-repeat'
|
||||
Bundle 'tpope/vim-commentary'
|
||||
Bundle 'mbbill/undotree'
|
||||
Bundle 'vim-php/vim-php-refactoring'
|
||||
Bundle 'tpope/vim-fugitive'
|
||||
Bundle 'kien/ctrlp.vim'
|
||||
"Bundle 'Floobits/floobits-vim'
|
||||
"Bundle 'tsaleh/vim-matchit'
|
||||
"Bundle 'Shougo/neosnippet'
|
||||
"Bundle 'honza/vim-snippets'
|
||||
"Bundle 'msanders/snipmate.vim'
|
||||
"Bundle 'vim-scripts/YankRing.vim'
|
||||
"Bundle 'majutsushi/tagbar'
|
||||
filetype plugin indent on
|
||||
if exists("+undofile")
|
||||
if isdirectory($HOME . '/.vim/undo') == 0
|
||||
@ -219,12 +226,13 @@ augroup END
|
||||
if has('gui_running')
|
||||
set guioptions-=T
|
||||
set lines=40
|
||||
colorscheme fruity
|
||||
"colorscheme fruity
|
||||
else
|
||||
if &term == 'xterm' || &term == 'screen'
|
||||
set t_Co=256
|
||||
endif
|
||||
colorscheme torte
|
||||
"colorscheme torte
|
||||
endif
|
||||
colorscheme fruity
|
||||
nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr>
|
||||
nnoremap <Leader>H *<C-O>:AckFromSearch!<CR>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user