Browse Source

Merge branch 'master' of git.xchg.sh:angrygoats/essentials

master
Taylor Bockman 2 years ago
parent
commit
7665f61ae6
  1. 5
      dotfiles/bash/bashrc
  2. 6
      dotfiles/global_gitignore
  3. 9
      dotfiles/zsh/exports.zsh
  4. 6
      dotfiles/zsh/zprofile
  5. 11
      dotfiles/zsh/zshrc

5
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

6
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

9
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

6
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

11
dotfiles/zsh/zshrc

@ -59,11 +59,11 @@ if [[ ! -d $HOME/.zsh ]]; then
popd
fi
autoload -U is-at-least
# 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
if is-at-least 4.3.11; then
if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then
echo "Installing zsh syntax highlighting"
pushd
@ -72,7 +72,8 @@ if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then
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

Loading…
Cancel
Save