From f8ed4fd34c918a391b61d4d1cdcf748716a8afd9 Mon Sep 17 00:00:00 2001 From: Tuowen Zhao Date: Wed, 14 Sep 2016 17:59:42 -0600 Subject: My mod --- themes/agnoster.zsh-theme | 10 ++++++ zshrc | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 zshrc diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme index da1f9b6e6..c6ded38d8 100644 --- a/themes/agnoster.zsh-theme +++ b/themes/agnoster.zsh-theme @@ -190,6 +190,15 @@ prompt_status() { [[ -n "$symbols" ]] && prompt_segment black default "$symbols" } +prompt_cabal_sandbox() { + cabal_files=(*.cabal(N)) + if [ $#cabal_files -gt 0 ]; then + if [ -f cabal.sandbox.config ]; then + prompt_segment cyan black "sandbox" + fi + fi +} + ## Main prompt build_prompt() { RETVAL=$? @@ -198,6 +207,7 @@ build_prompt() { prompt_context prompt_dir prompt_git + prompt_cabal_sandbox prompt_hg prompt_end } diff --git a/zshrc b/zshrc new file mode 100644 index 000000000..cfb339edd --- /dev/null +++ b/zshrc @@ -0,0 +1,91 @@ +# Path to your oh-my-zsh installation. +export ZSH=$HOME/.oh-my-zsh +# /usr/lib/python3.4/site-packages/powerline/bindings/zsh/powerline.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="agnoster" +DEFAULT_USER="joe" + +alias paclsorphans='sudo pacman -Qdt' +alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)' +alias wikipush='git add . && git commit -m "commit from git, default" && git push' +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +# 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 disable command auto-correction. +# DISABLE_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 + +# 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 docker cabal) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +export PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/core_perl:$HOME/.local/bin" + +# 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" +export PATH="/work/wiki/.cabal-sandbox/bin:$PATH" +export PATH="$HOME/.cabal/bin:$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting + +if [[ -z "$SSH_CLIENT" ]]; then + SSH_AUTH_SOCK=/run/user/$UID/gnupg/S.gpg-agent.ssh; export SSH_AUTH_SOCK; +fi + +export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting + +# source ~/.rvm/scripts/rvm + -- cgit v1.2.3-70-g09d2 From d96fd9b4b9e1d14e55a35f7d7af12662f090254f Mon Sep 17 00:00:00 2001 From: Tuowen Zhao Date: Wed, 14 Sep 2016 18:01:56 -0600 Subject: Updated zshrc --- zshrc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/zshrc b/zshrc index cfb339edd..54df5010c 100644 --- a/zshrc +++ b/zshrc @@ -66,26 +66,18 @@ export PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/core_perl:$H # 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 +export EDITOR='vim' # Compilation flags # export ARCHFLAGS="-arch x86_64" # ssh # export SSH_KEY_PATH="~/.ssh/dsa_id" -export PATH="/work/wiki/.cabal-sandbox/bin:$PATH" export PATH="$HOME/.cabal/bin:$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting if [[ -z "$SSH_CLIENT" ]]; then SSH_AUTH_SOCK=/run/user/$UID/gnupg/S.gpg-agent.ssh; export SSH_AUTH_SOCK; fi -export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting - # source ~/.rvm/scripts/rvm -- cgit v1.2.3-70-g09d2