From e5a370ffaa08ab75f5462bd565a1dd473d298c71 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <desk@kremalicious.com>
Date: Sun, 15 Jul 2012 05:26:24 +0200
Subject: [PATCH] aliases in extra file, remove some osx stuff

---
 aliases      | 22 ++++++++++++++++++++++
 bash_profile | 22 ++++++++--------------
 make.sh      |  2 +-
 osx          | 11 +----------
 update.sh    |  2 +-
 5 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 aliases

diff --git a/aliases b/aliases
new file mode 100644
index 0000000..ff175b2
--- /dev/null
+++ b/aliases
@@ -0,0 +1,22 @@
+# ----------------------------------------------------------------------
+#  ALIASES
+# ----------------------------------------------------------------------
+
+alias ll='ls -la'
+
+# Get into some servers FAST. Server, user & port are in .ssh/config
+alias krlc='ssh kremalicious'
+alias mlublogs='ssh mlublogs'
+
+# Terminal needs more Espresso
+alias esp="open -a Espresso"
+
+# Update All The Things
+alias update='sudo softwareupdate -i -a; sudo gem update --system; sudo gem update; brew update; brew upgrade; npm update -g'
+
+# Recursively delete `.DS_Store` files
+alias cleanup="find . -type f -name '*.DS_Store' -ls -delete"
+
+# Show/hide hidden files in Finder
+alias show="defaults write com.apple.Finder AppleShowAllFiles -bool true && killall Finder"
+alias hide="defaults write com.apple.Finder AppleShowAllFiles -bool false && killall Finder"
\ No newline at end of file
diff --git a/bash_profile b/bash_profile
index a9870fb..9e48ba1 100644
--- a/bash_profile
+++ b/bash_profile
@@ -12,7 +12,7 @@
 # Load ~/.private, ~/.bash_prompt
 # ----------------------------------------------------------------------
 
-for file in ~/.{private,bash_prompt}; do
+for file in ~/.{bash_prompt,aliases,private}; do
 	[ -r "$file" ] && source "$file"
 done
 unset file
@@ -21,6 +21,13 @@ unset file
 #  SHELL OPTIONS
 # ----------------------------------------------------------------------
 
+# Append to the Bash history file, rather than overwriting it
+shopt -s histappend
+
+# Prefer US English and use UTF-8
+export LC_ALL="en_US.UTF-8"
+export LANG="en_US"
+
 # fuck that you have new mail shit
 unset MAILCHECK
 
@@ -40,19 +47,6 @@ ANDROID_HOME="/usr/local/Cellar/android-sdk/r20"
 
 export PATH
 
-# ----------------------------------------------------------------------
-#  ALIASES
-# ----------------------------------------------------------------------
-
-alias ll='ls -la'
-# Get into some servers FAST. Server, user & port are in .ssh/config
-alias krlc='ssh kremalicious'
-alias mlublogs='ssh mlublogs'
-# Terminal needs more Espresso
-alias esp="open -a Espresso"
-# Get OS X Software Updates, update Homebrew itself, and upgrade installed Homebrew packages
-alias update='sudo softwareupdate -i -a; sudo gem update --system; sudo gem update; brew update; brew upgrade; npm update -g'
-
 # ----------------------------------------------------------------------
 # LSCOLORS
 # ----------------------------------------------------------------------
diff --git a/make.sh b/make.sh
index f771605..7ee5e9b 100755
--- a/make.sh
+++ b/make.sh
@@ -14,7 +14,7 @@
 # dotfiles directory
 dir=~/.dotfiles
 # list of files/folders to symlink in homedir
-files="bashrc bash_profile bash_prompt gitconfig gitignore_global hushlogin private"
+files="aliases bashrc bash_profile bash_prompt gitconfig gitignore_global hushlogin private"
 
 # ----------------------------------------------------------------------
 # change to the dotfiles directory
diff --git a/osx b/osx
index b2c6084..48ce12b 100755
--- a/osx
+++ b/osx
@@ -27,15 +27,6 @@ defaults write NSGlobalDomain NSDisableAutomaticTermination -bool true
 # Disable auto-correct
 defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false
 
-###############################################################################
-# Screen                                                                      #
-###############################################################################
-
-# Save screenshots to the desktop
-defaults write com.apple.screencapture location -string "$HOME/Desktop"
-
-# Save screenshots in PNG format (other options: BMP, GIF, JPG, PDF, TIFF)
-defaults write com.apple.screencapture type -string "png"
 
 ###############################################################################
 # Finder                                                                      #
@@ -73,7 +64,7 @@ defaults write com.apple.finder WarnOnEmptyTrash -bool false
 chflags nohidden ~/Library
 
 ###############################################################################
-# Dock & hot corners                                                          #
+# Dock 				                                                          #
 ###############################################################################
 
 # Show indicator lights for open applications in the Dock
diff --git a/update.sh b/update.sh
index c95aead..c92dad6 100644
--- a/update.sh
+++ b/update.sh
@@ -14,7 +14,7 @@
 # dotfiles directory
 dir=~/.dotfiles
 # list of files/folders to symlink in homedir
-files="bashrc bash_profile bash_prompt gitconfig gitignore_global hushlogin private"
+files="aliases bashrc bash_profile bash_prompt gitconfig gitignore_global hushlogin private"
 
 # ----------------------------------------------------------------------
 # change to the dotfiles directory