diff --git a/dot_zshrc b/dot_zshrc index a5c468c..aeb6cb7 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -21,8 +21,7 @@ zstyle ':z4h:fzf-complete' recurse-dirs 'no' # ssh when connecting to these hosts. #zstyle ':z4h:ssh:example-hostname1' enable 'yes' zstyle ':z4h:ssh:*' enable 'no' -zstyle ':z4h:ssh:*' send-extra-files '~/.nanorc' '~/.env.zsh' -zstyle ':z4h:ssh-agent:' start no +#zstyle ':z4h:ssh-agent:' start no z4h install ohmyzsh/ohmyzsh || return z4h install urbainvaes/fzf-marks || return @@ -36,11 +35,15 @@ z4h init || return # Export environment variables. export GPG_TTY=$TTY +export SAVEHIST=200000 +export HISTFILE=$HOME/.cache/zsh/history +export SPACEVIMDIR="$HOME/.config/spacevim/" +export FZF_MARKS_FILE=$HOME/.config/fzfmarks # Source additional local files if they exist. z4h source $HOME/.config/local/env.zsh -# Libraries +# Source Files z4h source $HOME/.config/zsh/sshagent.zsh z4h source $Z4H/ohmyzsh/ohmyzsh/lib/history.zsh z4h source $Z4H/ohmyzsh/ohmyzsh/lib/functions.zsh @@ -51,20 +54,19 @@ z4h source $Z4H/ohmyzsh/ohmyzsh/lib/termsupport.zsh z4h source $Z4H/ohmyzsh/ohmyzsh/lib/clipboard.zsh z4h source $Z4H/ohmyzsh/ohmyzsh/lib/grep.zsh z4h source $Z4H/ohmyzsh/ohmyzsh/plugins/command-not-found/command-not-found.plugin.zsh +z4h source $Z4H/urbainvaes/fzf-marks/fzf-marks.plugin.zsh #zinit pack for ls_colors +# Aliases +z4h source $HOME/.config/zsh/aliases.zsh +z4h source $HOME/.config/local/aliases.zsh +# Add flags to existing aliases. +#alias ls="${aliases[ls]:-ls} -A" + # Define key bindings. z4h bindkey z4h-backward-kill-word Ctrl+Backspace Ctrl+H z4h bindkey z4h-backward-kill-zword Ctrl+Alt+Backspace -z4h bindkey undo Ctrl+/ # undo the last command line change -z4h bindkey redo Alt+/ # redo the last undone command line change - -z4h bindkey z4h-cd-back Alt+Left # cd into the previous directory -z4h bindkey z4h-cd-forward Alt+Right # cd into the next directory -z4h bindkey z4h-cd-up Alt+Up # cd into the parent directory -z4h bindkey z4h-cd-down Alt+Down # cd into a child directory - # Autoload functions. autoload -Uz zmv @@ -86,27 +88,7 @@ zstyle ':completion:*:*:*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|:: # Define named directories: ~w <=> Windows home directory on WSL. [[ -z $z4h_win_home ]] || hash -d wsl=$z4h_win_home -# History -export SAVEHIST=200000 -export HISTFILE=$HOME/.cache/zsh/history -export SPACEVIMDIR="$HOME/.config/spacevim/" -export FZF_MARKS_FILE=$HOME/.config/fzfmarks +# Set shell options: http://zsh.sourceforge.net/Doc/Release/Options.html +setopt multios prompt_subst auto_pushd pushd_ignore_dups pushdminus inc_append_history -z4h source $Z4H/urbainvaes/fzf-marks/fzf-marks.plugin.zsh - -# Aliases -z4h source $HOME/.config/zsh/aliases.zsh -z4h source $HOME/.config/local/aliases.zsh - -# Add flags to existing aliases. -#alias ls="${aliases[ls]:-ls} -A" - -# Set shell options: http://zsh.sourceforge.net/Doc/Release/Options.html. -setopt multios -setopt prompt_subst -setopt auto_pushd -setopt pushd_ignore_dups -setopt pushdminus -setopt inc_append_history - -z4h source $HOME/.config/local/rc.zsh +z4h source $HOME/.config/local/rc.zsh \ No newline at end of file