Merge branch 'master' of austenwares.com:stonewareslord/sync

Conflicts:
	scripts/server.txt

scripts/desktop.txt

@@ -17,7 +17,7 @@ gparted
 mysql-workbench
 wireshark
 unetbootin
-exiv2
+#exiv2
 xdotool
 htop
 #wicd-daemon

scripts/server.txt

@@ -78,3 +78,4 @@ hfsprogs
 vifm
 git-annex
 ranger
+pwgen

shells/zshrc

@@ -13,8 +13,6 @@ SAVEHIST=10000000
 setopt HIST_EXPIRE_DUPS_FIRST
 setopt EXTENDED_HISTORY
 # export PAGER=/usr/bin/w3m
-export PAGER=/usr/bin/less
-alias less=$PAGER
 source "$HOME/.antigen/antigen.zsh"
 antigen bundle stonewareslord/oh-my-git
 #antigen bundle arialdomartini/oh-my-git
@@ -53,9 +51,9 @@ alias l='ls -CF'
 alias logout='sudo pkill -u $USER'
 alias fixsh='ssh-keygen -R'
 alias tmux='tmux -2'
-#alias less='less -r'
+alias less='less -R'
 alias tree='tree -C'
-#alias grep="egrep -i --color=auto"
+alias grep="grep -P"
 alias skim="(head -5; tail -5) <"
 function cp() { rsync -ha --info=progress2 "$@" }
 function c() { cp "$@" }

vim/vimrc

@@ -26,6 +26,7 @@ nnoremap <F3> :!make&&echo "Uploading robot code";wput ./PPC603gnu/src/Debug/src
 nnoremap G G$
 vnoremap G G$
 nnoremap <F5> :GundoToggle<CR>
+nnoremap <F6> :argdo normal <CR>
 nnoremap <F8> :TagbarToggle<CR>
 nnoremap + <C-a>
 nnoremap - <C-x>
@@ -174,6 +175,7 @@ set gdefault
 set nocompatible
 set rtp+=~/.vim/bundle/vundle/
 set ignorecase
+set textwidth=0
 syntax on
 let g:airline_left_sep='▶'
 let g:airline_right_sep='◀'