From fb974e1163f80ffc75d450828bc74cc7cbc5755b Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Wed, 24 Jun 2015 22:17:56 +0200 Subject: [PATCH] switching to oh-my-zsh --- .gitignore | 2 + .gitmodules | 3 ++ .oh-my-zsh | 1 + .zshrc | 149 +++++++++++++++++++++++++--------------------------- 4 files changed, 79 insertions(+), 76 deletions(-) create mode 160000 .oh-my-zsh diff --git a/.gitignore b/.gitignore index a4ef4e23..e61d3d62 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,9 @@ !.gnupg .gnupg/* !.gnupg/hanez.asc +!.oh-my-zsh !.signature !.vimrc !.zshrc + !README.md diff --git a/.gitmodules b/.gitmodules index e69de29b..eb254704 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "oh-my-zsh"] + path = .oh-my-zsh + url = git://github.com/robbyrussell/oh-my-zsh.git diff --git a/.oh-my-zsh b/.oh-my-zsh new file mode 160000 index 00000000..599831b8 --- /dev/null +++ b/.oh-my-zsh @@ -0,0 +1 @@ +Subproject commit 599831b85a5fd4564ab820530e2bb45f37ca3f99 diff --git a/.zshrc b/.zshrc index 2e9e9196..923a0a92 100644 --- a/.zshrc +++ b/.zshrc @@ -1,87 +1,84 @@ -# Extend my $PATH to $PATH/bin -export PATH=$PATH:$HOME/bin +# Path to your oh-my-zsh installation. +export ZSH=/home/hanez/.oh-my-zsh -# Now source some stuff that should not be public -if [ -e ~/.zshprivate ] -then -source ~/.zshprivate -fi +# Set name of the theme to load. +# 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="jnrowe" -# History settings -HISTSIZE=100000 -SAVEHIST=100000 -HISTFILE=~/.zsh_history +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" -export EDITOR=vim +# Uncomment the following line to use hyphen-insensitive completion. Case +# sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" -# Some aliases -alias ..='cd ..' -alias ...='cd ../..' -alias ....='cd ../../..' -alias .....='cd ../../../..' -alias l='ls --color' -alias ls='ls --color' -alias lsa='ls -a --color' -alias ll='ls --color -l' -alias lla='ls -la --color' -alias lsd='ls -ld --color' -alias xterm='uxterm -bg black -fg grey -sb -leftbar -si -bc -cr orange' +# Uncomment the following line to disable bi-weekly auto-update checks. +# DISABLE_AUTO_UPDATE="true" -# Set up the Zsh -setopt extendedhistory -setopt histignoredups -setopt histreduceblanks -setopt incappendhistory -setopt sharehistory +# Uncomment the following line to change how often to auto-update (in days). +# export UPDATE_ZSH_DAYS=13 -# Set up the prompt -autoload -Uz promptinit -promptinit +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" -prompt_gentoo_setup () { -prompt_gentoo_prompt=${1:-'blue'} -prompt_gentoo_user=${2:-'green'} -prompt_gentoo_root=${3:-'red'} +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" -if [ "$USER" = 'root' ] -then -base_prompt="%B%F{$prompt_gentoo_root}%m%k " -else -base_prompt="%B%F{$prompt_gentoo_user}%n@%m%k " -fi -post_prompt="%b%f%k" -#setopt noxtrace localoptions -path_prompt="%B%F{$prompt_gentoo_prompt}%1~" -PS1="$base_prompt$path_prompt %# $post_prompt" -PS2="$base_prompt$path_prompt %_> $post_prompt" -PS3="$base_prompt$path_prompt ?# $post_prompt" -} -prompt_gentoo_setup "$@" +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" -# Completion stuff -autoload -Uz compinit -compinit +# Uncomment the following line to display red dots whilst waiting for completion. +COMPLETION_WAITING_DOTS="true" -zstyle ':completion:*' auto-description 'specify: %d' -zstyle ':completion:*' completer _expand _complete _correct _approximate -zstyle ':completion:*' format 'Completing %d' -zstyle ':completion:*' group-name '' -zstyle ':completion:*' menu select=2 -eval "$(dircolors -b)" -zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} -zstyle ':completion:*' list-colors '' -zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s -zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*' -zstyle ':completion:*' menu select=long -zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s -zstyle ':completion:*' use-compctl false -zstyle ':completion:*' verbose true -zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31' -zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd' +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" -# I use xterm and this sets a nice title with hostname and cwd in it. -case $TERM in - xterm*) - precmd () {print -Pn "\e]0;%n@%m: %~\a"} - ;; -esac +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# 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) +# Add wisely, as too many plugins slow down shell startup. +plugins=(gitfast) + +# User configuration + +export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/opt/android-ndk:/opt/android-sdk/tools:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/home/hanez/bin:/opt/android-ndk/:/opt/android-sdk//platform-tools:/opt/android-sdk//tools:/home/hanez/.gem/ruby/2.2.0/bin" +# export MANPATH="/usr/local/man:$MANPATH" + +source $ZSH/oh-my-zsh.sh + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# ssh +# export SSH_KEY_PATH="~/.ssh/dsa_id" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh"