From 0331a6f77952347c0951d23f6809661fa5249493 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 14 Aug 2017 23:37:35 +0200
Subject: [PATCH] adjust things my way

---
 aliases                          | 22 +++++-----
 zsh/completion/_ag               |  7 ----
 zsh/completion/_bundler          | 72 --------------------------------
 zsh/completion/_production       |  2 -
 zsh/completion/_rspec            |  3 --
 zsh/completion/_staging          |  2 -
 zsh/configs/color.zsh            |  3 --
 zsh/configs/fzf.zsh              |  1 +
 zsh/configs/keybindings.zsh      | 12 ------
 zsh/configs/post/completion.zsh  |  2 +-
 zsh/configs/post/path.zsh        |  7 ++--
 zsh/configs/prompt.zsh           |  2 +-
 zsh/functions/_git_delete_branch |  4 --
 zsh/functions/change-extension   |  9 ----
 zsh/functions/envup              | 10 -----
 15 files changed, 18 insertions(+), 140 deletions(-)
 delete mode 100644 zsh/completion/_ag
 delete mode 100644 zsh/completion/_bundler
 delete mode 100644 zsh/completion/_production
 delete mode 100644 zsh/completion/_rspec
 delete mode 100644 zsh/completion/_staging
 create mode 100644 zsh/configs/fzf.zsh
 delete mode 100644 zsh/functions/_git_delete_branch
 delete mode 100644 zsh/functions/change-extension
 delete mode 100644 zsh/functions/envup

diff --git a/aliases b/aliases
index 102caca..26079a3 100644
--- a/aliases
+++ b/aliases
@@ -1,16 +1,16 @@
 # Unix
-alias ll="ls -al"
-alias ln="ln -v"
-alias mkdir="mkdir -p"
-alias e="$EDITOR"
-alias v="$VISUAL"
+alias ls='ls --color=tty'
+alias ll='ls -al'
+alias ln='ln -v'
+alias mkdir='mkdir -p'
+alias e='$EDITOR'
+alias v='$VISUAL'
+alias _='sudo'
+alias nohist='unset HISTFILE'
 
-# Bundler
-alias b="bundle"
-
-# Rails
-alias migrate="rake db:migrate db:rollback && rake db:migrate db:test:prepare"
-alias s="rspec"
+alias ta='tmux attach -t'
+alias ts='tmux new-session -s'
+alias tl='tmux list-sessions'
 
 # Pretty print the path
 alias path='echo $PATH | tr -s ":" "\n"'
