merge clean

This commit is contained in:
Paul Trowbridge 2022-05-03 09:45:37 -04:00
commit fe34917fb5
4 changed files with 65 additions and 23 deletions

View File

@ -7,11 +7,10 @@
[push] [push]
default = simple default = simple
[alias] [alias]
quick-stats = ! /usr/local/bin/git-quick-stats pushall = !git remote | xargs -L1 git push --all
pushall = !git remote | xargs -L1 git push
[log] [log]
date = format:%Y-%m-%d %H:%M:%S date = format:%Y-%m-%d %H:%M:%S
[format] [format]
pretty = format:'%C(yellow)%h %Cred%ad %Cblue%an %Cgreen%d %Creset%s' pretty = format:'%C(yellow)%h %Cred%ad %Cblue%an %Cgreen%d %Creset%s'
[diff] [diff]
tool = vimdiff tool = vimdiff

View File

@ -4,6 +4,7 @@ bind -r h select-pane -L # move left
bind -r j select-pane -D # move down bind -r j select-pane -D # move down
bind -r k select-pane -U # move up bind -r k select-pane -U # move up
bind -r l select-pane -R # move right bind -r l select-pane -R # move right
set -g mouse on
#plugin manager for install tmux-resurrect #plugin manager for install tmux-resurrect
set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tpm'

1
.vimrc
View File

@ -8,7 +8,6 @@ call vundle#begin()
Plugin 'gmarik/Vundle.vim' Plugin 'gmarik/Vundle.vim'
Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline'
Plugin 'kien/ctrlp.vim' Plugin 'kien/ctrlp.vim'
Plugin 'tpop/vim-fugitive'
Plugin 'scrooloose/nerdtree' Plugin 'scrooloose/nerdtree'
Plugin 'edkolev/tmuxline.vim' Plugin 'edkolev/tmuxline.vim'
Plugin 'vim-airline/vim-airline-themes' Plugin 'vim-airline/vim-airline-themes'

View File

