From 2f00ace1c56c614e49c77a2391b274b867e83b4b Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Thu, 20 Oct 2011 20:50:06 -0500 Subject: [PATCH 1/7] simple plugin to use custom defined aliases in ~/.aliases - this prevents us pushing anything like private hostnames or IP's up to a public git repo --- plugins/aliases/aliases.plugin.zsh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 plugins/aliases/aliases.plugin.zsh diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh new file mode 100644 index 000000000..a818d7c1d --- /dev/null +++ b/plugins/aliases/aliases.plugin.zsh @@ -0,0 +1,3 @@ +if [ -f ~/.aliases ] ; then + source ~/.aliases +fi From 8984851d0c0f9416d0ee8d73bbc8ea10085b84b8 Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Thu, 20 Oct 2011 21:06:52 -0500 Subject: [PATCH 2/7] add some attribution and help...but really it's not needed...3 lines of code --- plugins/aliases/aliases.plugin.zsh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh index a818d7c1d..451f93394 100644 --- a/plugins/aliases/aliases.plugin.zsh +++ b/plugins/aliases/aliases.plugin.zsh @@ -1,3 +1,19 @@ +# These three lines of simple code originally by ilikenwf/Matt Parnell +# simply import the ~/.aliases file if it exists when the plugin is +# enabled. + +# By doing so, you can have custom aliases for various actions, without +# having to do something like push your aliases to github for security +# reasons, and for a nice simple divide. + +# If you have a better place to put the .aliases file, or improvements, +# please put a pull request into my oh-my-zsh fork if you don't put it +# in the main oh-my-zsh repo. + +# Example aliases: +# alias tunnel="ssh -D 3290 user@host.com" +# alias vnc="vncviewer -compresslevel 0 -q 0 localhost:2985" + if [ -f ~/.aliases ] ; then source ~/.aliases fi From b5776b6716eaaf1afaf1039daa1cea17022f1411 Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Thu, 20 Oct 2011 21:25:37 -0500 Subject: [PATCH 3/7] reduce to one line, per the oh-my-zsh guys... merged or not i use this --- plugins/aliases/aliases.plugin.zsh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh index 451f93394..377312e50 100644 --- a/plugins/aliases/aliases.plugin.zsh +++ b/plugins/aliases/aliases.plugin.zsh @@ -1,4 +1,4 @@ -# These three lines of simple code originally by ilikenwf/Matt Parnell +# This line of simple code originally by ilikenwf/Matt Parnell # simply import the ~/.aliases file if it exists when the plugin is # enabled. @@ -14,6 +14,4 @@ # alias tunnel="ssh -D 3290 user@host.com" # alias vnc="vncviewer -compresslevel 0 -q 0 localhost:2985" -if [ -f ~/.aliases ] ; then - source ~/.aliases -fi +[[ -f ~/.aliases ]] && . ~/.aliases From 059b19b53cdaf666c3bcbcc9664a636f5aab0c2e Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Thu, 20 Oct 2011 21:27:31 -0500 Subject: [PATCH 4/7] move it to custom --- {plugins => custom}/aliases/aliases.plugin.zsh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {plugins => custom}/aliases/aliases.plugin.zsh (100%) diff --git a/plugins/aliases/aliases.plugin.zsh b/custom/aliases/aliases.plugin.zsh similarity index 100% rename from plugins/aliases/aliases.plugin.zsh rename to custom/aliases/aliases.plugin.zsh From 0ae38f1807b560d3d9b21dd0eedf411f655cb927 Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Thu, 20 Oct 2011 21:28:10 -0500 Subject: [PATCH 5/7] i don't care - Revert "move it to custom" This reverts commit 059b19b53cdaf666c3bcbcc9664a636f5aab0c2e. --- {custom => plugins}/aliases/aliases.plugin.zsh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {custom => plugins}/aliases/aliases.plugin.zsh (100%) diff --git a/custom/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh similarity index 100% rename from custom/aliases/aliases.plugin.zsh rename to plugins/aliases/aliases.plugin.zsh From 8f8d0b609eb5864abf3f4c60c91f0b95e944675f Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Thu, 20 Oct 2011 22:53:21 -0500 Subject: [PATCH 6/7] ah, i see...not needed --- plugins/aliases/aliases.plugin.zsh | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 plugins/aliases/aliases.plugin.zsh diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh deleted file mode 100644 index 377312e50..000000000 --- a/plugins/aliases/aliases.plugin.zsh +++ /dev/null @@ -1,17 +0,0 @@ -# This line of simple code originally by ilikenwf/Matt Parnell -# simply import the ~/.aliases file if it exists when the plugin is -# enabled. - -# By doing so, you can have custom aliases for various actions, without -# having to do something like push your aliases to github for security -# reasons, and for a nice simple divide. - -# If you have a better place to put the .aliases file, or improvements, -# please put a pull request into my oh-my-zsh fork if you don't put it -# in the main oh-my-zsh repo. - -# Example aliases: -# alias tunnel="ssh -D 3290 user@host.com" -# alias vnc="vncviewer -compresslevel 0 -q 0 localhost:2985" - -[[ -f ~/.aliases ]] && . ~/.aliases From 44db8104cebfe1ca35590354e2ef122b3e55aef0 Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Thu, 20 Oct 2011 22:56:15 -0500 Subject: [PATCH 7/7] use my theme, which looks like what i had before oh-my-zsh ...similar to clean, so i based it on clean and just edited the prompts --- themes/mattparnell.zsh-theme | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 themes/mattparnell.zsh-theme diff --git a/themes/mattparnell.zsh-theme b/themes/mattparnell.zsh-theme new file mode 100644 index 000000000..daed7d285 --- /dev/null +++ b/themes/mattparnell.zsh-theme @@ -0,0 +1,16 @@ +# based on clean.zsh-theme with some prompt tweaks + +if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="white"; fi + +PROMPT="%F{8}%n@%m%F{blue}%40<...< %~ %<<%F{white}%(!.#.%F{blue}$%F{8}) " +RPROMPT="[%D{%m/%d %I:%M %p}]" + +# git theming +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[yellow]%}%B" +ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✗" + +# LS colors, made with http://geoff.greer.fm/lscolors/ +export LSCOLORS="Gxfxcxdxbxegedabagacad" +export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'