From bb9cc48de7f0c9e1a127b0e13772f5257bc58ae1 Mon Sep 17 00:00:00 2001 From: Carlos Cardoso Date: Fri, 15 Nov 2013 13:02:46 -0200 Subject: [PATCH 1/2] custom linux changes. --- plugins/tmux/tmux.plugin.zsh | 2 +- templates/zshrc-linux.zsh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh index 3ecc2ac69..31142c723 100644 --- a/plugins/tmux/tmux.plugin.zsh +++ b/plugins/tmux/tmux.plugin.zsh @@ -38,7 +38,7 @@ if which tmux &> /dev/null fi # Set the correct local config file to use. - if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && (( [[ -f $HOME/.tmux.conf ]] || -h $HOME/.tmux.conf ]] )) + if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf ]] then #use this when they have a ~/.tmux.conf export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf" diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh index 0a1e264b7..7807cb9ad 100644 --- a/templates/zshrc-linux.zsh +++ b/templates/zshrc-linux.zsh @@ -42,6 +42,7 @@ if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi +if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi unsetopt correctall [ "$TERM" = "xterm" ] && TERM="xterm-256color" From 8727fc77a683bf7d4af0d4d725765999f825b9b6 Mon Sep 17 00:00:00 2001 From: Carlos Cardoso Date: Fri, 15 Nov 2013 13:20:44 -0200 Subject: [PATCH 2/2] Fixing templates. --- templates/zshrc-linux.zsh | 2 +- templates/zshrc-mac.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh index 7807cb9ad..750443bbe 100644 --- a/templates/zshrc-linux.zsh +++ b/templates/zshrc-linux.zsh @@ -33,7 +33,7 @@ DISABLE_VENV_CD="1" # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(git tmux debian python pythonbrew vim-override virtualenvwrapper) +plugins=(git tmux debian python virtualenvwrapper) source $ZSH/oh-my-zsh.sh diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh index 4dd8d07c4..332d34483 100644 --- a/templates/zshrc-mac.zsh +++ b/templates/zshrc-mac.zsh @@ -33,7 +33,7 @@ DISABLE_VENV_CD="1" # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) -plugins=(git postgres tmux python pythonbrew vim-override virtualenvwrapper) +plugins=(git postgres tmux python vim-override virtualenvwrapper) source $ZSH/oh-my-zsh.sh # source `which virtualenvwrapper.sh`