From 9ec4d4add23dbc02e6775c99450ff87da2c4e257 Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Sat, 1 Aug 2015 19:13:03 -0400 Subject: [PATCH] Initial install of zprezto --- .gitmodules | 3 + Makefile | 2 +- zprezto | 1 + zpreztorc | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++ zshrc | 5 ++ 5 files changed, 167 insertions(+), 1 deletion(-) create mode 160000 zprezto create mode 100644 zpreztorc diff --git a/.gitmodules b/.gitmodules index 8e7bc95..e79bf54 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "vim/bundle/vundle"] path = vim/bundle/vundle url = https://github.com/gmarik/vundle.git +[submodule "zprezto"] + path = zprezto + url = https://github.com/sorin-ionescu/prezto.git diff --git a/Makefile b/Makefile index 883f81c..fc90821 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ all: install install: submodules $(symlinks) submodules: - git submodule update --init + git submodule update --init --recursive $(symlinks): test -e `pwd`/$@ \ diff --git a/zprezto b/zprezto new file mode 160000 index 0000000..f2a826e --- /dev/null +++ b/zprezto @@ -0,0 +1 @@ +Subproject commit f2a826e963f06a204dc0e09c05fc3e5419799f52 diff --git a/zpreztorc b/zpreztorc new file mode 100644 index 0000000..4778944 --- /dev/null +++ b/zpreztorc @@ -0,0 +1,157 @@ +# +# Sets Prezto options. +# +# Authors: +# Sorin Ionescu +# + +# +# General +# + +# Set case-sensitivity for completion, history lookup, etc. +# zstyle ':prezto:*:*' case-sensitive 'yes' + +# Color output (auto set to 'no' on dumb terminals). +zstyle ':prezto:*:*' color 'yes' + +# Set the Zsh modules to load (man zshmodules). +# zstyle ':prezto:load' zmodule 'attr' 'stat' + +# Set the Zsh functions to load (man zshcontrib). +# zstyle ':prezto:load' zfunction 'zargs' 'zmv' + +# Set the Prezto modules to load (browse modules). +# The order matters. +zstyle ':prezto:load' pmodule \ + 'environment' \ + 'terminal' \ + 'editor' \ + 'history' \ + 'directory' \ + 'spectrum' \ + 'utility' \ + 'completion' \ + 'prompt' + +# +# Editor +# + +# Set the key mapping style to 'emacs' or 'vi'. +zstyle ':prezto:module:editor' key-bindings 'emacs' + +# Auto convert .... to ../.. +# zstyle ':prezto:module:editor' dot-expansion 'yes' + +# +# Git +# + +# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'. +# zstyle ':prezto:module:git:status:ignore' submodules 'all' + +# +# GNU Utility +# + +# Set the command prefix on non-GNU systems. +# zstyle ':prezto:module:gnu-utility' prefix 'g' + +# +# History Substring Search +# + +# Set the query found color. +# zstyle ':prezto:module:history-substring-search:color' found '' + +# Set the query not found color. +# zstyle ':prezto:module:history-substring-search:color' not-found '' + +# Set the search globbing flags. +# zstyle ':prezto:module:history-substring-search' globbing-flags '' + +# +# Pacman +# + +# Set the Pacman frontend. +# zstyle ':prezto:module:pacman' frontend 'yaourt' + +# +# Prompt +# + +# Set the prompt theme to load. +# Setting it to 'random' loads a random theme. +# Auto set to 'off' on dumb terminals. +zstyle ':prezto:module:prompt' theme 'sorin' + +# +# Ruby +# + +# Auto switch the Ruby version on directory change. +# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes' + +# +# Screen +# + +# Auto start a session when Zsh is launched in a local terminal. +# zstyle ':prezto:module:screen:auto-start' local 'yes' + +# Auto start a session when Zsh is launched in a SSH connection. +# zstyle ':prezto:module:screen:auto-start' remote 'yes' + +# +# SSH +# + +# Set the SSH identities to load into the agent. +# zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa2' 'id_github' + +# +# Syntax Highlighting +# + +# Set syntax highlighters. +# By default, only the main highlighter is enabled. +# zstyle ':prezto:module:syntax-highlighting' highlighters \ +# 'main' \ +# 'brackets' \ +# 'pattern' \ +# 'cursor' \ +# 'root' +# +# Set syntax highlighting styles. +# zstyle ':prezto:module:syntax-highlighting' styles \ +# 'builtin' 'bg=blue' \ +# 'command' 'bg=blue' \ +# 'function' 'bg=blue' + +# +# Terminal +# + +# Auto set the tab and window titles. +# zstyle ':prezto:module:terminal' auto-title 'yes' + +# Set the window title format. +# zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s' + +# Set the tab title format. +# zstyle ':prezto:module:terminal:tab-title' format '%m: %s' + +# +# Tmux +# + +# Auto start a session when Zsh is launched in a local terminal. +# zstyle ':prezto:module:tmux:auto-start' local 'yes' + +# Auto start a session when Zsh is launched in a SSH connection. +# zstyle ':prezto:module:tmux:auto-start' remote 'yes' + +# Integrate with iTerm2. +# zstyle ':prezto:module:tmux:iterm' integrate 'yes' diff --git a/zshrc b/zshrc index 4b2d5c2..2fd22f9 100644 --- a/zshrc +++ b/zshrc @@ -31,6 +31,11 @@ SAVEHIST=20000 stty start undef stty stop undef +# load zprezto +if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then + source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" +fi + # Aliases/Functions files source $HOME/.aliases source $HOME/.functions