Moved to oh-my-zsh finaly. My.Zsh is completely compatible with omz

This commit is contained in:
Sameer Rahmani 2018-05-24 14:55:36 +01:00
parent 8af2c7297d
commit 7aebda5229
3 changed files with 20 additions and 45 deletions

9
.gitmodules vendored
View File

@ -1,12 +1,9 @@
[submodule "zsh-syntax-highlighting"] [submodule "zsh-syntax-highlighting"]
path = zsh-syntax-highlighting path = plugins/zsh-syntax-highlighting
url = git://github.com/zsh-users/zsh-syntax-highlighting.git url = git://github.com/zsh-users/zsh-syntax-highlighting.git
[submodule "zaw"]
path = zaw
url = git://github.com/zsh-users/zaw.git
[submodule "zsh-autosuggestions"] [submodule "zsh-autosuggestions"]
path = zsh-autosuggestions path = plugins/zsh-autosuggestions
url = git://github.com/tarruda/zsh-autosuggestions url = git://github.com/tarruda/zsh-autosuggestions
[submodule "zsh-completions"] [submodule "zsh-completions"]
path = zsh-completions path = plugins/zsh-completions
url = https://github.com/zsh-users/zsh-completions.git url = https://github.com/zsh-users/zsh-completions.git

55
my.zsh
View File

@ -17,34 +17,34 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
current_path=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)") # current_path=$(cd -P -- "$(dirname -- "$0")" && printf '%s\n' "$(pwd -P)")
current_path=$ZSH_CUSTOM
myzsh=$ZSH_CUSTOM
current_file=$current_path/$(basename -- "$0") current_file=$current_path/$(basename -- "$0")
#[[ -z "$PS1" ]] && return #[[ -z "$PS1" ]] && return
# Set options # Set options
export HISTFILE=$HOME/.zsh_history # export HISTFILE=$HOME/.zsh_history
export HISTFILESIZE=500 # export HISTFILESIZE=500
export SAVEHIST=500 # export SAVEHIST=500
export HISTSIZE=500 # export HISTSIZE=500
setopt HIST_IGNORE_DUPS # setopt HIST_IGNORE_DUPS
setopt NO_HIST_BEEP # setopt NO_HIST_BEEP
setopt PROMPT_SUBST # setopt PROMPT_SUBST
setopt NO_BEEP # setopt NO_BEEP
setopt AUTO_CD # setopt AUTO_CD
setopt CORRECT # setopt CORRECT
setopt SHARE_HISTORY # setopt SHARE_HISTORY
setopt HIST_IGNORE_ALL_DUPS # setopt HIST_IGNORE_ALL_DUPS
# My.Zsh directory path # # My.Zsh directory path
myzsh=${MYZSH:-$HOME} # myzsh=${MYZSH:-$HOME}
fpath=($myzsh/lib/functions/{*.zsh,*.zwc}(N) $fpath) fpath=($myzsh/lib/functions/{*.zsh,*.zwc}(N) $fpath)
fpath=($myzsh/zsh-completions/src $fpath)
# Autoload functions that have the executable bit on. # Autoload functions that have the executable bit on.
for lib ($myzsh/lib/*.zsh); do for lib ($myzsh/lib/*.zsh); do
source $lib source $lib
done done
@ -52,26 +52,5 @@ done
# Load aliases # Load aliases
. $myzsh/aliases . $myzsh/aliases
# Load the theme and coloring
autoload -U colors && colors
theme=${THEME:-$myzsh/themes/lxsameer.zsh-theme}
. $theme
project_path=${PROJECTS:-~/src} project_path=${PROJECTS:-~/src}
cdpath=($project_path $cdpath) cdpath=($project_path $cdpath)
# Load syntax highlighter
source $current_path/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
# Load autosuggestions
source $current_path/zsh-autosuggestions/autosuggestions.zsh
# Load ZAW
source $current_path/zaw/zaw.zsh
# Load zsh-completions
source $current_path/zsh-completions/zsh-completions.plugin.zsh

1
zaw

@ -1 +0,0 @@
Subproject commit d0fdc53b83d5b4fd948097d1e1ff84d304ec1019