Merge branch 'master' of https://github.com/holman/dotfiles

dobau · May 6, 2017 · ea6bcb4 · ea6bcb4
2 parents 45257e1 + f75397b
commit ea6bcb4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/script/bootstrap b/script/bootstrap
@@ -144,7 +144,7 @@ install_dotfiles
 if [ "$(uname -s)" == "Darwin" ]
 then
   info "installing dependencies"
-  if source bin/dot > /tmp/dotfiles-dot 2>&1
+  if source bin/dot | while read -r data; do info "$data"; done
   then
     success "dependencies installed"
   else

diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
@@ -55,7 +55,10 @@ directory_name() {
 }
 
 battery_status() {
-  $ZSH/bin/battery-status
+  if [[ $(sysctl -n hw.model) == *"Book"* ]]
+  then
+    $ZSH/bin/battery-status
+  fi
 }
 
 export PROMPT=$'\n$(battery_status)in $(directory_name) $(git_dirty)$(need_push)\n› '

diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
@@ -39,3 +39,12 @@ do
 done
 
 unset config_files
+
+# Better history
+# Credits to https://coderwall.com/p/jpj_6q/zsh-better-history-searching-with-arrow-keys
+autoload -U up-line-or-beginning-search
+autoload -U down-line-or-beginning-search
+zle -N up-line-or-beginning-search
+zle -N down-line-or-beginning-search
+bindkey "^[[A" up-line-or-beginning-search # Up
+bindkey "^[[B" down-line-or-beginning-search # Down