.bashrc

@@ -120,25 +120,31 @@ EDITOR=/usr/bin/vim.basic
 PAGER="less"
 LESS="-S"
 export IPTOKEN="6ac0a563fc06ab"
-export PG="psql -U ptrowbridge -d ubm -p 5432 -h usmidsap01"
+export PG="psql -U ptrowbridge -d ubm -p 5030 -h usmidlnx01"
+export PGD="psql -U ptrowbridge -d ubm -p 5432 -h usmidlnx01"
+export RU="//mnt/c/Users/PTrowbridge/AppData/Roaming/runner"
+export HP="//mnt/c/Users/PTrowbridge"
+export XL="//mnt/c/Program\ Files/Microsoft\ Office/root/Office16/EXCEL.EXE"
+export WTS="//mnt/c/Users/PTrowbridge/AppData/Local/Packages/Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState/settings.json"
+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"
-alias opg="lsof +D . | grep 'pg.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g'"
-#alias opg="lsof +D . | grep 'pg.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g' | xargs -r realpath"
-alias osw="lsof +D . | awk '\$NF ~ /swp$/ {print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g'"
-alias xpg="lsof +D . | grep 'pg.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g' | xargs -r $PG -f"
-alias xsw="lsof +D . | grep '.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g' | xargs -r $PG -f"
-alias ons='lsof +D ~/.local/state/nvim/swap/ | grep -o "/swap/.*" | cut -c 7- | tr "%" "/" | sed "s/\\.swp$//" | grep "$(pwd)"'
-alias xns='lsof +D ~/.local/state/nvim/swap/ | grep -o "/swap/.*" | cut -c 7- | tr "%" "/" | sed "s/\\.swp$//" | grep "$(pwd)" | fzf | xargs -I % $PG -f % | pspg'
-alias mns='fzf | xargs -I {} sqlcmd.exe -S usmidsql01 -i {}'
 
 if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
     GIT_PROMPT_ONLY_IN_REPO=1
     source $HOME/.bash-git-prompt/gitprompt.sh
 fi
 
+#GOPATH=$HOME/go
+#function _update_ps1() {
+#    #PS1="$($GOPATH/bin/powerline-go -theme low-contrast -condensed -error $?)"
+#    PS1="$($GOPATH/bin/powerline-go -condensed -error $?)"
+#}
+#if [ "$TERM" != "linux" ] && [ -f "$GOPATH/bin/powerline-go" ]; then
+#    PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
+#fi
 
-bind 'set bell-style none'
+export DENO_INSTALL="/home/ptrowbridge/.deno"
+export PATH=$PATH:"$DENO_INSTALL/bin:$PATH"
 
-
-[ -f ~/dot_config/.bashrc_local ] && source ~/dot_config/.bashrc_local
+eval `keychain --eval id_rsa`

.gitconfig

@@ -7,10 +7,11 @@
 [push]
 	default = simple
 [alias]
-	pushall = !git remote | xargs -L1 git push --all
+    quick-stats = ! /usr/local/bin/git-quick-stats
+	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

.gitignore

@@ -1,2 +1 @@
 *.swp
-.bashrc_local

.pspgconf

@@ -1,34 +0,0 @@
-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,26 +4,13 @@ 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'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'jimeh/tmux-themepack'
-set -g @themepack 'powerline/default/purple'
-#-----------------------nova---------------------------------------------
-#set -g @plugin 'o0th/tmux-nova'
-#set -g @nova-nerdfonts true
-#set -g @nova-nerdfonts-left 
-#set -g @nova-nerdfonts-right 
-#set -g @nova-segment-mode "#{?client_prefix,Ω,ω}"
-#set -g @nova-segment-mode-colors "#50fa7b #282a36"
-#set -g @nova-segment-whoami "#(whoami)@#h"
-#set -g @nova-segment-whoami-colors "#50fa7b #282a36"
-#set -g @nova-pane "#I#{?pane_in_mode,  #{pane_mode},}  #W"
-#set -g @nova-rows 0
-#set -g @nova-segments-0-left "mode"
-#set -g @nova-segments-0-right "whoami"
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'
+
+# mouse support
+set -g mouse on 

.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 'leafgarland/typescript-vim'
-Plugin 'peitalin/vim-jsx-typescript'
+Plugin 'plasticboy/vim-markdown'
 "Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -26,7 +26,7 @@ let NERDTreeShowHidden=1
 set tabstop=4 softtabstop=0 expandtab shiftwidth=4 smarttab
 set mouse=a
 set nowrap
-colorscheme darkblue
+colorscheme ron
 syntax on
 set splitright
 set splitbelow
@@ -39,8 +39,7 @@ let g:netrw_altv = 1
 let g:netrw_winsize = 25
 "----airline tabs for buffers-------
 let g:airline#extensions#tabline#enabled = 1
-let g:airline_theme = 'violet'
-let g:airline_solarized_bg='dark'
+let g:airline_theme = 'dark'
 let g:tmuxline_powerline_separators = 1
 let g:airline_powerline_fonts = 1
 "----markdown folding------------
@@ -61,10 +60,6 @@ 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,49 +5,7 @@
 
 dir=~/dot_config
 backup=~/dot_config_backup
-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
-    sudo 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
-    sudo 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
-    sudo 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
-    sudo apt install pspg -y
-fi
+files=".bashrc .vimrc .tmux.conf .psqlrc .gitconfig"
 
 #------------------------------------------------ create the resore directory if it doesn't already exist--------------------------------------------------
 
@@ -74,17 +32,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 (needed for go-powerline)?" yn
+        read -p "do you want to install golang and go-powerline?" yn
         case $yn in
             [Yy]* ) 
                 sudo apt-get install golang -y;
+                go get -u github.com/justjanne/powerline-go;
                 break;;
             [Nn]* ) 
-                break;;
+                exit;;
             * ) echo "Please answer yes or no.";;
         esac
     done
@@ -92,28 +50,27 @@ fi
 
 #----------------------------------------------------------install  go-powerline---------------------------------------------------------------------------
 
-# see if this file exists, if not prompt for install
-if [ ! -f ~/go/bin/powerline-go ]
+if [ -z "$GOPATH" ]
 then
     while true; do
-        read -p "do you want to install go-powerline?" yn
+        read -p "do you want to install golang and go-powerline?" yn
         case $yn in
             [Yy]* ) 
+                sudo apt-get install golang -y;
                 go get -u github.com/justjanne/powerline-go;
                 break;;
             [Nn]* ) 
-                break;;
+                exit;;
             * ) 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;
@@ -121,7 +78,7 @@ then
                 ./install.sh;
                 break;;
             [Nn]* ) 
-                break;;
+                exit;;
             * ) echo "Please answer yes or no.";;
         esac
     done
@@ -133,13 +90,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]* ) 
-                break;;
+                exit;;
             * ) echo "Please answer yes or no.";;
         esac
     done
@@ -148,26 +105,16 @@ fi
 
 #----------------------------------------------------------see if Vundle has been cloned yet and do so-----------------------------------------------------
 
-if [ ! -d ~/.vim/bundle ]
+if [ ! -d ~/.vim ]
 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 Vundle plugin manager for vim from https://github.com/VundleVim/Vundle.vim.git?" yn
+        read -p "Do you want to install the vim plugins now?" yn
         case $yn in
-            [Yy]* )
-                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;;
+            [Yy]* ) vim +PluginInstall +qall; break;;
+            [Nn]* ) exit;;
             * ) 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"