Merge branch 'release/2.0.0' into develop

HoontDMoon · Jun 15, 2014 · 0680b12 · 0680b12
2 parents bfc699b + abb409a
commit 0680b12
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 9 deletions.
diff --git a/.dotzsh b/.dotzsh
@@ -1 +1 @@
-1.0.0
+2.0.0
diff --git a/.gitmodules b/.gitmodules
@@ -32,3 +32,6 @@
 [submodule "modules/autosuggestions/external"]
 	path = modules/autosuggestions/external
 	url = https://github.com/tarruda/zsh-autosuggestions.git
+[submodule "modules/docker/external"]
+	path = modules/docker/external
+	url = https://github.com/felixr/docker-zsh-completion.git
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,7 @@
 dotzsh changelog
 ----------------
 
+  - 2.0.0  : Base16 and bugfixes
   - 1.0.0  : Intitial stable release
   - 0.2.x  : Bugfixes
   - 0.1.x  : Initial releases

diff --git a/modules/autoenv/external b/modules/autoenv/external
diff --git a/modules/completion/external b/modules/completion/external
diff --git a/modules/docker/external b/modules/docker/external
diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
@@ -122,9 +122,6 @@ alias myip='curl ifconfig.me'
 # IP addresses
 alias ips="ifconfig -a | grep -o 'inet6\? \(addr:\)\?\s\?\(\(\([0-9]\+\.\)\{3\}[0-9]\+\)\|[a-fA-F0-9:]\+\)' | awk '{ sub(/inet6? (addr:)? ?/, \"\"); print }'"
 
-# Enhanced WHOIS lookups
-alias whois="whois -h whois-servers.net"
-
 ### Functions
 
 # Serves a directory via HTTP.
@@ -238,3 +235,16 @@ function whiteboard_clean() {
   convert "$1" -resize %50 -morphology Convolve DoG:15,100,0 -negate -normalize -blur 0x1 -channel RBG -level 60%,91%,0.1 "$2"
 }
 
+# ctrl+z to fg
+fancy-ctrl-z () {
+  if [[ $#BUFFER -eq 0 ]]; then
+    fg
+    zle redisplay
+  else
+    zle push-input
+    zle clear-screen
+  fi
+}
+zle -N fancy-ctrl-z
+bindkey '^Z' fancy-ctrl-z
+
diff --git a/modules/zaw/external b/modules/zaw/external
diff --git a/themes/dotphiles/prompt/prompt_dotphiles_setup b/themes/dotphiles/prompt/prompt_dotphiles_setup
@@ -177,11 +177,11 @@ function +vi-hg-branchhead() {
 
 function get_hostname_color() {
     local chash=0
-    hostcolors=( red orange yellow cyan blue magenta brcyan )
+    hostcolors=( red orange yellow cyan magenta brcyan )
     foreach letter ( ${(ws::)HOSTNAME} )
         (( chash += #letter ))
     end
-    local crand=$(( $chash % 7 ))
+    local crand=$(( $chash % 6 ))
     local crandname=$hostcolors[$crand+1]
     echo "$crandname"
 }
+1 −1		README.md
+53 −0		src/_artisan
+3 −3		src/_atach
+1 −0		src/_brew
+76 −0		src/_composer
+53 −0		src/_console
+67 −0		src/_envoy
+17 −16		src/_eselect
+63 −0		src/_glances
+247 −0		src/_iw
+1 −1		src/_jekyll
+85 −0		src/_kitchen
+116 −0		src/_pass
+94 −0		src/_phing
+102 −0		src/_ps
+58 −0		src/_rubocop
+71 −0		src/_shutdown
+3 −2		src/_vagrant
+278 −0		src/_virsh
+10 −0		src/_virtualbox
+196 −0		src/_xinput
+3 −1		src/_yaourt
+597 −0		src/_zfs
+440 −0		zsh-completions-howto.org
+5 −1		functions/filter-select
+5 −1		sources/process.zsh
+7 −0		sources/tmux.zsh