Permalink
Browse files

Rearranged zsh and system configurations.

  • Loading branch information...
1 parent 09193a2 commit deed29bd39b1a701e902ebacec4a95ee04e54c3d @ggamel committed Jan 21, 2013
Showing with 58 additions and 15 deletions.
  1. +1 −0 system/grep.zsh
  2. 0 { → system}/osx/new-osx.sh
  3. +4 −0 system/path.zsh
  4. +14 −2 zsh/aliases.zsh
  5. +0 −2 zsh/common.zsh
  6. +7 −0 zsh/completion.zsh
  7. +2 −0 zsh/fpath.zsh
  8. +6 −0 zsh/ssh.zsh
  9. +24 −11 zsh/zshrc.symlink
View
@@ -0,0 +1 @@
+export GREP_OPTIONS='--color=auto'
File renamed without changes.
View
@@ -0,0 +1,4 @@
+export PATH="$HOME/.dotfiles/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin/npm:/usr/local/share/npm/bin"
+
+export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man"
+export NODE_PATH="/usr/local/lib/node"
View
@@ -1,7 +1,7 @@
alias cls='clear'
alias reload!='. ~/.zshrc'
-# Term Shortcuts to make life easier
+# Terminal Shortcuts to make life easier
alias d="cd ~/Do && open ~/Do && open /Applications/Sublime\ Text\ 2.app && open /Applications/CodeKit.app && open /Applications/Gitbox.app"
alias dot="cd ~/.dotfiles"
@@ -13,6 +13,18 @@ alias rdio="open /Applications/Rdio.app"
# Get all bukk.it images
alias bukkit="wget -r -nc -e robots=off --wait 0.25 -A.jpeg,jpg,bmp,gif,png -P ~/Dropbox/IMGs http://bukk.it"
+# Unicode emotions; WHY DO I HAVE THESE FEELS!?
+alias srs="echo '\n ಠ_ಠ\n' | pbcopy"
+alias srsheh="echo '\n ಠ‿ಠ\n' | pbcopy"
+alias srsmad="echo '\n ಠ▃ಠ\n' | pbcopy"
+alias srswha="echo '\n ಠ.ಠ\n' | pbcopy"
+alias flip="echo '\n(╯°□°)╯︵ ┻━┻\n' | pbcopy"
+alias flipsrs="echo '\n(╯ಠ▃ಠ)╯︵ ┻━┻\n' | pbcopy"
+alias flipfix="echo '\n(┬──┬ ノ( ゜-゜ノ)\n' | pbcopy"
+alias crysrs="echo '\n ಥ_ಥ\n' | pbcopy"
+alias crywobble="echo '\n ಥ﹏ಥ\n' | pbcopy"
+alias yeaaaaaah="echo '\n •_•)\n( •_•)>⌐■-■\n(⌐■_■)\n' | pbcopy"
+
# IP addresses
alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
alias localip_wifi="ipconfig getifaddr en0"
@@ -43,5 +55,5 @@ alias hide="defaults write com.apple.Finder AppleShowAllFiles -bool false && kil
alias hidedesktop="defaults write com.apple.finder CreateDesktop -bool false && killall Finder"
alias showdesktop="defaults write com.apple.finder CreateDesktop -bool true && killall Finder"
-# Let's update all the things (OS X, Homebrew, Gems, npm)
+# Let's update all the things (OS X, Homebrew, Ruby Gems, npm)
alias update='sudo softwareupdate -i -a; brew update; brew upgrade; gem update --system; gem update; npm update npm -g; npm update -g'
View
@@ -1,7 +1,5 @@
export EDITOR='subl'
-alias cls="clear"
-
function colours() {
for i in {0..255} ; do
printf "\x1b[38;5;${i}mcolour${i}\n"
View
@@ -3,3 +3,10 @@ zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
# pasting with tabs doesn't perform completion
zstyle ':completion:*' insert-tab pending
+
+# Verbose complettion
+zstyle ':completion:*' verbose yes
+zstyle ':completion:*:descriptions' format '%B%d%b'
+zstyle ':completion:*:messages' format '%d'
+zstyle ':completion:*:warnings' format 'No matches for: %d'
+zstyle ':completion:*' group-name ''
View
@@ -0,0 +1,2 @@
+# #add each topic folder to fpath so that they can add functions and completion scripts
+for topic_folder ($ZSH/*) if [ -d $topic_folder ]; then fpath=($topic_folder $fpath); fi;
View
@@ -0,0 +1,6 @@
+# Remove the hosts that I don't want to keep around- in this case, only
+# keep the first host. Like a boss.
+alias hosts='head -2 ~/.ssh/known_hosts | tail -1 > ~/.ssh/known_hosts'
+
+# Pipe my public key to my clipboard
+alias pubkey='more ~/.ssh/id_rsa.pub | pbcopy | echo "=> Public key copied to pasteboard."'
View
@@ -1,20 +1,28 @@
-export PATH="$HOME/.dotfiles/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11/bin:$HOME/.rbenv/bin:/usr/local/bin/npm:/usr/local/share/npm/bin:$PATH"
-
-export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
-export NODE_PATH="/usr/local/lib/node"
-
-# Let's connect rbenv
-eval "$(rbenv init -)"
-
# shortcut to this dotfiles path is $ZSH
export ZSH=$HOME/.dotfiles
export DOTFILES=$HOME/.dotfiles
+# export NGINX_PATH=/opt/nginx
+# export PGDATA=/usr/local/var/postgres
+
# Do folder
export PROJECTS=~/Do
-# source every .zsh file in this rep
-for config_file ($ZSH/**/*.zsh) [[ "$(basename $config_file)" == "completion.zsh" ]] || source $config_file
+# all of our zsh files
+typeset -U config_files
+config_files=($ZSH/**/*.zsh)
+
+# source path files
+for file in ${(M)config_files:#*/path.zsh}
+do
+ source $file
+done
+
+# source every .zsh file but path and completion in the repo.
+for file in ${${config_files:#*/path.zsh}:#*/completion.zsh}
+do
+ source $file
+done
# use .localrc for SUPER SECRET CRAP that you don't
# want in your public, versioned repo.
@@ -28,4 +36,9 @@ autoload -U compinit
compinit
# load every completion after autocomplete loads
-for config_file ($ZSH/**/completion.sh) source $config_file
+for file in ${(M)config_files:#*/completion.zsh}
+do
+ source $file
+done
+
+unset config_files

0 comments on commit deed29b

Please sign in to comment.