.bashrc

@@ -91,21 +91,6 @@ fi
 alias ll='ls -alFh'
 alias la='ls -A'
 alias l='ls -CF'
-#alias lb='lsblk -o+FSAVAIL,FSUSED,FSUSE%,MODEL,PARTTYPENAME,STATE'
-alias lb='lsblk -o+FSTYPE,FSAVAIL,FSUSED,FSUSE%,MODEL'
-alias opg="lsof 2>/dev/null +D . | grep 'pg.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g'"
-alias osw="lsof 2>/dev/null +D . | awk '\$NF ~ /swp$/ {print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g'"
-alias xpg="lsof 2>/dev/null +D . | grep 'pg.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g' | xargs -r $PG -f"
-alias xsw="lsof 2>/dev/null +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 %'
-alias mns='fzf | xargs -I {} sqlcmd.exe -S usmidsql01 -i {}'
-alias nv='~/nvim-linux64/bin/nvim'
-alias gs='git status -s'
-alias ga='git add .'
-alias gc='git commit -v'
-alias gd='git difftool'
-alias gl='git log --graph --oneline --format="%C(yellow)%h %C(green)%an%Creset %C(blue)%ad%Creset %s"'
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
@@ -134,13 +119,22 @@ fi
 EDITOR=/usr/bin/vim.basic
 PAGER="less"
 LESS="-S"
-export PSQL_PAGER="pspg"
 
-if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
+export IPTOKEN="6ac0a563fc06ab"
-    GIT_PROMPT_ONLY_IN_REPO=1
+export PG="psql -U ptrowbridge -d ubm -p 5432 -h 192.168.1.110"
-    source $HOME/.bash-git-prompt/gitprompt.sh
+export PGD="psql -U ptrowbridge -d ubm -p 5434 -h 192.168.1.110"
-fi
+export NVM_DIR="/home/pt/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
 
-bind 'set bell-style none'
 
-[ -f ~/dot_config/.bashrc_local ] && source ~/dot_config/.bashrc_local
+#GOPATH=$HOME/go
+#function _update_ps1() {
+#    PS1="$($GOPATH/bin/powerline-go -error $?)"
+#}
+#if [ "$TERM" != "linux" ] && [ -f "$GOPATH/bin/powerline-go" ]; then
+#    PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
+#fi
+
+#deno
+export DENO_INSTALL="/home/pt/.deno"
+export PATH="$DENO_INSTALL/bin:$PATH"

.bashrc_local_example

@@ -1,9 +0,0 @@
-#export IPTOKEN=
-#export PG="psql -U ptrowbridge -d ubm -p 5432 -h usmidsap01"
-#export MS="sqlcmd.exe -S mid-sql02 -i"
-#export JAVA_HOME=/opt/jdk-19.0.1
-#export PATH=$PATH:$JAVA_HOME/bin
-#export PATH=$PATH:/opt/gradle/gradle-7.6/bin
-#export RUNNER_PATH=/opt/runner/
-#export DB2PW=
-#export PGPW=

.gitconfig

@@ -2,23 +2,15 @@
 	email = paul@hptrow.me
 	name = Paul Trowbridge
 [core]
-	autocrlf = input
+	autocrlf = false
 	editor = vim
 [push]
 	default = simple
 [alias]
-	pushall = !git remote | xargs -L1 git push --all
+        quick-stats = ! /usr/local/bin/git-quick-stats
 [log]
         date = format:%Y-%m-%d %H:%M:%S
 [format]
         pretty = format:'%C(yellow)%h %Cred%ad %Cblue%an %Cgreen%d %Creset%s'
 [diff]
         tool = vimdiff
-[safe]
-	directory = /var/www/kimai2
-	directory = /var/www/html/resume/
-	directory = /var/www/html/resume
-	directory = /opt/forecast_api/
-	directory = /opt/forecast_api
-[pull]
-	rebase = false

.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

.psqlrc

