Made some neat changes. Sync only runs git if command exists, same with zsh

This commit is contained in:
Austen Adler 2015-01-10 23:20:42 -05:00
parent 5c6e38dd66
commit b7998f82d1
5 changed files with 24 additions and 16 deletions

View File

@ -47,9 +47,9 @@ while getopts ":hbsdpcw" VALUE "$@"; do
if [ "$VALUE" = "c" ] ; then if [ "$VALUE" = "c" ] ; then
echo "Syncing config files" echo "Syncing config files"
if which trash >/dev/null; then if which trash >/dev/null; then
trash ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc trash ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc ~/.config/liquidpromptrc
else else
rm ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc rm ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zshrc ~/.tmux.conf ~/.config/synapse/gtkrc ~/.config/liquidpromptrc
fi fi
# Install on all systems # Install on all systems
ln -s $ABSPATH/tmux/tmux.conf ~/.tmux.conf ln -s $ABSPATH/tmux/tmux.conf ~/.tmux.conf
@ -59,16 +59,20 @@ while getopts ":hbsdpcw" VALUE "$@"; do
ln -s $ABSPATH/vimperator/vimPgray.vimp ~/.vimperator/colors/vimPgray.vimp ln -s $ABSPATH/vimperator/vimPgray.vimp ~/.vimperator/colors/vimPgray.vimp
ln -s $ABSPATH/git/gitconfig ~/.gitconfig ln -s $ABSPATH/git/gitconfig ~/.gitconfig
ln -s $ABSPATH/shells/bashrc ~/.bashrc ln -s $ABSPATH/shells/bashrc ~/.bashrc
ln -s $ABSPATH/shells/zshrc ~/.zshrc if which git >/dev/null; then
if [ ! -d ~/.fzf ] ; then if which zsh >/dev/null; then
git clone https://github.com/stonewareslord/fzf.git ~/.fzf ln -s $ABSPATH/shells/zshrc ~/.zshrc
~/.fzf/install -y if [ ! -d ~/.antigen ] ; then
git clone https://github.com/zsh-users/antigen ~/.antigen
fi
# Install antigen bundles
zsh -c "source ~/.zshrc;exit"
fi
if [ ! -d ~/.fzf ] ; then
git clone https://github.com/stonewareslord/fzf.git ~/.fzf
~/.fzf/install -y
fi
fi fi
if [ ! -d ~/.antigen ] ; then
git clone https://github.com/zsh-users/antigen ~/.antigen
fi
# Install antigen bundles
zsh -c "source ~/.zshrc;exit"
mkdir -p ~/.config mkdir -p ~/.config
ln -s $ABSPATH/shells/liquidpromptrc ~/.config/liquidpromptrc ln -s $ABSPATH/shells/liquidpromptrc ~/.config/liquidpromptrc
if [ "$(uname)" != "Darwin" ]; then if [ "$(uname)" != "Darwin" ]; then

View File

@ -109,6 +109,7 @@ alias -s docx="libreoffice"
alias -g F='`fzf --no-mouse -m -1 -x`' alias -g F='`fzf --no-mouse -m -1 -x`'
alias -g nify=" > /dev/null 2>&1 &" alias -g nify=" > /dev/null 2>&1 &"
alias -g nifyd=" > /dev/null 2>&1 & disown" alias -g nifyd=" > /dev/null 2>&1 & disown"
alias -g L="2>&1|less"
alias -g G='|& egrep -i' alias -g G='|& egrep -i'
alias -g AW='austenwares.com' alias -g AW='austenwares.com'
export FZF_COMPLETION_OPTS='--no-mouse -m -1 -x' export FZF_COMPLETION_OPTS='--no-mouse -m -1 -x'

View File

@ -31,7 +31,7 @@ bind-key F5 source ~/.tmux.conf
bind-key x detach bind-key x detach
bind-key -n M-Space new-window \; rename-window "-" bind-key -n M-Space new-window \; rename-window "-"
bind-key -n M-[ previous-window bind-key -n M-[ previous-window
bind-key -n M-S-] break-pane # bind-key -n M-S-] break-pane
bind-key -n M-] next-window bind-key -n M-] next-window
bind-key -n M-f resize-pane -Z bind-key -n M-f resize-pane -Z

View File

@ -119,7 +119,7 @@ nnoremap <Down> <C-w>W
nnoremap <Left> :bp<CR> nnoremap <Left> :bp<CR>
nnoremap <Right> :bn<CR> nnoremap <Right> :bn<CR>
nnoremap <C-w>z <C-w>_<C-w>\| nnoremap <C-w>z <C-w>_<C-w>\|
nnoremap <Leader>bun G?Plugin<CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:PluginInstall nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:PluginInstall
nnoremap <Leader><C-p> :CtrlPFunky<CR> nnoremap <Leader><C-p> :CtrlPFunky<CR>
nnoremap <F2> :set invpaste<CR> nnoremap <F2> :set invpaste<CR>
nnoremap <C-Up> [e nnoremap <C-Up> [e
@ -323,9 +323,11 @@ Plug 'Rykka/colorv.vim'
Plug 'mhinz/vim-signify' Plug 'mhinz/vim-signify'
"Git information inline | https://github.com/mhinz/vim-signify "Git information inline | https://github.com/mhinz/vim-signify
Plug 'jamessan/vim-gnupg' Plug 'jamessan/vim-gnupg'
" | https://github.com/jamessan/vim-gnupg "GPG support | https://github.com/jamessan/vim-gnupg
Plug 'stonewareslord/zeavim.vim' Plug 'stonewareslord/zeavim.vim'
" | "Zeal support |
Plug 'vim-scripts/DirDiff.vim'
"Directory diff | https://github.com/vim-scripts/DirDiff.vim
"DO NOT DELETE LINE ABOVE OR \bun WILL BREAK "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK
call plug#end() call plug#end()
filetype plugin indent on filetype plugin indent on

View File

@ -24,7 +24,8 @@ inoremap <C-H> <Home>
inoremap <C-b> <C-Left> inoremap <C-b> <C-Left>
inoremap <C-w> <C-Right> inoremap <C-w> <C-Right>
inoremap <C-d><C-d> <Home><S-End><BS> inoremap <C-d><C-d> <Home><S-End><BS>
inoremap <C-a> <End><S-Home> inoremap <C-a> i<C-a>
noremap <Leader><Leader> gi !gi <CR>
vnoremap L $ vnoremap L $
vnoremap H ^ vnoremap H ^
"set animations=true "set animations=true