From 2ce0ec42c850fa9fbbab5c8de1b47227fc4f4f3e Mon Sep 17 00:00:00 2001
From: nojhan <nojhan@gmail.com>
Date: Sat, 7 Jul 2012 09:54:31 +0200
Subject: [PATCH] clean, comment and classify functions and alias

---
 .bashrc | 124 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 75 insertions(+), 49 deletions(-)

diff --git a/.bashrc b/.bashrc
index 68461ea..8648eca 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,6 +5,10 @@ fi
 #     . /etc/bash_completion
 # fi
 
+##############
+# Networking #
+##############
+
 function proxy()
 {
     export http_proxy="http://localhost:8888"
@@ -14,10 +18,42 @@ function proxy()
 
 function noproxy()
 {
-	export http_proxy=""
-	export ftp_proxy=""
+    export http_proxy=""
+    export ftp_proxy=""
 }
 
+# get the current IP adresses on eth0
+function myip() 
+{
+    MY_IP=$(/sbin/ifconfig eth0 | awk '/inet/ { print $2 } ' | sed -e s/adr:// | sed -e s/inet6://)
+    echo $MY_IP
+}
+
+# baskcup shortcuts
+alias rcp='rsync -avz --ignore-existing --progress --rsh "ssh -l nojhan" '
+alias rcp_443='rsync -avz --ignore-existing --progress --rsh "ssh -p 443 -l nojhan" '
+
+
+###################
+# File management #
+###################
+
+# Find a file with a pattern in name from the current directory
+# ff name
+function ff()
+{ find . -type f -iname '*'$*'*' -ls ; }
+
+# move to ~/.Trash instead of rm a file
+function del()
+{
+    for i in $* ; do
+        mv $i ~/.Trash
+    done
+}
+
+# move backup files to trash
+alias clean='mv *~ ~/.Trash/'
+
 # Prevents accidentally clobbering files.
 alias mv='mv -i'
 alias mkdir='mkdir -p'
@@ -33,29 +69,37 @@ alias l='ls -1'
 alias la='ls -Al'               # show hidden files
 alias lx='ls -lXB'              # sort by extension
 alias lk='ls -lSr'              # sort by size
-alias lc='ls -lcr'          	# sort by change time  
-alias lu='ls -lur'	        	# sort by access time   
+alias lc='ls -lcr'              # sort by change time  
+alias lu='ls -lur'              # sort by access time   
 alias lr='ls -lR'               # recursive ls
 alias lt='ls -ltr'              # sort by date
 alias lm='ls -al --color=none|less'  # pipe through 'less'
 alias ll='ls -l'
-alias tree='tree -Csu'		# nice alternative to 'ls'
+alias tree='tree -Csu'          # nice alternative to 'ls'
+
+# nautilus file manager in browser mode without destkop management
+alias nautile='nautilus --no-desktop --browser'
+
+# Make a directory and move to it
+function md() {
+    mkdir $1
+    cd $1
+}
+
+
+#############
+# Processes #
+#############
 
 alias psg='ps aux|grep ' # grep a process
+
+
+##########
+# Coding #
+##########
+
 alias agrep="ack-grep"
 
-# Find a file with a pattern in name from the current directory
-# ff name
-function ff()
-{ find . -type f -iname '*'$*'*' -ls ; }
-
-# get the current IP adresses on eth0
-function myip() 
-{
-    MY_IP=$(/sbin/ifconfig eth0 | awk '/inet/ { print $2 } ' | sed -e s/adr:// | sed -e s/inet6://)
-    echo $MY_IP
-}
-
 # repeat n times command
 # repeat 10 echo "ok"
 function repeat()
@@ -67,13 +111,16 @@ function repeat()
     done
 }
 
-# move to ~/.Trash instead of rm a file
-function del()
-{
-	for i in $* ; do
-		mv $i ~/.Trash
-	done
-}
+# ipython shell with correct default apps
+alias ipy='ipython -pylab -p scipy --editor="gvim"'
+
+# colored gcc output using the colout command
+alias cgcc="colout :[0-9]+: yellow standard | colout error | colout warning magenta | colout pragma green standard"
+
+
+#################
+# Configuration #
+#################
 
 # alias I want to learn
 function h()
@@ -86,6 +133,7 @@ echo "lu : sort by access time"
 echo "lr : recursive ls"
 echo "lt : sort by date"
 echo "lm : pipe through 'less'"
+echo "md : mkdir, cd"
 echo "tree : nice alternative to 'ls'"
 echo "ff [pattern] : find a file with a pattern in name"
 echo "myip : show the IP address of eth0"
@@ -98,46 +146,24 @@ echo "rcp : copy with rsync/ssh"
 # default editor
 export EDITOR='gvim'
 
-# move backup files to trash
-alias clean='mv *~ ~/.Trash/'
-
 # do not permits to recall dangerous commands in bash history
 export HISTIGNORE='&:[bf]g:exit:*>|*::*rm*-rf*:*rm*-f*'
 # append history rather than overwrite
 shopt -s histappend
+# one command per line
+shopt -s cmdhist
 unset HISTFILESIZE
 HISTSIZE=1000000
 # ignore commands that start with a space AND duplicate commands
 HISTCONTROL=ignoreboth
 # add the full date and time to lines
 HISTTIMEFORMAT='%F %T '
-# one command per line
-shopt -s cmdhist
-# append history rather than overwritting it
-PROMPT_COMMAND='history -a' 
 # store history immediately
 #; history -n'
 
-# baskcup shortcuts
-alias rcp='rsync -avz --ignore-existing --progress --rsh "ssh -l nojhan" '
-alias rcp_443='rsync -avz --ignore-existing --progress --rsh "ssh -p 443 -l nojhan" '
-
-# ipython shell with correct default apps
-alias ipy='ipython -pylab -p scipy --editor="gvim"'
-
-# nautilus file manager in browser mode without destkop management
-alias nautile='nautilus --no-desktop --browser'
-
-# colored gcc output using the colout command
-alias cgcc="colout :[0-9]+: yellow standard | colout error | colout warning magenta | colout pragma green standard"
-
+# Manually switch to the bépo keyboard layout
 alias bepo="setxkbmap -layout fr -variant bepo -option"
 
-function md() {
-    mkdir $1
-    cd $1
-}
-
 # Super nice prompt
 source ~/.prompt.bash