@@ -1,4 +1,3 @@
 -- Switch pagers with :x and :xx commands
 \set x '\\setenv PAGER ''less -S'''
 \set xx '\\setenv PAGER \'pspg -bX --no-mouse\''
-\timing on

.tmux.conf

@@ -4,31 +4,12 @@ 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
-bind -n C-PgDn next-window
-bind -n C-PgUp previous-window
 
 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/cyan'
-#-----------------------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'
-

.vimrc

@@ -9,10 +9,8 @@ Plugin 'gmarik/Vundle.vim'
 Plugin 'vim-airline/vim-airline'
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
-"Plugin 'edkolev/tmuxline.vim'
+Plugin 'edkolev/tmuxline.vim'
 Plugin 'vim-airline/vim-airline-themes'
-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
@@ -24,9 +22,7 @@ map <C-h> <C-W>h
 map <C-l> <C-W>l
 let NERDTreeShowHidden=1
 set tabstop=4 softtabstop=0 expandtab shiftwidth=4 smarttab
-set mouse=a
+colorscheme desert
-set nowrap
-colorscheme darkblue
 syntax on
 set splitright
 set splitbelow
@@ -39,14 +35,9 @@ 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_theme = 'dark'
-let g:airline_solarized_bg='dark'
+let g:tmuxline_powerline_separators = 0
-let g:tmuxline_powerline_separators = 1
+let g:airline_powerline_fonts = 0
-let g:airline_powerline_fonts = 1
-"----markdown folding------------
-"let g:vim_markdown_folding_disabled = 1
-set nofoldenable    " disable folding
-"---general--------------------
 let mapleader = ";"
 set showcmd
 map <Leader>a :bn<cr>
@@ -61,12 +52,7 @@ 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
-set nowrap
 "nnoremap <esc> :noh<return><esc>
 " Resize windows
 nnoremap <silent> <Up> 5<C-W>+

setup.sh

@@ -5,7 +5,7 @@
 
 dir=~/dot_config
 backup=~/dot_config_backup
-files=".bashrc .vimrc .tmux.conf .psqlrc .gitconfig .inputrc .pspgconf"
+files=".bashrc .vimrc .tmux.conf .psqlrc .gitconfig"
 
 #-------------------------------------------------install debian tooling-----------------------------------------------------------------------------------
 
@@ -14,19 +14,19 @@ if [ "$(dpkg-query -W -f='${Status}' "curl" 2>/dev/null | grep -c "ok installed"
 then
     echo "curl already installed"
 else
-    echo "installing curl..."
+    echo "installing curl"
     apt update -q4
-    sudo apt install curl -y
+    apt install curl -y
 fi
 
 #----------vim-----------
-if [ "$(dpkg-query -W -f='${Status}' "vim" 2>/dev/null | grep -c "ok installed")" == "1" ]
+if [ "$(dpkg-query -W -f='${Status}' "curl" 2>/dev/null | grep -c "ok installed")" == "1" ]
 then
     echo "vim already installed"
 else
-    echo "installing vim..."
+    echo "installing vim"
     apt update -q4
-    sudo apt install vim -y
+    apt install vim -y
 fi
 
 #----------tmux-----------
@@ -34,19 +34,9 @@ if [ "$(dpkg-query -W -f='${Status}' "tmux" 2>/dev/null | grep -c "ok installed"
 then
     echo "tmux already installed"
 else
-    echo "installing tmux..."
+    echo "installing tmux"
     apt update -q4
-    sudo apt install tmux -y
+    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
 
 #------------------------------------------------ create the resore directory if it doesn't already exist--------------------------------------------------
@@ -171,16 +161,3 @@ then
         esac
     done
 fi
-
-while true; do
-    read -p "do you want to install git-bash-prompt?" yn
-    case $yn in
-        [Yy]* ) 
-            git clone https://github.com/magicmonty/bash-git-prompt.git ~/.bash-git-prompt --depth=1
-            break;;
-        [Nn]* ) 
-            break;;
-        * ) echo "Please answer yes or no.";;
-    esac
-done
-