diff --git a/zsh/completion/_ag b/zsh/completion/_ag
deleted file mode 100644
index 0d990d6..0000000
--- a/zsh/completion/_ag
+++ /dev/null
@@ -1,7 +0,0 @@
-#compdef ag
-
-if (( CURRENT == 2 )); then
-  compadd $(cut -f 1 tmp/tags .git/tags 2>/dev/null)
-else;
-  _files
-fi
diff --git a/zsh/completion/_bundler b/zsh/completion/_bundler
deleted file mode 100644
index bb8cbf1..0000000
--- a/zsh/completion/_bundler
+++ /dev/null
@@ -1,72 +0,0 @@
-#compdef bundle
-
-local curcontext="$curcontext" state line _gems _opts ret=1
-
-_arguments -C -A "-v" -A "--version" \
-  '(- 1 *)'{-v,--version}'[display version information]' \
-  '1: :->cmds' \
-  '*:: :->args' && ret=0
-
-case $state in
-  cmds)
-    _values "bundle command" \
-      "install[Install the gems specified by the Gemfile or Gemfile.lock]" \
-      "update[Update dependencies to their latest versions]" \
-      "package[Package the .gem files required by your application]" \
-      "exec[Execute a script in the context of the current bundle]" \
-      "config[Specify and read configuration options for bundler]" \
-      "check[Determine whether the requirements for your application are installed]" \
-      "list[Show all of the gems in the current bundle]" \
-      "show[Show the source location of a particular gem in the bundle]" \
-      "console[Start an IRB session in the context of the current bundle]" \
-      "open[Open an installed gem in the editor]" \
-      "lock[Generate a lockfile for your dependencies]" \
-      "viz[Generate a visual representation of your dependencies]" \
-      "init[Generate a simple Gemfile, placed in the current directory]" \
-      "gem[Create a simple gem, suitable for development with bundler]" \
-      "help[Describe available tasks or one specific task]" \
-      "platform[Displays platform compatibility information]" \
-      "outdated[Show all of the outdated gems in the current bundle]" \
-      "clean[Cleans up unused gems in your bundler directory]"
-    ret=0
-    ;;
-  args)
-    case $line[1] in
-      help)
-        _values 'commands' 'install' 'update' 'package' 'exec' 'config' 'check' 'list' 'show' 'console' 'open' 'lock' 'viz' 'init' 'gem' 'help' 'platform' 'outdated' 'clean' && ret=0
-        ;;
-      install)
-        _arguments \
-          '(--no-color)--no-color[disable colorization in output]' \
-          '(--local)--local[do not attempt to connect to rubygems.org]' \
-          '(--quiet)--quiet[only output warnings and errors]' \
-          '(--gemfile)--gemfile=-[use the specified gemfile instead of Gemfile]:gemfile' \
-          '(--system)--system[install to the system location]' \
-          '(--deployment)--deployment[install using defaults tuned for deployment environments]' \
-          '(--frozen)--frozen[do not allow the Gemfile.lock to be updated after this install]' \
-          '(--path)--path=-[specify a different path than the system default]:path:_files' \
-          '(--binstubs)--binstubs=-[generate bin stubs for bundled gems to ./bin]:directory:_files' \
-          '(--without)--without=-[exclude gems that are part of the specified named group]:groups'
-        ret=0
-        ;;
-      exec)
-        _normal && ret=0
-        ;;
-      (open|show)
-        _gems=( $(bundle show 2> /dev/null | sed -e '/^  \*/!d; s/^  \* \([^ ]*\) .*/\1/') )
-        if [[ $_gems != "" ]]; then
-          _values 'gems' $_gems && ret=0
-        fi
-        ;;
-      *)
-        _opts=(  $(bundle help $line[1] | sed -e '/^  \[-/!d; s/^  \[\(-[^=]*\)=.*/\1/') )
-        _opts+=( $(bundle help $line[1] | sed -e '/^  -/!d; s/^  \(-.\), \[\(-[^=]*\)=.*/\1 \2/') )
-        if [[ $_opts != "" ]]; then
-          _values 'options' $_opts && ret=0
-        fi
-        ;;
-    esac
-    ;;
-esac
-
-return ret
diff --git a/zsh/completion/_production b/zsh/completion/_production
deleted file mode 100644
index a124346..0000000
--- a/zsh/completion/_production
+++ /dev/null
@@ -1,2 +0,0 @@
-#compdef production
-compdef production=heroku
diff --git a/zsh/completion/_rspec b/zsh/completion/_rspec
deleted file mode 100644
index e75c182..0000000
--- a/zsh/completion/_rspec
+++ /dev/null
@@ -1,3 +0,0 @@
-#compdef rspec
-
-compadd -P spec/ $(ls spec/**/*_spec.rb | sed -E "s/spec\///g")
diff --git a/zsh/completion/_staging b/zsh/completion/_staging
deleted file mode 100644
index fdcd38f..0000000
--- a/zsh/completion/_staging
+++ /dev/null
@@ -1,2 +0,0 @@
-#compdef staging
-compdef staging=heroku
diff --git a/zsh/configs/color.zsh b/zsh/configs/color.zsh
index 07fcb6b..a8221db 100644
--- a/zsh/configs/color.zsh
+++ b/zsh/configs/color.zsh
@@ -1,6 +1,3 @@
 # makes color constants available
 autoload -U colors
 colors
