joshtronic/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[zsh] consolidates OS-specific files

Browse source
This commit is contained in:
Josh Sherman 2017-01-23 18:16:18 -06:00
parent 4ab2b26363
commit 59912e0236
No known key found for this signature in database
GPG key ID: 55B058A80530EF22
4 changed files with 35 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install
View file

@ -24,7 +24,7 @@ ln -s $DOTFILES/my.cnf $HOME/.my.cnf
ln -s $DOTFILES/tmux.conf $HOME/.tmux.conf ln -s $DOTFILES/tmux.conf $HOME/.tmux.conf
ln -s $DOTFILES/tmuxinator $HOME/.tmuxinator ln -s $DOTFILES/tmuxinator $HOME/.tmuxinator
ln -s $DOTFILES/vim $HOME/.vim ln -s $DOTFILES/vim $HOME/.vim
ln -s $DOTFILES/zsh/zshrc $HOME/.zshrc ln -s $DOTFILES/zshrc $HOME/.zshrc
if [[ `uname` == 'Darwin' ]]; then if [[ `uname` == 'Darwin' ]]; then
rm -rf $HOME/Library/Application\ Support/Karabiner rm -rf $HOME/Library/Application\ Support/Karabiner

20
zsh/Darwin.zshrc
View file

@ -1,20 +0,0 @@
#!/usr/bin/env zsh
export GREP_OPTIONS="--color=auto --exclude-dir=${GREP_EXCLUDE_DIR} --exclude-dir=.sass-cache"
source "`brew --prefix`/etc/grc.bashrc"
source $HOME/.rvm/scripts/rvm
# Requires sudo, saves a step
alias mtr="sudo mtr"
# Because macOS is dumb
alias mux="tmuxinator"
# Unquarantine files on OSX
alias unquarantine="xattr -r -d com.apple.quarantine *"
# Because OS X returns all caps
function uuidgen() {
env uuidgen "$@" | awk '{print tolower($0)}'
}

15
zsh/Linux.zshrc
View file

@ -1,15 +0,0 @@
#!/bin/zsh
alias pbcopy='xclip -selection clipboard'
alias pbpaste='xclip -selection clipboard -o'
if [ -x /usr/bin/dircolors ]; then
test -r $HOME/.dircolors && eval "$(dircolors -b $HOME/.dircolors)" || eval "$(dircolors -b)"
alias ls="ls --color=auto"
GREP_FLAGS=" --color=auto --exclude-dir=${GREP_EXCLUDE_DIR}"
alias grep="grep ${GREP_FLAGS}"
alias egrep="egrep ${GREP_FLAGS}"
alias fgrep="fgrep ${GREP_FLAGS}"
fi

36
zsh/zshrc → zshrc
View file

@ -3,6 +3,7 @@
DOTFILES=$HOME/.dotfiles DOTFILES=$HOME/.dotfiles
ADOTDIR=$DOTFILES/vendor/zsh-users/antigen/ ADOTDIR=$DOTFILES/vendor/zsh-users/antigen/
GREP_EXCLUDE_DIR="{.git,.sass-cache,artwork,node_modules,vendor}" GREP_EXCLUDE_DIR="{.git,.sass-cache,artwork,node_modules,vendor}"
OS=`uname`
export CLICOLOR=1 export CLICOLOR=1
export EDITOR=vim export EDITOR=vim
@ -11,9 +12,40 @@ export TERM="xterm-256color"
bindkey -v bindkey -v
source $DOTFILES/zsh/`uname`.zshrc if [ $OS = 'Linux' ]; then
source $DOTFILES/vendor/zsh-users/antigen/antigen.zsh alias pbcopy='xclip -selection clipboard'
alias pbpaste='xclip -selection clipboard -o'
if [ -x /usr/bin/dircolors ]; then
test -r $HOME/.dircolors && eval "$(dircolors -b $HOME/.dircolors)" || eval "$(dircolors -b)"
alias ls="ls --color=auto"
GREP_FLAGS=" --color=auto --exclude-dir=${GREP_EXCLUDE_DIR}"
alias grep="grep ${GREP_FLAGS}"
alias egrep="egrep ${GREP_FLAGS}"
alias fgrep="fgrep ${GREP_FLAGS}"
fi
elif [ $OS = 'Darwin' ]; then
export GREP_OPTIONS="--color=auto --exclude-dir=${GREP_EXCLUDE_DIR} --exclude-dir=.sass-cache"
source "`brew --prefix`/etc/grc.bashrc"
source $HOME/.rvm/scripts/rvm
# Requires sudo, saves a step
alias mtr="sudo mtr"
# Because macOS is dumb
alias mux="tmuxinator"
# Unquarantine files on OSX
alias unquarantine="xattr -r -d com.apple.quarantine *"
# Because OS X returns all caps
function uuidgen() { env uuidgen "$@" | awk '{print tolower($0)}'; }
fi
source $DOTFILES/vendor/zsh-users/antigen/antigen.zsh
antigen-use oh-my-zsh antigen-use oh-my-zsh
antigen-bundle zsh-users/zsh-completions antigen-bundle zsh-users/zsh-completions
antigen-bundle zsh-users/zsh-syntax-highlighting antigen-bundle zsh-users/zsh-syntax-highlighting