From 29565c5ac4735b0ac59615d9b6134424f90a09bb Mon Sep 17 00:00:00 2001 From: Carlos Cardoso Date: Tue, 18 Nov 2014 13:39:20 -0200 Subject: [PATCH 1/6] added heroku integration --- templates/zshrc-mac.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh index 176335ce6..37d851d39 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 gitfast postgres tmux python vim-override virtualenvwrapper) +plugins=(git gitfast heroku postgres tmux python vim-override virtualenvwrapper) # User configuration if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi From aff15e81e22bb95426f8bd50e09011d61e4e43b4 Mon Sep 17 00:00:00 2001 From: Carlos Cardoso Date: Fri, 5 Dec 2014 17:55:53 -0200 Subject: [PATCH 2/6] disabled python default plugin --- 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 71bfd99a2..a46185768 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 gitfast tmux debian python virtualenvwrapper) +plugins=(git gitfast tmux debian virtualenvwrapper) if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi if [ -e $HOME/.local/bin ]; then export PATH="$HOME/.local/bin:$PATH"; fi diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh index 37d851d39..3ecd9e1a0 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 gitfast heroku postgres tmux python vim-override virtualenvwrapper) +plugins=(git gitfast heroku postgres tmux vim-override virtualenvwrapper) # User configuration if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi From 57e1376297c38194bcb02bb33be457352fdb5395 Mon Sep 17 00:00:00 2001 From: Carlos Cardoso Date: Tue, 30 Dec 2014 12:11:27 -0200 Subject: [PATCH 3/6] zshrc templates customization --- templates/zshrc-linux.zsh | 16 ++++++++-------- templates/zshrc-mac.zsh | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh index a46185768..37fe81806 100644 --- a/templates/zshrc-linux.zsh +++ b/templates/zshrc-linux.zsh @@ -5,8 +5,8 @@ ZSH=$HOME/.oh-my-zsh # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -# ZSH_THEME="afowler" -ZSH_THEME="cadusk" +ZSH_THEME="afowler" +# ZSH_THEME="cadusk" # Example aliases # alias zshconfig="mate ~/.zshrc" @@ -33,15 +33,15 @@ 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 gitfast tmux debian virtualenvwrapper) +plugins=(git gitfast tmux) if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi -if [ -e $HOME/.local/bin ]; then export PATH="$HOME/.local/bin:$PATH"; fi -if [ -e $HOME/appengine ]; then export PATH="$HOME/appengine:$PATH"; fi -if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi +# if [ -e $HOME/.local/bin ]; then export PATH="$HOME/.local/bin:$PATH"; fi +# if [ -e $HOME/appengine ]; then export PATH="$HOME/appengine:$PATH"; fi +# if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi # -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 [ -z "$LC_ALL" ]; then export LC_ALL=en_US.utf8; fi +if [ -z "$LANG" ]; then export LANG=en_US.utf8; fi [ "$TERM" = "xterm" ] && TERM="xterm-256color" diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh index 3ecd9e1a0..858e564d4 100644 --- a/templates/zshrc-mac.zsh +++ b/templates/zshrc-mac.zsh @@ -5,8 +5,8 @@ ZSH=$HOME/.oh-my-zsh # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -# ZSH_THEME="afowler" -ZSH_THEME="cadusk" +ZSH_THEME="afowler" +# ZSH_THEME="cadusk" # Example aliases # alias zshconfig="mate ~/.zshrc" @@ -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 gitfast heroku postgres tmux vim-override virtualenvwrapper) +plugins=(git gitfast heroku postgres tmux vim-override) # User configuration if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi From 638819a22b092e1efa6b4007392fc51685a64dc8 Mon Sep 17 00:00:00 2001 From: Carlos Cardoso Date: Sun, 19 Jul 2015 09:40:07 -0400 Subject: [PATCH 4/6] simplified initialization scripts --- templates/zshrc-mac.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh index 858e564d4..067f332e0 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 gitfast heroku postgres tmux vim-override) +plugins=(git gitfast tmux vim-override) # User configuration if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi From c6eb1cd8fa4f3ca5521e32918a72dd091f25fd8a Mon Sep 17 00:00:00 2001 From: Carlos Cardoso Date: Sat, 24 Oct 2015 00:55:43 -0400 Subject: [PATCH 5/6] changed zsh theme --- templates/zshrc-mac.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh index 067f332e0..504407627 100644 --- a/templates/zshrc-mac.zsh +++ b/templates/zshrc-mac.zsh @@ -5,8 +5,8 @@ ZSH=$HOME/.oh-my-zsh # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -ZSH_THEME="afowler" -# ZSH_THEME="cadusk" +# ZSH_THEME="afowler" +ZSH_THEME="nicoulaj" # Example aliases # alias zshconfig="mate ~/.zshrc" From 43be8baf77213b8f6910fd9126b7708d46bdbd1d Mon Sep 17 00:00:00 2001 From: Carlos Cardoso Date: Mon, 1 Feb 2016 17:15:08 -0200 Subject: [PATCH 6/6] template updates --- templates/zshrc-linux.zsh | 3 +-- templates/zshrc-mac.zsh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh index 37fe81806..3cd3bfebd 100644 --- a/templates/zshrc-linux.zsh +++ b/templates/zshrc-linux.zsh @@ -5,8 +5,7 @@ ZSH=$HOME/.oh-my-zsh # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -ZSH_THEME="afowler" -# ZSH_THEME="cadusk" +ZSH_THEME="nicoulaj" # Example aliases # alias zshconfig="mate ~/.zshrc" diff --git a/templates/zshrc-mac.zsh b/templates/zshrc-mac.zsh index 504407627..2563c8ea7 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 gitfast tmux vim-override) +plugins=(git gitfast tmux vim-override postgres) # User configuration if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi