merge latest clean

.bashrc

@@ -129,6 +129,7 @@ export WTS="//mnt/c/Users/PTrowbridge/AppData/Local/Packages/Microsoft.WindowsTe
 export PATH=$PATH:"//mnt/c/Program Files/VideoLAN/VLC"
 export PATH=$PATH:"//mnt/c/Program Files (x86)/BraveSoftware/Brave-Browser/Application"
 export MS="sqlcmd.exe -S mid-sql02 -i"
+export PSQL_PAGER="pspg"
 
 if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
     GIT_PROMPT_ONLY_IN_REPO=1

.gitconfig

@@ -7,11 +7,10 @@
 [push]
 	default = simple
 [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]
-        date = format:%Y-%m-%d %H:%M:%S
+    date = format:%Y-%m-%d %H:%M:%S
 [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]
-        tool = vimdiff
+    tool = vimdiff

.inputrc

@@ -0,0 +1 @@
+set bell-style none

.pspgconf

@@ -0,0 +1,34 @@
+ascii_menu = false
+bold_labels = false
+bold_cursor = false
+ignore_case = false
+ignore_lower_case = false
+no_cursor = false
+no_sound = false
+no_mouse = false
+less_status_bar = false
+no_highlight_search = false
+no_highlight_lines = false
+force_uniborder = false
+show_rownum = false
+without_commandbar = false
+without_topbar = false
+vertical_cursor = false
+on_sigint_exit = false
+no_sigint_search_reset = false
+double_header = false
+quit_on_f3 = false
+pgcli_fix = false
+xterm_mouse_mode = true
+show_scrollbar = true
+menu_always = false
+empty_string_is_null = true
+last_row_search = true
+progressive_load_mode = true
+highlight_odd_rec = false
+hide_header_line = false
+theme = 0
+border_type = 2
+default_clipboard_format = 0
+clipboard_app = 0
+hist_size = 500

.tmux.conf

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

.vimrc

@@ -8,11 +8,11 @@ call vundle#begin()
 Plugin 'gmarik/Vundle.vim'
 Plugin 'vim-airline/vim-airline'
 Plugin 'kien/ctrlp.vim'
-Plugin 'tpop/vim-fugitive'
 Plugin 'scrooloose/nerdtree'
 Plugin 'edkolev/tmuxline.vim'
 Plugin 'vim-airline/vim-airline-themes'
-Plugin 'plasticboy/vim-markdown'
+Plugin 'leafgarland/typescript-vim'
+Plugin 'peitalin/vim-jsx-typescript'
 "Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -60,6 +60,10 @@ nmap <Leader>e :NERDTreeToggle<CR>
 set incsearch
 set showmatch
 set hlsearch
+set mouse=a
+"----disable the bell; t_vb is required to be set to nothing
+set visualbell
+set t_vb=
 nnoremap \\ :noh<cr> " Clear higlighting
 "nnoremap <esc> :noh<return><esc>
 " Resize windows

setup.sh

@@ -5,7 +5,49 @@
 
 dir=~/dot_config
 backup=~/dot_config_backup
-files=".bashrc .vimrc .tmux.conf .psqlrc .gitconfig"
+files=".bashrc .vimrc .tmux.conf .psqlrc .gitconfig .inputrc .pspgconf"
+
+#-------------------------------------------------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}' "vim" 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
+
+#----------pspg-----------
+if [ "$(dpkg-query -W -f='${Status}' "pspg" 2>/dev/null | grep -c "ok installed")" == "1" ]
+then
+    echo "pspg already installed"
+else
+    echo "installing pspg..."
+    apt update -q4
+    apt install pspg -y
+fi
 
 #------------------------------------------------ create the resore directory if it doesn't already exist--------------------------------------------------
 
@@ -32,17 +74,17 @@ done
 
 #----------------------------------------------------------install  go and go-powerline--------------------------------------------------------------------
 
+# if $GOPATH is null the prompt for golang install
 if [ -z "$GOPATH" ]
 then
     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
             [Yy]* ) 
                 sudo apt-get install golang -y;
-                go get -u github.com/justjanne/powerline-go;
                 break;;
             [Nn]* ) 
-                exit;;
+                break;;
             * ) echo "Please answer yes or no.";;
         esac
     done
@@ -50,27 +92,28 @@ fi
 
 #----------------------------------------------------------install  go-powerline---------------------------------------------------------------------------
 
-if [ -z "$GOPATH" ]
+# see if this file exists, if not prompt for install
+if [ ! -f ~/go/bin/powerline-go ]
 then
     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
             [Yy]* ) 
-                sudo apt-get install golang -y;
                 go get -u github.com/justjanne/powerline-go;
                 break;;
             [Nn]* ) 
-                exit;;
+                break;;
             * ) echo "Please answer yes or no.";;
         esac
     done
 fi
+
 #----------------------------------------------------------install power line fonts------------------------------------------------------------------------
 
 if [ ! -d ~/fonts ]
 then
     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
             [Yy]* ) 
                 git clone https://github.com/powerline/fonts ~/fonts;
@@ -78,7 +121,7 @@ then
                 ./install.sh;
                 break;;
             [Nn]* ) 
-                exit;;
+                break;;
             * ) echo "Please answer yes or no.";;
         esac
     done
@@ -90,13 +133,13 @@ fi
 if [ ! -d ~/.tmux/plugins/tpm ]
 then
     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
             [Yy]* ) 
                 git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm;
                 break;;
             [Nn]* ) 
-                exit;;
+                break;;
             * ) echo "Please answer yes or no.";;
         esac
     done
@@ -105,16 +148,26 @@ fi
 
 #----------------------------------------------------------see if Vundle has been cloned yet and do so-----------------------------------------------------
 
-if [ ! -d ~/.vim ]
+if [ ! -d ~/.vim/bundle ]
 then
-    git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
     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
-            [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.";;
         esac
     done
 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"