From b9de7bdb608bcf10ed7171c5a08666b6762edcf2 Mon Sep 17 00:00:00 2001 From: Anton Shubin <2spy4x@gmail.com> Date: Tue, 27 Nov 2018 16:04:41 +0700 Subject: [PATCH] feat(.oh-my-zsh/custom/spy4x.zsh-theme): update theme, clean it up. Remove "spy4x.aliases.zsh" because of no use --- .oh-my-zsh/.zshrc | 26 +++++++++ .oh-my-zsh/custom/spy4x.aliases.zsh | 13 ----- .oh-my-zsh/custom/spy4x.zsh-theme | 17 +----- .zshrc | 86 ----------------------------- 4 files changed, 29 insertions(+), 113 deletions(-) create mode 100644 .oh-my-zsh/.zshrc delete mode 100644 .oh-my-zsh/custom/spy4x.aliases.zsh delete mode 100644 .zshrc diff --git a/.oh-my-zsh/.zshrc b/.oh-my-zsh/.zshrc new file mode 100644 index 0000000..b6d8a89 --- /dev/null +++ b/.oh-my-zsh/.zshrc @@ -0,0 +1,26 @@ +# If you come from bash you might have to change your $PATH. +export PATH=$HOME/bin:/usr/local/bin:$HOME/.yarn/bin:$PATH + +# Path to your oh-my-zsh installation. +export ZSH=$HOME/.oh-my-zsh + +# Set name of the theme to load. +# Look in ~/.oh-my-zsh/themes/ or create a custom one in ~/.oh-my-zsh/custom/ +ZSH_THEME="spy4x" + + +DEFAULT_USER=`whoami` + +# 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=(git) + +source $ZSH/oh-my-zsh.sh + +cd ~/projects + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion \ No newline at end of file diff --git a/.oh-my-zsh/custom/spy4x.aliases.zsh b/.oh-my-zsh/custom/spy4x.aliases.zsh deleted file mode 100644 index d71afb3..0000000 --- a/.oh-my-zsh/custom/spy4x.aliases.zsh +++ /dev/null @@ -1,13 +0,0 @@ -# Helpers -alias df="df -h" # Disk free, in gigabytes, not bytes -alias server="python -m SimpleHTTPServer" -alias o="open" # Open folder in Finder - -# Applications -alias st="open -a 'SublimeText2'" # Open in SublimeText - -# Yarn -alias ya="yarn add" # install package to dependencies -alias yad="yarn add -D" # install package to devDependencies -alias yag="yarn global add" # install package globally -alias yu="yarn remove" \ No newline at end of file diff --git a/.oh-my-zsh/custom/spy4x.zsh-theme b/.oh-my-zsh/custom/spy4x.zsh-theme index 0bba8be..f27a0b7 100644 --- a/.oh-my-zsh/custom/spy4x.zsh-theme +++ b/.oh-my-zsh/custom/spy4x.zsh-theme @@ -1,20 +1,9 @@ -# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" - - -local current_dir='%{$terminfo[bold]$fg[green]%} %~%{$reset_color%}' -local rvm_ruby='' -if which rvm-prompt &> /dev/null; then - rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}' -else - if which rbenv &> /dev/null; then - rvm_ruby='%{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}' - fi -fi +local current_dir='%{$terminfo[bold]$fg[green]%}%~%{$reset_color%}' local git_branch='$(git_prompt_info)%{$reset_color%}' -PROMPT="╭─${current_dir} ${rvm_ruby} ${git_branch} -╰─%B$%b " +PROMPT="${current_dir} ${git_branch} +$ " RPS1="${return_code}" ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" diff --git a/.zshrc b/.zshrc deleted file mode 100644 index ac07b20..0000000 --- a/.zshrc +++ /dev/null @@ -1,86 +0,0 @@ -# Path to your oh-my-zsh installation. -export ZSH=$HOME/.oh-my-zsh - -# 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="spy4x" - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" - -# 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" - -# 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 - -DEFAULT_USER=`whoami` - -# 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=(git) - -source $ZSH/oh-my-zsh.sh - -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" - -# 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" - -cd ~/projects - -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm