diff --git a/dotfiles/bash/bashrc b/dotfiles/bash/bashrc index b9e30ee..4133619 100644 --- a/dotfiles/bash/bashrc +++ b/dotfiles/bash/bashrc @@ -192,3 +192,8 @@ fi # Add RVM to PATH for scripting. Make sure this is the last PATH variable change. export PATH="$PATH:$HOME/.rvm/bin" . "$HOME/.cargo/env" + +if [ -f "~/.private" ]; then + source ~/.private +fi + diff --git a/dotfiles/global_gitignore b/dotfiles/global_gitignore index 75e9025..6de12e7 100644 --- a/dotfiles/global_gitignore +++ b/dotfiles/global_gitignore @@ -38,8 +38,14 @@ tramp # Notes file I tend to leave in projects project-notes.org +todo.org # Recent files recentf .DS_Store + +# For pyright per-project configurations +pyrightconfig.json +*.sublime-project +*.sublime-workspace diff --git a/dotfiles/zsh/exports.zsh b/dotfiles/zsh/exports.zsh index f588ee4..b2fab00 100644 --- a/dotfiles/zsh/exports.zsh +++ b/dotfiles/zsh/exports.zsh @@ -29,5 +29,10 @@ export HISTCONTROL=ignoredups # If go is installed, set the $GOPATH to the projects directory created above. if which go > /dev/null; then export GOPATH=$HOME/.go; fi -export PATH="$PATH:$HOME/.rvm/bin" -. "$HOME/.cargo/env" +if [ -d "$HOME/.rvm" ]; then + export PATH="$PATH:$HOME/.rvm/bin" +fi + +if [ -f "$HOME/.cargo/env" ]; then + . "$HOME/.cargo/env" +fi diff --git a/dotfiles/zsh/zprofile b/dotfiles/zsh/zprofile index a9b7243..bba9daf 100644 --- a/dotfiles/zsh/zprofile +++ b/dotfiles/zsh/zprofile @@ -19,8 +19,10 @@ if hash pyenv 2>/dev/null; then eval "$(pyenv init -)" fi -# Local bin export PATH=$HOME/bin:/usr/local/bin:$PATH test -r /home/vm/.opam/opam-init/init.sh && . /home/vm/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true -. "$HOME/.cargo/env" + +if [ -f "$HOME/.cargo/env" ]; then + . "$HOME/.cargo/env" +fi diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc index 308e222..8faa05c 100644 --- a/dotfiles/zsh/zshrc +++ b/dotfiles/zsh/zshrc @@ -59,20 +59,21 @@ if [[ ! -d $HOME/.zsh ]]; then popd fi -# Install zsh-syntax-highlighting if it doesn't exist -if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then - if ! is-at-least 4.3.11; then - echo "ZSH syntax highlighting requires ZSH >= 4.3.11 (current: $ZSH_VERSION)." - else - echo "Installing zsh syntax highlighting" - pushd - - cd $HOME/.zsh - git clone https://github.com/zsh-users/zsh-syntax-highlighting.git - - popd - fi +autoload -U is-at-least +# Install zsh-syntax-highlighting if it doesn't exist +if is-at-least 4.3.11; then + if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then + echo "Installing zsh syntax highlighting" + pushd + + cd $HOME/.zsh + git clone https://github.com/zsh-users/zsh-syntax-highlighting.git + + popd + fi +else + echo "ZSH syntax highlighting requires ZSH >= 4.3.11 (current: $ZSH_VERSION)." fi zstyle ':completion:*:*:git:*' script $HOME/.zsh/git-completion.bash