Move a bunch of stuff around. fix fullscreen emacs issue.

dotfiles/lib/shellrc/colors.sh

@@ -1,3 +0,0 @@
-dircolors_file="$HOME/.dircolors"
-
-[ ! -z "$SHELL" ] && test -r $dircolors_files  && eval "$(dircolors $dircolors_file)"

dotfiles/lib/shellrc/emacs.sh

@@ -1,13 +1,17 @@
-alias emacs='cemacs'
-alias cemacs='_emacs -c -n'
-alias temacs='_emacs -t'
+alias emacs='temacs'
+is_osx && alias emacs='cocoa_emacs'
+alias terminal_emacs='_emacs -t'
 alias ec='_emacs -n '
 
+function cocoa_emacs {
+    reattach-to-user-namespace zsh -c "source ~/.zshrc && _emacs -c -n"
+}
+
 function _emacs {
     local server_name="$(_current_dot_directory)"
     if ! _emacs_daemon_exists "$server_name"; then
         echo "Starting emacs with server name '$server_name'"
-        \emacs --daemon="$server_name"
+        command emacs --daemon="$server_name"
     fi
     emacsclient $* --server-file=$server_name
 }

dotfiles/lib/shellrc/osx.sh

@@ -75,3 +75,11 @@ function set_modifier_keys_on_all_keyboards() {
 function get_keyboard_vendor_id_product_id_pairs() {
     ioreg -n IOHIDKeyboard -r | grep -e 'class IOHIDKeyboard' -e VendorID\" -e Product | gawk 'BEGIN { RS = "class IOHIDKeyboard" } match($0, /VendorID. = ([0-9]*)/, arr) { printf arr[1]} match($0, /ProductID. = ([0-9]*)/, arr) { printf " %s\n", arr[1]} '
 }
+
+function set_osx_hostname() {
+    local new_hostname="${1-imalison}"
+    sudo scutil --set ComputerName $new_hostname
+    sudo scutil --set HostName $new_hostname
+    sudo scutil --set LocalHostName $new_hostname
+    sudo defaults write /Library/Preferences/SystemConfiguration/com.apple.smb.server NetBIOSName -string $new_hostname
+}

dotfiles/lib/shellrc/vim.sh

@@ -1,3 +0,0 @@
-function vimstall() {
-    vim +BundleInstall! +q +q
-}