From a948075cd4d8b3fb660dad2c13f42dd4076354af Mon Sep 17 00:00:00 2001 From: Austen Date: Mon, 7 Jul 2014 19:15:55 -0400 Subject: [PATCH 1/3] Removed gitignore_global from sync.sh and from directory --- gitignore_global | 0 sync.sh | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 gitignore_global diff --git a/gitignore_global b/gitignore_global deleted file mode 100644 index e69de29..0000000 diff --git a/sync.sh b/sync.sh index 411ec72..52bcd3b 100755 --- a/sync.sh +++ b/sync.sh @@ -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 From 75c876d257dc15bc399b6f7d678d50513a2322a5 Mon Sep 17 00:00:00 2001 From: Austen Date: Tue, 8 Jul 2014 00:41:20 -0400 Subject: [PATCH 2/3] Fixed vimrc au BufWritePostcl sync! sync.sh -b now automatically runs BundleClean. In vimrc, formatted bundles, Added {|,-} commands, command, fixed vnoremap L. Added to move right in insert mode. Changed airline config. --- bashrc | 1 + sync.sh | 2 +- vimrc | 34 +++++++++++++++++++++------------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/bashrc b/bashrc index b545181..4fdfb79 100644 --- a/bashrc +++ b/bashrc @@ -99,6 +99,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' diff --git a/sync.sh b/sync.sh index 411ec72..3945874 100755 --- a/sync.sh +++ b/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 diff --git a/vimrc b/vimrc index 29603a1..c538217 100644 --- a/vimrc +++ b/vimrc @@ -4,7 +4,6 @@ if has('conceal') endif nnoremap autoformat! :%s/, /,:%s/ \/ /\/:%s/ {/{:%s/} /}:%s/ = /= command! W %!sudo tee > /dev/null % -au BufWritePost .vimrc so ~/.vimrc au VimResized * exe "normal! \=" "match Error /\s\+$/ "nnoremap s xa @@ -12,8 +11,9 @@ au VimResized * exe "normal! \=" inoremap pumvisible() ? "\" : "\" imap \ neosnippet#expandable_or_jumpable() ? "\(neosnippet_expand_or_jump)" : pumvisible() ? "\" : "\" smap \ neosnippet#expandable_or_jumpable() ? "\(neosnippet_expand_or_jump)" : "\" -"nnoremap | v -"nnoremap - s +nnoremap \| v +nnoremap - s +nnoremap q nnoremap :!make&&echo "Uploading robot code";wput ./PPC603gnu/src/Debug/src.out ftp://frc:frc@10.20.59.2/ni-rt/system/FRC_UserProgram.out 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 @@ -101,6 +101,7 @@ inoremap inoremap inoremap inoremap +inoremap nnoremap Y y$ set guicursor+=n-v-c:blinkon0 set formatoptions-=r @@ -127,11 +128,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 +173,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 +192,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 From 7e82933b255b375b7f6d7941d86e4dfe13d5fe31 Mon Sep 17 00:00:00 2001 From: Austen Date: Wed, 9 Jul 2014 15:57:52 -0400 Subject: [PATCH 3/3] Fixed vimrc and added nload to desktop and server.txt --- desktop.txt | 1 + server.txt | 1 + vimrc | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/desktop.txt b/desktop.txt index 9338f95..6916e0d 100644 --- a/desktop.txt +++ b/desktop.txt @@ -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 diff --git a/server.txt b/server.txt index 6c29646..3d47794 100644 --- a/server.txt +++ b/server.txt @@ -31,3 +31,4 @@ lynx-cur lm-sensors openvpn autojump +nload diff --git a/vimrc b/vimrc index c538217..ca46a0c 100644 --- a/vimrc +++ b/vimrc @@ -8,7 +8,7 @@ au VimResized * exe "normal! \=" "match Error /\s\+$/ "nnoremap s xa "nnoremap :UndotreeToggle -inoremap pumvisible() ? "\" : "\" +inoremap pumvisible() ? "\" : "\" imap \ neosnippet#expandable_or_jumpable() ? "\(neosnippet_expand_or_jump)" : pumvisible() ? "\" : "\" smap \ neosnippet#expandable_or_jumpable() ? "\(neosnippet_expand_or_jump)" : "\" nnoremap \| v @@ -101,7 +101,6 @@ inoremap inoremap inoremap inoremap -inoremap nnoremap Y y$ set guicursor+=n-v-c:blinkon0 set formatoptions-=r @@ -227,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 W :%s/\s\+$//:let @/='' nnoremap H *:AckFromSearch!