diff options
author | Yann Herklotz <git@yannherklotz.com> | 2020-03-18 16:59:42 +0000 |
---|---|---|
committer | Yann Herklotz <git@yannherklotz.com> | 2020-03-18 16:59:42 +0000 |
commit | a22814403d8c6d7b0aecdc6e501302d79796cabe (patch) | |
tree | d1a0e799bd116a8bb493fc23e985162f7ce76aa9 /zsh/.zshrc | |
parent | 1aded6330456e7e9c13c5e6b0060eb6230428a36 (diff) | |
parent | a9bb367d8117fb92d966eca6d5aefe1c70036a4b (diff) | |
download | dotfiles-a22814403d8c6d7b0aecdc6e501302d79796cabe.tar.gz dotfiles-a22814403d8c6d7b0aecdc6e501302d79796cabe.zip |
Merge branch 'mac' of github.com:ymherklotz/dotfiles into macmac
Diffstat (limited to 'zsh/.zshrc')
-rw-r--r-- | zsh/.zshrc | 24 |
1 files changed, 9 insertions, 15 deletions
@@ -25,24 +25,18 @@ setopt HIST_IGNORE_DUPS setopt HIST_IGNORE_SPACE setopt HIST_FIND_NO_DUPS -(cat ~/.cache/wal/sequences &) >/dev/null 2>&1 +if [ -d ~/.cache/wal ]; then (cat ~/.cache/wal/sequences &) fi # Sourcing everything -source /usr/share/fzf/key-bindings.zsh -source /usr/share/fzf/completion.zsh -source $HOME/.zsh/export.zsh -source $HOME/.zsh/minimal.zsh -source $HOME/.zsh/function.zsh -source $HOME/.zsh/startup.zsh -source $HOME/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh -source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh +if [ -e /usr/share/fzf/key-bindings.zsh ]; then source /usr/share/fzf/key-bindings.zsh; fi +if [ -e /usr/share/fzf/completion.zsh ]; then source /usr/share/fzf/completion.zsh; fi +if [ -e $HOME/.zsh/export.zsh ]; then source $HOME/.zsh/export.zsh; fi +if [ -e $HOME/.zsh/minimal.zsh ]; then source $HOME/.zsh/minimal.zsh; fi +if [ -e $HOME/.zsh/function.zsh ]; then source $HOME/.zsh/function.zsh; fi +if [ -e $HOME/.zsh/startup.zsh ]; then source $HOME/.zsh/startup.zsh; fi +if [ -e $HOME/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh ]; then source $HOME/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh; fi +if [ -e $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh; fi bindkey '^[[A' history-substring-search-up bindkey '^[[B' history-substring-search-down bindkey -M emacs '^P' history-substring-search-up bindkey -M emacs ^N history-substring-search-down - -# opam configuration -test -r /home/yannherklotz/.opam/opam-init/init.zsh && . /home/yannherklotz/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true - -# added by travis gem -[ -f /home/ymherklotz/.travis/travis.sh ] && source /home/ymherklotz/.travis/travis.sh |