From b5066288d1dc2c70ae0e1ed957f305b18b466713 Mon Sep 17 00:00:00 2001
From: Austen <stonewareslord@gmail.com>
Date: Tue, 29 Jul 2014 15:55:40 -0400
Subject: [PATCH] Removed spaces between = and added g alias

---
 bashrc |  9 ++++++++-
 vimrc  | 50 ++++++++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/bashrc b/bashrc
index 54fc51b..1722f67 100644
--- a/bashrc
+++ b/bashrc
@@ -96,6 +96,7 @@ alias .........='k ../../../../../../../..'
 alias ytdl="youtube-dl $@ -x --audio-format mp3 --audio-quality 0 -c -o '%(title)s.%(ext)s'"
 alias tux="wemux"
 alias rmgit="git remote rm origin;git remote rm https;git remote rm oOrigin;git remote rm oHttps"
+alias g="git $@"
 function mcl(){ mkdir "$@"&&cl "$@"; }
 function cl(){ cd "$@" && ls; }
 function k(){
@@ -104,8 +105,14 @@ function k(){
     cd "$@" && ls
   elif [ "$@" == "-" ] ; then
     cd - && ls
-  else
+  elif [ -f "$@" ] ; then
     vim "$@"
+  else
+    echo -n "Create? "
+    read a
+    if [ ! -z $a ] ; then
+      vim "$@"
+    fi
   fi
 }
 complete -f k
diff --git a/vimrc b/vimrc
index 5783b2e..3fbe354 100644
--- a/vimrc
+++ b/vimrc
@@ -2,7 +2,7 @@ let g:neosnippet#snippets_directory='~/.vim/bundle/snipmate-snippets/snippets'
 if has('conceal')
   set conceallevel=2 concealcursor=i
 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 %
 autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
 autocmd FileType * :hi IndentGuidesOdd guibg=red ctermbg=239
@@ -45,6 +45,8 @@ nnoremap <Leader>else m"kAelse{<Esc>jo}<Esc>`"v><Esc>
 nnoremap <Leader>for m"Ofor(){<Esc>jo}<Esc>`"v><Esc>k^wa
 nnoremap <Leader>while m"Owhile(){<Esc>jo}<Esc>`"v><Esc>k^wa
 nnoremap <Leader>rm m"kddjddkv<<Esc>`"
+nnoremap <Leader># O#{{{<Esc>jo#}}}<Esc>kk^a
+vnoremap <Leader># <Esc>`<O#{{{<Esc>`>o//}}}<Esc>`<k^la
 nnoremap <Leader>{ O//{{{<Esc>jo//}}}<Esc>kk^la
 vnoremap <Leader>{ <Esc>`<O//{{{<Esc>`>o//}}}<Esc>`<k^la
 vnoremap <Leader>if <Esc>`<Oif(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
@@ -86,13 +88,13 @@ vnoremap < <gv
 vnoremap > >gv
 inoremap <F1> <nop>
 vnoremap <F1> <nop>
-noremap <Leader><Tab> :ls<CR>:b
-nnoremap <leader>== yyPv$r=jyypv$r=
-nnoremap <leader>** yyPv$r*jyypv$r*
-nnoremap <leader>= yypv$r=
-nnoremap <leader>- yypv$r-
-nnoremap <leader>^ yypv$r^
-nnoremap <leader>" yypv$r"
+nnoremap <Leader><Tab> :ls<CR>:b
+nnoremap <Leader>== yyPv$r=jyypv$r=
+nnoremap <Leader>** yyPv$r*jyypv$r*
+nnoremap <Leader>= yypv$r=
+nnoremap <Leader>- yypv$r-
+nnoremap <Leader>^ yypv$r^
+nnoremap <Leader>" yypv$r"
 inoremap '' ''<Left>
 inoremap "" ""<Left>
 inoremap () ()<Left>
@@ -144,7 +146,7 @@ set backup
 set backupdir=~/.vim/backup
 set directory=~/.vim/tmp
 set undolevels=1000
-set history=200
+set history=500
 set ttyfast
 set ff=unix
 set encoding=utf-8
@@ -163,18 +165,18 @@ set rtp+=~/.vim/bundle/vundle/
 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"
+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/AndroidStudio.app/sdk/platforms/android-19/*.jar:/home:/home/stonewareslord/applications/adk/sdk/platforms/android-20/*.jar:/home/stonewareslord/AndroidstudioProjects/NCState/app/src/main/bin/classes"
 " These flags don't work for some reason
 " -xn -xc -xl -S
 "let g:airline#extensions#tabline#enabled=1
-let g:Powerline_symbols = 'fancy'
-let g:indent_guides_start_level=2
+let g:Powerline_symbols='fancy'
+let g:indent_guides_start_level=1
 let g:indent_guides_guide_size=1
 let g:indent_guides_enable_on_vim_startup=1
 let g:neocomplcache_enable_at_startup=1
@@ -184,12 +186,12 @@ let g:neocomplcache_enable_underbar_completion=1
 let g:neocomplcache_enable_auto_delimiter=1
 let g:neocomplcache_max_list=20
 let g:neocomplcache_force_overwrite_completefunc=1
-let g:neocomplcache_min_syntax_length = 2
+let g:neocomplcache_min_syntax_length=2
 let g:php_refactor_command='php /usr/local/bin/refactor.phar'
 let g:ctrlp_extensions=['funky']
 "inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
-"let g:neocomplcache_enable_auto_select = 1
-let loaded_matchit = 1
+"let g:neocomplcache_enable_auto_select=1
+let loaded_matchit=1
 filetype off
 call vundle#rc()
 "Bundle 'Floobits/floobits-vim'
@@ -234,7 +236,7 @@ Bundle 'tacahiroy/ctrlp-funky'
 Bundle 'godlygeek/csapprox'
 filetype plugin indent on
 if exists("+undofile")
-  if isdirectory($HOME . '/.vim/undo') == 0
+  if isdirectory($HOME . '/.vim/undo')==0
     :silent !mkdir -p ~/.vim/undo > /dev/null 2>&1
   endif
   set undodir=./.vim-undo//
@@ -245,7 +247,7 @@ augroup vimrcEx
   au!
   " When editing a file, always jump to the last known cursor position.
   autocmd BufReadPost *
-    \ if line("'\"") > 0 && line("'\"") <= line("$") |
+    \ if line("'\"") > 0 && line("'\"") <=line("$") |
     \   exe "normal g`\"" |
     \ endif
 augroup END
@@ -254,7 +256,7 @@ if has('gui_running')
   set lines=40
   "colorscheme fruity
 else
-  if &term == 'xterm' || &term == 'screen'
+  if &term=='xterm' || &term=='screen'
     set t_Co=256
   endif
   "colorscheme torte