More aliases based on zsh_stats

.aliases

@@ -1,6 +1,6 @@
 alias ....="cd ../../.."
 alias .....="cd ../../../.."
-alias a="ls -l --all"
+alias a="ls -l --human-readable --all --color=auto"
 alias agi="sudo apt-get install"
 alias agl="dpkg --get-selections"
 alias agL="dpkg --listfiles"
@@ -15,31 +15,33 @@ alias fn="map-sshfs netprint /data/www/ netprint && cd ~/Mounts/netprint"
 alias fun="cd && fusermount -u ~/Mounts/netprint"
 alias g="g" # overwrite g alias in git plugin so function will work
 alias ga="git add"
-alias gaa="git add ."
+alias gaa="git add --all"
 alias gc="git commit"
-alias gcf="git commit --file"
+alias gcm="echo Do not specify message at command line.  Use gc"
-alias gcm="git commit --message"
 alias gco="git checkout"
 alias gd="git diff"
-alias gfl="git log -u"
+alias gfl="git log --patch"
 alias gl="git log"
 alias gh="git hist"
 alias ghd="git hist-details"
 alias gr="git reset"
 alias grc="git rm --cached"
 alias grh="git reset --hard"
-alias gri="git rebase -i"
+alias gri="git rebase --interactive"
 alias grm="git rm"
 alias gs="git status"
 alias gw="git diff --check"
 alias Grep='grep'
 alias l="ls"
 alias ll="ls -lv --human-readable --color=auto"
+alias lp="librarian-puppet"
 alias m="more"
+alias md="mkdir"
 alias ms="tmux -S /tmp/pair && chmod 777 /tmp/pair"
 alias mw="tmux attach-session -t work || tmux new-session -s work"
-alias r="rspec spec"
+alias r="ssh"
 alias rd="popd"
+alias rs="bundle exec rspec spec"
 alias sd="pwd | pushd"
 alias s="cd ~/Source"
 alias sfs="map-sshfs"

.vimrc

@@ -16,10 +16,9 @@ Bundle 'kien/ctrlp.vim'
 Bundle 'nathanaelkane/vim-indent-guides'
 Bundle 'rodjek/vim-puppet'
 Bundle 'tpope/vim-fugitive'
-Bundle 'tpope/vim-rails'
+Bundle 'tpope/vim-markdown'
 Bundle 'tpope/vim-repeat'
 Bundle 'tpope/vim-surround'
-Bundle 'vim-scripts/ruby-matchit'
 
 " Options
 set nocompatible          " Disable vi compatibility
@@ -95,25 +94,34 @@ map <Leader>j :wincmd j<cr>
 map <Leader>k :wincmd k<cr>
 map <Leader>l :wincmd l<cr>
 
-" others
+" auto character alignment
+map <Leader>t :Tabularize /
+map <Leader>t> :Tabularize /=><cr>
+map <Leader>te :Tabularize /=<cr>
+
+" vundle
 map <Leader>bi :BundleInstall<cr>
 map <Leader>bu :BundleInstall!<cr>
+
+" copy and paste - for Linux
 map <Leader>c "+
-map <Leader>cs :let @/ = ""<cr>
-map <Leader>fw :FixWhitespace<cr>
-map <Leader>i mmgg=G`m<cr>
-map <Leader>lf :call LargeFileToggle()<cr>
 map <Leader>p "+p
 map <Leader>pm :set paste!<cr>
+
+" others
+" clear search - do not put this comment to the right of ,cs
+map <Leader>cs :let @/ = ""<cr>
+map <Leader>fw :FixWhitespace<cr>
+" indent and return
+map <Leader>i mmgg=G`m<cr>
+map <Leader>lf :call LargeFileToggle()<cr>
+" reload all buffers
 map <Leader>ra :bufdo e!<cr>
 map <Leader>s :e ~/Source/<cr>
 map <Leader>sa :call RenameFile()<cr>
 map <Leader>se :e ~/.vimrc<cr>
 map <Leader>st :call SyntaxToggle()<cr>
 map <Leader>sz :so ~/.vimrc<cr>
-map <Leader>t :Tabularize /
-map <Leader>t> :Tabularize /=><cr>
-map <Leader>te :Tabularize /=<cr>
 map <Leader>ts :sp ~/tool-sharpener.txt<cr>
 
 " Set style
@@ -127,7 +135,7 @@ let g:indent_guides_enable_on_vim_startup=1
 let g:indent_guides_auto_colors=0
 
 " lightline
- let g:lightline = {
+let g:lightline = {
       \ 'colorscheme': 'wombat',
       \ 'active': {
       \   'left': [ [ 'mode', 'paste' ],
@@ -147,16 +155,17 @@ function! LargeFileToggle()
   set relativenumber!
   set cursorline!
   set cursorcolumn!
+  call SyntaxToggle()
 endfunction
 
 " Toggle syntax highlighting
 function! SyntaxToggle()
-   if exists("g:syntax_on")
+  if exists("g:syntax_on")
-     :syntax off
+    :syntax off
-   else
+  else
-     syntax enable
+    syntax enable
-   endif
+  endif
-   call SetColors()
+  call SetColors()
 endfunction
 
 " Rename current file - from github/garybernhardt

tool-sharpener.txt

@@ -1,9 +1,5 @@
-* Auto start tmux
-* * if [[ $STY = '' ]] then mux work; fi
-* * only if not ssh
 * insert-sudo function return to end of line
 * vi mode on command line
 * * set -o vi
 * vim
 * * copy and paste still off on laptop
-* OpenCurrentLineInBrowser() vimscript function