From 0810627fa2c7a8599dbbe6b2c24faefe1bf60cbf Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Tue, 22 Nov 2016 09:47:18 +1300
Subject: [PATCH] Modify integration of urlview & zsh completions

---
 Makefile                    |  1 -
 SOFTWARE.md                 |  3 ++-
 tmux/.config/tmux/tmux.conf |  1 +
 zsh/.zshrc                  | 14 +++++++-------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index d61fd02..7aebecf 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,6 @@ weechat:
 
 zsh:
 	git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
-	git clone https://github.com/zsh-users/zsh-completions.git ~/.oh-my-zsh/custom/plugins/zsh-completions
 	git clone https://github.com/bhilburn/powerlevel9k.git ~/.oh-my-zsh/custom/themes/powerlevel9k
 	@stow -t ~/ --no-folding zsh
 
diff --git a/SOFTWARE.md b/SOFTWARE.md
index ccc63fa..1c99841 100644
--- a/SOFTWARE.md
+++ b/SOFTWARE.md
@@ -45,7 +45,7 @@
 
 *   termite
 *   weechat
-*   zsh
+*   zsh + zsh-completions
 *   screenfetch+scrot
 *   OpenSSH
 *   htop
@@ -57,3 +57,4 @@
 *   (neo)mutt
 *   notmuch
 *   isync (aka mbsync)
+*   urlview
diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf
index aed3d71..e59682e 100644
--- a/tmux/.config/tmux/tmux.conf
+++ b/tmux/.config/tmux/tmux.conf
@@ -63,6 +63,7 @@ set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.config/tmux/plugins'
 set -g @tpm_plugins '                  \
     tmux-plugins/tpm                   \
     tmux-plugins/tmux-yank             \
+    tmux-plugins/tmux-urlview          \
     tmux-plugins/tmux-sensible         \
     tmux-plugins/tmux-pain-control     \
     tmux-plugins/tmux-prefix-highlight \
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 713e5b5..f373382 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,21 +1,21 @@
 # Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh
 
-# Theme
-ZSH_THEME="ys" #powerlevel9k/powerlevel9k"
+# theme
+ZSH_THEME="ys"
 
-# Disable updates
+# disable omz updates
 DISABLE_UPDATE_PROMPT=true
 DISABLE_AUTO_UPDATE=true
 
-# Plugins
+# plugins
 plugins=(archlinux common-aliases git sudo ssh-agent rust colored-man-pages gpg-agent)
 
-# ZSH-Completions
-plugins+=(zsh-completions)
+# zsh-completions
 autoload -U compinit && compinit
 
-# User configuration
+# add ~/bin and /usr/local/bin to $PATH
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 
+# source omz
 source $ZSH/oh-my-zsh.sh