merge clean

.bashrc

@@ -91,13 +91,14 @@ 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+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 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'

.bashrc_local_example

@@ -0,0 +1,9 @@
+#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,7 +2,7 @@
 	email = paul@hptrow.me
 	name = Paul Trowbridge
 [core]
-	autocrlf = false
+	autocrlf = true
 	editor = vim
 [push]
 	default = simple
@@ -18,5 +18,7 @@
 	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

.psqlrc

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

.tmux.conf

@@ -29,3 +29,4 @@ set -g @themepack 'powerline/default/cyan'
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'
+

.vimrc

@@ -66,6 +66,7 @@ set mouse=a
 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>+