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

Consolidating things into ~/.local

Browse source
This commit is contained in:
Josh Sherman 2018-01-01 21:54:20 -06:00
parent c67f9e7089
commit c1b8d0ee65
No known key found for this signature in database
GPG key ID: 55B058A80530EF22
3 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bashrc
View file

@ -1,11 +1,13 @@
#!/usr/bin/env bash
export DOTFILES=$HOME/.dotfiles
export INCLUDES=$HOME/.local/share/dotfiles
[ -f $DOTFILES/env ] && source $DOTFILES/env
[ -f $DOTFILES/aliases ] && source $DOTFILES/aliases
[ -x /usr/bin/dircolors ] && eval `dircolors $DOTFILES/dircolors`
[ -f $HOME/.fzf.bash ] && source $HOME/.fzf.bash
source $DOTFILES/env
source $DOTFILES/aliases
source $HOME/.fzf.bash
eval `dircolors $DOTFILES/dircolors`
bind 'set completion-ignore-case on'
bind 'set show-all-if-ambiguous on'
@ -25,4 +27,4 @@ PS1='
# GIT_PROMPT_ONLY_IN_REPO=1
# GIT_PROMPT_THEME=Solarized
# source $HOME/.bash/bash-git-prompt/gitprompt.sh
# source $INCLUDES/bash-git-prompt/gitprompt.sh

34
install
View file

@ -3,7 +3,9 @@
if [ -z "$HOME" ]; then echo "Seems you're \$HOMEless :("; exit 1; fi
DOTFILES=$HOME/.dotfiles
GITCLONE="git clone --depth=1"
GITDEST=$HOME/.local/share/dotfiles
cd $HOME
rm -rf $DOTFILES
@ -16,15 +18,13 @@ git pull origin master
git submodule update --init --recursive
rm -rf \
$HOME/.bash \
$GITDEST \
$HOME/.bashrc \
$HOME/.fzf \
$HOME/.gitconfig \
$HOME/.config/gtk-3.0/gtk.css \
$HOME/.screenrc \
$HOME/.vim \
$HOME/.vimrc \
$HOME/.zsh \
$HOME/.zshrc
ln -s $DOTFILES/bashrc $HOME/.bashrc
@ -35,29 +35,27 @@ ln -s $DOTFILES/vimrc $HOME/.vimrc
ln -s $DOTFILES/zshrc $HOME/.zshrc
mkdir -p \
$HOME/.bash \
$GITDEST \
$HOME/.local/share/vim/{swap,undo} \
$HOME/.vim/pack/plugins/start \
$HOME/.zsh
$HOME/.vim/pack/plugins/start
$GITCLONE https://github.com/magicmonty/bash-git-prompt.git $HOME/.bash/bash-git-prompt
$GITCLONE https://github.com/junegunn/fzf.git $GITDEST/fzf
$GITCONE/fzf/install --key-bindings --completion --no-update-rc
$GITCLONE https://github.com/junegunn/fzf.git $HOME/.fzf
$GITCLONE https://github.com/magicmonty/bash-git-prompt.git $GITDEST/bash-git-prompt
$GITCLONE https://github.com/w0rp/ale.git ~/.vim/pack/plugins/start/ale
$GITCLONE https://github.com/junegunn/fzf.vim.git ~/.vim/pack/plugins/start/fzf
$GITCLONE https://github.com/zsh-users/zsh-autosuggestions.git $GITDEST/zsh-autosuggestions
$GITCLONE https://github.com/zsh-users/zsh-completions.git $GITDEST/zsh-completions
$GITCLONE https://github.com/olivierverdier/zsh-git-prompt.git $GITDEST/zsh-git-prompt
$GITCLONE https://github.com/zsh-users/zsh-history-substring-search.git $GITDEST/zsh-history-substring-search
$GITCLONE https://github.com/zsh-users/zsh-syntax-highlighting.git $GITDEST/zsh-syntax-highlighting
$GITCLONE https://github.com/zsh-users/zsh-autosuggestions.git ~/.zsh/zsh-autosuggestions
$GITCLONE https://github.com/zsh-users/zsh-completions.git ~/.zsh/zsh-completions
$GITCLONE https://github.com/olivierverdier/zsh-git-prompt.git ~/.zsh/zsh-git-prompt
$GITCLONE https://github.com/zsh-users/zsh-history-substring-search.git ~/.zsh/zsh-history-substring-search
$GITCLONE https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.zsh/zsh-syntax-highlighting
$HOME/.fzf/install --key-bindings --completion --no-update-rc
$GITCLONE https://github.com/w0rp/ale.git $HOME/.vim/pack/plugins/start/ale
$GITCLONE https://github.com/junegunn/fzf.vim.git $HOME/.vim/pack/plugins/start/fzf
cd $HOME
rm -f $HOME/.zcompdump*
compinit
echo
echo 'DONEZO!!~!'
echo

21
zshrc
View file

@ -1,20 +1,19 @@
#!/usr/bin/env zsh
export DOTFILES=$HOME/.dotfiles
export INCLUDES=$HOME/.local/share/dotfiles
[ -f $DOTFILES/env ] && source $DOTFILES/env
[ -f $DOTFILES/aliases ] && source $DOTFILES/aliases
[ -x /usr/bin/dircolors ] && eval `dircolors $DOTFILES/dircolors`
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
source $DOTFILES/env
source $DOTFILES/aliases
source $HOME/.fzf.zsh
export DOTZSH=$HOME/.zsh
eval `dircolors $DOTFILES/dircolors`
source $DOTZSH/zsh-autosuggestions/zsh-autosuggestions.zsh
source $DOTZSH/zsh-git-prompt/zshrc.sh
source $DOTZSH/zsh-history-substring-search/zsh-history-substring-search.zsh
source $DOTZSH/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
fpath=($HOME/.zsh/zsh-completions/src $fpath)
source $INCLUDES/zsh-autosuggestions/zsh-autosuggestions.zsh
source $INCLUDES/zsh-completions/zsh-completions.plugin.zsh
source $INCLUDES/zsh-git-prompt/zshrc.sh
source $INCLUDES/zsh-history-substring-search/zsh-history-substring-search.zsh
source $INCLUDES/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
HISTFILE=$HOME/.zsh_history
HISTSIZE=10000