-
-# enable colored output from ls, etc. on FreeBSD-based systems
-export CLICOLOR=1
diff --git a/zsh/configs/fzf.zsh b/zsh/configs/fzf.zsh
new file mode 100644
index 0000000..67cb4e9
--- /dev/null
+++ b/zsh/configs/fzf.zsh
@@ -0,0 +1 @@
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
diff --git a/zsh/configs/keybindings.zsh b/zsh/configs/keybindings.zsh
index 5e209aa..4cc00e1 100644
--- a/zsh/configs/keybindings.zsh
+++ b/zsh/configs/keybindings.zsh
@@ -3,15 +3,3 @@ stty -ixon
 
 # vi mode
 bindkey -v
-bindkey "^F" vi-cmd-mode
-
-# handy keybindings
-bindkey "^A" beginning-of-line
-bindkey "^E" end-of-line
-bindkey "^K" kill-line
-bindkey "^R" history-incremental-search-backward
-bindkey "^P" history-search-backward
-bindkey "^Y" accept-and-hold
-bindkey "^N" insert-last-word
-bindkey "^Q" push-line-or-edit
-bindkey -s "^T" "^[Isudo ^[A" # "t" for "toughguy"
diff --git a/zsh/configs/post/completion.zsh b/zsh/configs/post/completion.zsh
index 889200b..c994ff6 100644
--- a/zsh/configs/post/completion.zsh
+++ b/zsh/configs/post/completion.zsh
@@ -1,5 +1,5 @@
 # load our own completion functions
-fpath=(~/.zsh/completion /usr/local/share/zsh/site-functions $fpath)
+fpath=(~/.zsh/completion $fpath)
 
 # completion
 autoload -U compinit
diff --git a/zsh/configs/post/path.zsh b/zsh/configs/post/path.zsh
index 427a171..ca68140 100644
--- a/zsh/configs/post/path.zsh
+++ b/zsh/configs/post/path.zsh
@@ -1,12 +1,13 @@
 # ensure dotfiles bin directory is loaded first
-PATH="$HOME/.bin:/usr/local/sbin:$PATH"
+PATH="$HOME/local/bin:$PATH"
 
 # load rbenv if available
 if command -v rbenv >/dev/null; then
   eval "$(rbenv init - --no-rehash)"
 fi
 
-# mkdir .git/safe in the root of repositories you trust
-PATH=".git/safe/../../bin:$PATH"
+# nvm
+NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
 
 export -U PATH
diff --git a/zsh/configs/prompt.zsh b/zsh/configs/prompt.zsh
index 27a01d0..3b6a42d 100644
--- a/zsh/configs/prompt.zsh
+++ b/zsh/configs/prompt.zsh
@@ -1,6 +1,6 @@
 # modify the prompt to contain git branch name if applicable
 git_prompt_info() {
-  current_branch=$(git current-branch 2> /dev/null)
+  current_branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
   if [[ -n $current_branch ]]; then
     echo " %{$fg_bold[green]%}$current_branch%{$reset_color%}"
   fi
diff --git a/zsh/functions/_git_delete_branch b/zsh/functions/_git_delete_branch
deleted file mode 100644
index 32648ea..0000000
--- a/zsh/functions/_git_delete_branch
+++ /dev/null
@@ -1,4 +0,0 @@
-_git_delete_branch ()
-{
-  __gitcomp "$(__git_heads)"
-}
diff --git a/zsh/functions/change-extension b/zsh/functions/change-extension
deleted file mode 100644
index 596b9c5..0000000
--- a/zsh/functions/change-extension
+++ /dev/null
@@ -1,9 +0,0 @@
-# Change file extensions recursively in current directory
-#
-#   change-extension erb haml
-
-function change-extension() {
-  foreach f (**/*.$1)
-    mv $f $f:r.$2
-  end
-}
diff --git a/zsh/functions/envup b/zsh/functions/envup
deleted file mode 100644
index 4ae3a1c..0000000
--- a/zsh/functions/envup
+++ /dev/null
@@ -1,10 +0,0 @@
-# Load .env file into shell session for environment variables
-
-function envup() {
-  if [ -f .env ]; then
-    export $(cat .env)
-  else
-    echo 'No .env file found' 1>&2
-    return 1
-  fi
-}