|  | @@ -6,8 +6,11 @@ PS1='\[\e[1;32m\]\u@\h \W\$ \[\e[0m\]'
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  # ls pleasantness
 | 
	
		
			
				|  |  |  alias l='\ls --color=auto'
 | 
	
		
			
				|  |  | -alias ls='ls -a --color=auto'
 | 
	
		
			
				|  |  | -alias lls='ls -alh --color=auto'
 | 
	
		
			
				|  |  | +alias ls='ls --color=auto'
 | 
	
		
			
				|  |  | +alias la='ls -a --color=auto'
 | 
	
		
			
				|  |  | +alias lsa='ls -a --color=auto'
 | 
	
		
			
				|  |  | +alias lls='ls -lh --color=auto'
 | 
	
		
			
				|  |  | +alias ll='ls -lh --color=auto'
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  # grep the entirety of the history
 | 
	
		
			
				|  |  |  alias hg='history | grep'
 | 
	
	
		
			
				|  | @@ -18,22 +21,6 @@ export VISUAL=vim
 | 
	
		
			
				|  |  |  # local folder in PATH 
 | 
	
		
			
				|  |  |  export PATH=$HOME/bin:$PATH
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -# Flags used for CS243 "Mechanics of Programming"
 | 
	
		
			
				|  |  | -alias gcc='gcc -std=c99 -Wall -ggdb -Wextra -pedantic'
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -# Functions for converting between hex and decimal
 | 
	
		
			
				|  |  | -h2d(){
 | 
	
		
			
				|  |  | -    echo "ibase=16; $@"|bc
 | 
	
		
			
				|  |  | -  }
 | 
	
		
			
				|  |  | -d2h(){
 | 
	
		
			
				|  |  | -    echo "obase=16; $@"|bc
 | 
	
		
			
				|  |  | -}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  # alias for vim muscle memory when quitting
 | 
	
		
			
				|  |  |  alias :q='exit'
 | 
	
		
			
				|  |  | -alias :e='vim'
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -# allow X forwarding in Cygwin
 | 
	
		
			
				|  |  | -if [ $(uname -o) == "Cygwin" ]; then
 | 
	
		
			
				|  |  | -    export DISPLAY=:0
 | 
	
		
			
				|  |  | -fi
 |