@ -7,6 +7,38 @@ dir=~/dot_config
backup=~/dot_config_backup backup=~/dot_config_backup
files=".bashrc .vimrc .tmux.conf .psqlrc .gitconfig" files=".bashrc .vimrc .tmux.conf .psqlrc .gitconfig"
#-------------------------------------------------install debian tooling-----------------------------------------------------------------------------------
#----------curl-----------
if [ "$(dpkg-query -W -f='${Status}' "curl" 2>/dev/null | grep -c "ok installed")" == "1" ]
then
echo "curl already installed"
else
echo "installing curl"
apt update -q4
apt install curl -y
fi
#----------vim-----------
if [ "$(dpkg-query -W -f='${Status}' "curl" 2>/dev/null | grep -c "ok installed")" == "1" ]
then
echo "vim already installed"
else
echo "installing vim"
apt update -q4
apt install vim -y
fi
#----------tmux-----------
if [ "$(dpkg-query -W -f='${Status}' "tmux" 2>/dev/null | grep -c "ok installed")" == "1" ]
then
echo "tmux already installed"
else
echo "installing tmux"
apt update -q4
apt install tmux -y
fi
#------------------------------------------------ create the resore directory if it doesn't already exist-------------------------------------------------- #------------------------------------------------ create the resore directory if it doesn't already exist--------------------------------------------------
if [ ! -d $backup ] if [ ! -d $backup ]
@ -32,17 +64,17 @@ done
#----------------------------------------------------------install go and go-powerline-------------------------------------------------------------------- #----------------------------------------------------------install go and go-powerline--------------------------------------------------------------------
# if $GOPATH is null the prompt for golang install
if [ -z "$GOPATH" ] if [ -z "$GOPATH" ]
then then
while true; do while true; do
read -p "do you want to install golang and go-powerline?" yn read -p "do you want to install golang (needed for go-powerline)?" yn
case $yn in case $yn in
[Yy]* ) [Yy]* )
sudo apt-get install golang -y; sudo apt-get install golang -y;
go get -u github.com/justjanne/powerline-go;
break;; break;;
[Nn]* ) [Nn]* )
exit;; break;;
* ) echo "Please answer yes or no.";; * ) echo "Please answer yes or no.";;
esac esac
done done
@ -50,27 +82,28 @@ fi
#----------------------------------------------------------install go-powerline--------------------------------------------------------------------------- #----------------------------------------------------------install go-powerline---------------------------------------------------------------------------
if [ -z "$GOPATH" ] # see if this file exists, if not prompt for install
if [ ! -f ~/go/bin/powerline-go ]
then then
while true; do while true; do
read -p "do you want to install golang and go-powerline?" yn read -p "do you want to install go-powerline?" yn
case $yn in case $yn in
[Yy]* ) [Yy]* )
sudo apt-get install golang -y;
go get -u github.com/justjanne/powerline-go; go get -u github.com/justjanne/powerline-go;
break;; break;;
[Nn]* ) [Nn]* )
exit;; break;;
* ) echo "Please answer yes or no.";; * ) echo "Please answer yes or no.";;
esac esac
done done
fi fi
#----------------------------------------------------------install power line fonts------------------------------------------------------------------------ #----------------------------------------------------------install power line fonts------------------------------------------------------------------------
if [ ! -d ~/fonts ] if [ ! -d ~/fonts ]
then then
while true; do while true; do
read -p "do you want to install powerline fonts from https://github.com/powerline/fonts?" yn read -p "do you want to install powerline fonts from 'https://github.com/powerline/fonts' ?" yn
case $yn in case $yn in
[Yy]* ) [Yy]* )
git clone https://github.com/powerline/fonts ~/fonts; git clone https://github.com/powerline/fonts ~/fonts;
@ -78,7 +111,7 @@ then
./install.sh; ./install.sh;
break;; break;;
[Nn]* ) [Nn]* )
exit;; break;;
* ) echo "Please answer yes or no.";; * ) echo "Please answer yes or no.";;
esac esac
done done
@ -90,13 +123,13 @@ fi
if [ ! -d ~/.tmux/plugins/tpm ] if [ ! -d ~/.tmux/plugins/tpm ]
then then
while true; do while true; do
read -p "do you want to install the tmux plugin manager from https://github.com/tmux-plugins/tpm" yn read -p "do you want to install the tmux plugin manager from 'https://github.com/tmux-plugins/tpm' ?" yn
case $yn in case $yn in
[Yy]* ) [Yy]* )
git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm; git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm;
break;; break;;
[Nn]* ) [Nn]* )
exit;; break;;
* ) echo "Please answer yes or no.";; * ) echo "Please answer yes or no.";;
esac esac
done done
@ -105,16 +138,26 @@ fi
#----------------------------------------------------------see if Vundle has been cloned yet and do so----------------------------------------------------- #----------------------------------------------------------see if Vundle has been cloned yet and do so-----------------------------------------------------
if [ ! -d ~/.vim ] if [ ! -d ~/.vim/bundle ]
then then
git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
while true; do while true; do
read -p "Do you want to install the vim plugins now?" yn read -p "do you want to install the Vundle plugin manager for vim from https://github.com/VundleVim/Vundle.vim.git?" yn
case $yn in case $yn in
[Yy]* ) vim +PluginInstall +qall; break;; [Yy]* )
[Nn]* ) exit;; git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
# ask to install plugins after vundle installed
while true; do
read -p "Do you want to install the vim plugins now?" yn
case $yn in
[Yy]* ) vim +PluginInstall +qall; break;;
[Nn]* ) break;;
* ) echo "Please answer yes or no.";;
esac
done
break;;
[Nn]* )
break;;
* ) echo "Please answer yes or no.";; * ) echo "Please answer yes or no.";;
esac esac
done done
fi fi
echo "you may need to run vim and execute :PluginInstall to sync packages with the new .vimrc, or \"vim +PluginInstall +qall\" from the command line"