diff --git a/templates/zshrc b/templates/zshrc index 763288d..24908dc 100644 --- a/templates/zshrc +++ b/templates/zshrc @@ -1,14 +1,17 @@ +# ENVIRONMENT: +export GJ_DEVENV=local_aptproxy + # Path to your oh-my-zsh installation. -export ZSH=$HOME/.oh-my-zsh +export ZSH=~/.config/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="robbyrussell" +ZSH_THEME="wedisagree" # Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" +CASE_SENSITIVE="true" # Uncomment the following line to disable bi-weekly auto-update checks. # DISABLE_AUTO_UPDATE="true" @@ -26,26 +29,29 @@ ZSH_THEME="robbyrussell" # ENABLE_CORRECTION="true" # Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" +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" +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" +HIST_STAMPS="dd.mm.yyyy" # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder +# z: +# export _Z_DATA="$HOME/.config/.z" + # 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) +# plugins=(git) # User configuration @@ -55,7 +61,61 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH source $ZSH/oh-my-zsh.sh # You may need to manually set your language environment -# export LANG=en_US.UTF-8 +export LANG=en_US.UTF-8 + +# +# ANTIGEN: +# +source $ZSH_CUSTOM/tools/antigen/antigen.zsh + +# MUST: +antigen bundle autoenv +antigen bundle command-not-found +antigen bundle common-aliases +antigen bundle debian +antigen bundle dirhistory +antigen bundle extract +antigen bundle git +antigen bundle history +antigen bundle history-substring-search +antigen bundle iwhois +antigen bundle per-directory-history +antigen bundle screen +antigen bundle ssh-agent +antigen bundle systemadmin +antigen bundle z +antigen bundle zsh_reload +# /MUST + +# NICE: +antigen bundle screen +antigen bundle ssh-agent +antigen bundle web-search +# # if webdev: +# antigen bundle catimg + +# docker: +antigen bundle docker + +# python: +antigen bundle pip +antigen bundle python +antigen bundle virtualenv +antigen bundle virtualenvwrapper + +# kde: +antigen bundle kate + +# +# THEME #---------- +# +antigen theme muse + +antigen apply + +# ssh +export SSH_KEY_PATH="~/.ssh/id_rsa" +zstyle :omz:plugins:ssh-agent agent-forwarding on # Preferred editor for local and remote sessions # if [[ -n $SSH_CONNECTION ]]; then @@ -67,14 +127,6 @@ source $ZSH/oh-my-zsh.sh # 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" +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi