merge clean into

.bashrc

@@ -91,14 +91,17 @@ fi
 alias ll='ls -alFh'
 alias la='ls -A'
 alias l='ls -CF'
-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 lb='lsblk -o+FSAVAIL,FSUSED,FSUSE%,MODEL,PARTTYPENAME,STATE'
+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 % | pspg'
 alias mns='fzf | xargs -I {} sqlcmd.exe -S usmidsql01 -i {}'
+alias nv='~/nvim-linux64/bin/nvim'
+alias gs='git status'
+alias gd='git difftool'
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
@@ -134,8 +137,6 @@ if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
     source $HOME/.bash-git-prompt/gitprompt.sh
 fi
 
-
 bind 'set bell-style none'
 
-
 [ -f ~/dot_config/.bashrc_local ] && source ~/dot_config/.bashrc_local

.gitconfig

@@ -14,3 +14,9 @@
     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
+[pull]
+	rebase = false

.psqlrc

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

.tmux.conf

@@ -5,12 +5,14 @@ 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
 
 #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'
+set -g @themepack 'powerline/default/cyan'
 #-----------------------nova---------------------------------------------
 #set -g @plugin 'o0th/tmux-nova'
 #set -g @nova-nerdfonts true

globals.sh

@@ -0,0 +1,15 @@
+curl 'https://hccompanies-my.sharepoint.com/personal/ptrowbridge_hc-companies_com/_layouts/15/download.aspx?UniqueId=3a885a13%2D7742%2D4ade%2D8efb%2D02298332da2b' \
+  -H 'authority: hccompanies-my.sharepoint.com' \
+  -H 'accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8' \
+  -H 'accept-language: en-US,en;q=0.9' \
+  -H 'cookie: MicrosoftApplicationsTelemetryFirstLaunchTime=1653311371691; MicrosoftApplicationsTelemetryDeviceId=a0610434-2a4e-5c2e-2c9b-b51ede5f92c1; ExcelWacDataCenter=PUS1; WacDataCenter=PUS1; rtFa=IdBNqEcPR1AjGrvv7SgQYjuC3opFgyf5Za4SSbG5swUmRTc4NEM0MkItMjkwMC00QTQyLUI3MzctMjA3N0U2NThFMzUzIzEzMzA4MTYwODEzNjkxODMxMCM5MURBNjZBMC1FMEEwLUQwMDAtNTUwOS1ERDcxNjcyQUFBMjgjUFRST1dCUklER0UlNDBIQy1DT01QQU5JRVMuQ09NCgvbSHzfO/7DBuCNA0ykejweiszYCu/9L1+nat9BE1ltqvGyBEYIhp8UxTAGTb3NyYBy3W6Daqf4SBd2X8yfuCkkWHMICjAvv1pyQeLrjQ482PKjEt1nER9dY23RBiyVTiLoXT8eja1IZtyFb1SfgjQRMwhTxK1rnJ4cAWnkp9AL1FTm/wklErgy4hWDMnrFxnlt8Scz9bfSMCpt/qMnp1Kif1iEdgrMCUa70e4p5CfqyetmLmCi3GM2WfrzJTkR3qckRNf+aXDO0kPthF7+zUagAlwDcTNe4+iwVgVG9ifCTafZKrBIPT0Npuu9U8rp5olVcJkqM3TR7e0zZrXfA5wAAAA=; SIMI=eyJzdCI6MH0=; cucg=1; FedAuth=77u/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48U1A+VjEyLDBoLmZ8bWVtYmVyc2hpcHwxMDAzM2ZmZjk0YTJiZjA2QGxpdmUuY29tLDAjLmZ8bWVtYmVyc2hpcHxwdHJvd2JyaWRnZUBoYy1jb21wYW5pZXMuY29tLDEzMjg4NzM3ODE5MDAwMDAwMCwxMzI4NjA2MjE4NTAwMDAwMDAsMTMzMDg3NjkzNzEyOTU2NjM0LDY2LjE5LjE4Ny4yLDMsZTc4NGM0MmItMjkwMC00YTQyLWI3MzctMjA3N2U2NThlMzUzLCw3ODY4ODkxYy0zZGVjLTQxYjgtYjNmMi0zM2Q1MDg0ZDg3ZTcsOTFkYTY2YTAtZTBhMC1kMDAwLTU1MDktZGQ3MTY3MmFhYTI4LGYyODI2N2EwLTQwN2UtZDAwMC04NjJlLWRlZWE0OTUwYzQyMSwsMCwxMzMwODM0MDk3MTI4MDA0MjIsMTMzMDg1OTY1NzEyODAwNDIyLCwsZXlKNGJYTmZZMk1pT2lKYlhDSkRVREZjSWwwaUxDSjRiWE5mYzNOdElqb2lNU0lzSW1GamNuTWlPaUpiWENKMWNtNDZkWE5sY2pweVpXZHBjM1JsY25ObFkzVnlhWFI1YVc1bWIxd2lYU0lzSW5CeVpXWmxjbkpsWkY5MWMyVnlibUZ0WlNJNklsQlVjbTkzWW5KcFpHZGxRRWhETFVOdmJYQmhibWxsY3k1amIyMGlMQ0oxZEdraU9pSnNaMHRYYzNGVE5HNVZkUzFhWWw5RFpGRTFPRUZCSW4wPSwxMzMwODE2NDQxMzY3NjIxNTYsMTMzMDgxNjA4MTIwMDAwMDAwLGZlZDQ2NzAyLTgxNzAtNGE0MS1hNTcyLWEwYmFhMmNkNTE4MywsLCwsLDAsLE1ub2RleTF4eGxyTWtORC83SDBYUXRDTXpmaE9CajJCcUorZjJxY3hOVjFDTWdnTjBXOCs5M0R2TERWY0Jmc3NUc05jem1ZaFkvN3JZL1VkUUhQMHZrVWQ1VW5saFRXUDdWRFd3NjJTU1lYMGFqVGg4SFpXZjhncFE4aEY4Q2YwUWtOSkpmS21RakpOMlZWcWhaN1JhN3JSWDBtZlZHVHgzMFgxK09KZ0Z5cnZBeVZITGd2SUwwTFJhd0hZSHdvQ0NERGxDZEFtU3JudHhKUGpLMXlYdldvcXBJMUxNdmdxL0laUklSa2lISk1IRzAyaW52ZDV6WDdBT2FSVE1nUXR6VEZrRUl0ZzI2S0ZvRmdKQlQzVzAxR1FyV2ExemxFQUxOOE5YOWQwV3AwajVab3p5VE5id3psbkRTZU5Ba0Z3d0d4M2poc0ZGdVNiTG9yUXNJUWZ1UT09PC9TUD4=; KillSwitchOverrides_enableKillSwitches=; KillSwitchOverrides_disableKillSwitches=' \
+  -H 'if-none-match: "{3A885A13-7742-4ADE-8EFB-02298332DA2B},278"' \
+  -H 'referer: https://hccompanies-my.sharepoint.com/personal/ptrowbridge_hc-companies_com/_layouts/15/onedrive.aspx?login_hint=PTrowbridge%40HC%2DCompanies%2Ecom&id=%2Fpersonal%2Fptrowbridge%5Fhc%2Dcompanies%5Fcom%2FDocuments%2FBackups' \
+  -H 'sec-fetch-dest: iframe' \
+  -H 'sec-fetch-mode: navigate' \
+  -H 'sec-fetch-site: same-origin' \
+  -H 'sec-gpc: 1' \
+  -H 'service-worker-navigation-preload: true' \
+  -H 'upgrade-insecure-requests: 1' \
+  -H 'user-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36' \
+  --compressed --output ubm_globals.backup

grab.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+curl 'https://hccompanies-my.sharepoint.com/personal/ptrowbridge_hc-companies_com/_layouts/15/download.aspx?UniqueId=ece6a9ec%2D750b%2D44a1%2D8e77%2Dc5c84625949c' \
+  -H 'authority: hccompanies-my.sharepoint.com' \
+  -H 'accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8' \
+  -H 'accept-language: en-US,en;q=0.9' \
+  -H 'cookie: MicrosoftApplicationsTelemetryFirstLaunchTime=1653311371691; MicrosoftApplicationsTelemetryDeviceId=a0610434-2a4e-5c2e-2c9b-b51ede5f92c1; ExcelWacDataCenter=PUS1; WacDataCenter=PUS1; KillSwitchOverrides_enableKillSwitches=; KillSwitchOverrides_disableKillSwitches=; nSGt-542D99B9054F514669678DDFE32E0756DC09EDEB6CD549BB=gYEwOEFFMTEwMzU5M0YwMDAzOENENDY2Qjc1NTA0NUU2NzI2NTQ0REFEODM5NjcwRDUzMDU0MkQ5OUI5MDU0RjUxNDY2OTY3OERERkUzMkUwNzU2REMwOUVERUI2Q0Q1NDlCQhIxMzMwODE2MTQxMTkwNzczNDUdaGNjb21wYW5pZXMtbXkuc2hhcmVwb2ludC5jb20CjaE83VUMs1yz9clsr1Lzs0o0E9Y75lS13NO7Ks0+VUJd7ewlCfUn1k+AO+/jrEm6J/hZT0FsE3g62ZMldwZZelQ5KqlRJc4cOXShAKdvlKDcnEz3CVScTWcyqHoUnJt+J7+TV5Oa3SQlIgi27VXitUV0PKsN4GnjDFTg+9B8Asv9lqCRAfH745b4YFTyg5zsyLKERLccaNmlVr/6pVX3107VmpPFzEi2B+DpW8RVc92RBr20ZCya+4j/rUME3GkEtCJQbHkDTawlWzMBFwHCAFAQ+oeirQywqqq4Qmbikpbw1ZbEuxGFzwET2TjcGIoAREPZW0fjRpImZKQIDmj/lQAAAA==; rtFa=IdBNqEcPR1AjGrvv7SgQYjuC3opFgyf5Za4SSbG5swUmRTc4NEM0MkItMjkwMC00QTQyLUI3MzctMjA3N0U2NThFMzUzIzEzMzA4MTYwODEzNjkxODMxMCM5MURBNjZBMC1FMEEwLUQwMDAtNTUwOS1ERDcxNjcyQUFBMjgjUFRST1dCUklER0UlNDBIQy1DT01QQU5JRVMuQ09NCgvbSHzfO/7DBuCNA0ykejweiszYCu/9L1+nat9BE1ltqvGyBEYIhp8UxTAGTb3NyYBy3W6Daqf4SBd2X8yfuCkkWHMICjAvv1pyQeLrjQ482PKjEt1nER9dY23RBiyVTiLoXT8eja1IZtyFb1SfgjQRMwhTxK1rnJ4cAWnkp9AL1FTm/wklErgy4hWDMnrFxnlt8Scz9bfSMCpt/qMnp1Kif1iEdgrMCUa70e4p5CfqyetmLmCi3GM2WfrzJTkR3qckRNf+aXDO0kPthF7+zUagAlwDcTNe4+iwVgVG9ifCTafZKrBIPT0Npuu9U8rp5olVcJkqM3TR7e0zZrXfA5wAAAA=; SIMI=eyJzdCI6MH0=; FedAuth=77u/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48U1A+VjEyLDBoLmZ8bWVtYmVyc2hpcHwxMDAzM2ZmZjk0YTJiZjA2QGxpdmUuY29tLDAjLmZ8bWVtYmVyc2hpcHxwdHJvd2JyaWRnZUBoYy1jb21wYW5pZXMuY29tLDEzMjg4NzM3ODE5MDAwMDAwMCwxMzI4NjA2MjE4NTAwMDAwMDAsMTMzMDg1OTI4MTM2NzYyMTU2LDY2LjE5LjE4Ny4yLDMsZTc4NGM0MmItMjkwMC00YTQyLWI3MzctMjA3N2U2NThlMzUzLCw3ODY4ODkxYy0zZGVjLTQxYjgtYjNmMi0zM2Q1MDg0ZDg3ZTcsOTFkYTY2YTAtZTBhMC1kMDAwLTU1MDktZGQ3MTY3MmFhYTI4LDkxZGE2NmEwLWUwYTAtZDAwMC01NTA5LWRkNzE2NzJhYWEyOCwsMCwxMzMwODI0NzIxMzYxMzcwMjksMTMzMDg0MjAwMTM2MTM3MDI5LCwsZXlKNGJYTmZZMk1pT2lKYlhDSkRVREZjSWwwaUxDSjRiWE5mYzNOdElqb2lNU0lzSW1GamNuTWlPaUpiWENKMWNtNDZkWE5sY2pweVpXZHBjM1JsY25ObFkzVnlhWFI1YVc1bWIxd2lYU0lzSW5CeVpXWmxjbkpsWkY5MWMyVnlibUZ0WlNJNklsQlVjbTkzWW5KcFpHZGxRRWhETFVOdmJYQmhibWxsY3k1amIyMGlMQ0oxZEdraU9pSnNaMHRYYzNGVE5HNVZkUzFhWWw5RFpGRTFPRUZCSW4wPSwxMzMwODE2NDQxMzY3NjIxNTYsMTMzMDgxNjA4MTIwMDAwMDAwLGZlZDQ2NzAyLTgxNzAtNGE0MS1hNTcyLWEwYmFhMmNkNTE4MywsLCwsLDAsLEpickw5MDg1SmVHRnFpWEdIUnc2aXk5K1h5Ky9JNzVVUmhiNlB2VHExclEyaW9WRnZGd1g0a2J1WFJzUGRWLzVIa3MxdEVTcVNUak1ra2VKbHJ2VjE1MWNVbWF1Vk1NQVRSd2tHanFUSFBaSTg5Rk5aVS8vQkpMUGdKejlueXVKWEgvbytvaUlzUDJnMjJUR1RnQmJzRlhSa2I5N29hek1nTk4xR3FJdEhDQXh4TUlFRWRnTndJTGdzQ0tIRWlPWWtJWFoyS2Z6ZFVwZkp1dnFBTFI1ZW5SWkJ2TG1teVJubmJ6Q2dRa2REa2R0cXJYeHJFeG5EalhuRnNjcllRaEpYTk9XSUVqVldFdnEvZUp3Vm8yN0RTeUlrSkM4cUtXUU9rNG9tb2lSbUdPZC85YUlTd0NBejZDOWpGY1JrY1IyWjZFSDRtamZmRzBIUHlyUUZveWZPZz09PC9TUD4=; cucg=1' \
+  -H 'referer: https://hccompanies-my.sharepoint.com/personal/ptrowbridge_hc-companies_com/_layouts/15/onedrive.aspx?id=%2Fpersonal%2Fptrowbridge%5Fhc%2Dcompanies%5Fcom%2FDocuments%2FBackups' \
+  -H 'sec-fetch-dest: iframe' \
+  -H 'sec-fetch-mode: navigate' \
+  -H 'sec-fetch-site: same-origin' \
+  -H 'sec-gpc: 1' \
+  -H 'service-worker-navigation-preload: true' \
+  -H 'upgrade-insecure-requests: 1' \
+  -H 'user-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36' \
+  --compressed --output ubm.backup

setup.sh

@@ -171,3 +171,16 @@ 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
+