From fd493e8e4939eb881cf137481e91a02b9b49a56e Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Wed, 21 Sep 2022 13:56:50 -0400 Subject: [PATCH 1/9] pull files from onedrive --- grab.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 grab.sh diff --git a/grab.sh b/grab.sh new file mode 100755 index 0000000..75076fa --- /dev/null +++ b/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 //mnt/backup/hc/ubm.backup From 04ee4dc97ced52b4b08fba271b144a70feebd6e6 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Thu, 22 Sep 2022 16:25:30 +0000 Subject: [PATCH 2/9] update grab --- globals.sh | 15 +++++++++++++++ grab.sh | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100755 globals.sh diff --git a/globals.sh b/globals.sh new file mode 100755 index 0000000..37b2353 --- /dev/null +++ b/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 diff --git a/grab.sh b/grab.sh index 75076fa..3cffa3b 100755 --- a/grab.sh +++ b/grab.sh @@ -13,4 +13,4 @@ curl 'https://hccompanies-my.sharepoint.com/personal/ptrowbridge_hc-companies_co -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 //mnt/backup/hc/ubm.backup + --compressed --output ubm.backup From 95bcbd543b4765e29935c81fefc9f25cfa5d0783 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Fri, 24 Mar 2023 20:55:52 -0400 Subject: [PATCH 3/9] move stuff to bashrc_local --- .bashrc | 24 ++++++++++++++---------- setup.sh | 13 +++++++++++++ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.bashrc b/.bashrc index a9a41cd..803bce9 100644 --- a/.bashrc +++ b/.bashrc @@ -91,6 +91,7 @@ fi alias ll='ls -alFh' alias la='ls -A' alias l='ls -CF' +alias lb='lsblk -o+FSAVAIL,FSUSED,FSUSE%,MODEL,PARTTYPENAME,STATE' # Add an "alert" alias for long running commands. Use like so: # sleep 10; alert @@ -118,16 +119,19 @@ fi EDITOR=/usr/bin/vim.basic PAGER="less" -LESS="-S" -export PG="psql -U ptrowbridge -d ubm -p 54329 -h hptrow.me" -export PGD="psql -U ptrowbridge -d ubm -p 54339 -h hptrow.me" +lESS="-S" +export PG="psql -U -d -p -h " export PSQL_PAGER="pspg" -# 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 +# Set config variables first +GIT_PROMPT_ONLY_IN_REPO=1 +GIT_PROMPT_FETCH_REMOTE_STATUS=0 + +# Load the gitprompt script +if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then +source "$HOME/.bash-git-prompt/gitprompt.sh" +fi + +#---------point to local--------------- +[ -f ~/.bashrc_local ] && source ~/.bashrc_local diff --git a/setup.sh b/setup.sh index 8d61664..0dd3d4d 100755 --- a/setup.sh +++ b/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 + From 16cb1b09830d3bad43b5dfe0a3201c8eb044d94f Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Fri, 24 Mar 2023 20:58:18 -0400 Subject: [PATCH 4/9] updates --- .gitignore | 1 + .psqlrc | 1 + .tmux.conf | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 1377554..1b0812c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.swp +.bashrc_local diff --git a/.psqlrc b/.psqlrc index 12d875d..6fe6233 100644 --- a/.psqlrc +++ b/.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 diff --git a/.tmux.conf b/.tmux.conf index ed27168..aa216f6 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -5,6 +5,8 @@ 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' From d3842431cce4b5286da5134a9e1b1b459cd7b40e Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Fri, 24 Mar 2023 21:00:12 -0400 Subject: [PATCH 5/9] updates --- .gitconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitconfig b/.gitconfig index 9bd7790..9433a4a 100644 --- a/.gitconfig +++ b/.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 From fa3bf6ff377735d6066735eec5f99a9163558063 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Fri, 24 Mar 2023 21:52:36 -0400 Subject: [PATCH 6/9] point to directory --- .bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bashrc b/.bashrc index 803bce9..d4b9e85 100644 --- a/.bashrc +++ b/.bashrc @@ -134,4 +134,4 @@ source "$HOME/.bash-git-prompt/gitprompt.sh" fi #---------point to local--------------- -[ -f ~/.bashrc_local ] && source ~/.bashrc_local +[ -f ~/dot_config/.bashrc_local ] && source ~/dot_config/.bashrc_local From 33276ce8e9095da895a13ba7eae574890fb9486f Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Fri, 24 Mar 2023 22:28:59 -0400 Subject: [PATCH 7/9] add aliases to list open files and exec them --- .bashrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.bashrc b/.bashrc index d4b9e85..fb9c2df 100644 --- a/.bashrc +++ b/.bashrc @@ -92,6 +92,11 @@ alias ll='ls -alFh' alias la='ls -A' alias l='ls -CF' 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 opg="lsof +D . | grep 'pg.*swp$' | awk '{print \$9}' | sed 's/\.swp//g' | sed 's/\/\./\//g' | xargs -r realpath" +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" # Add an "alert" alias for long running commands. Use like so: # sleep 10; alert From c9440c40edd79ffa0e4d6c987538de828ee0b2a8 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Sun, 2 Apr 2023 00:57:39 -0400 Subject: [PATCH 8/9] updates --- .bashrc | 2 +- .tmux.conf | 2 ++ .vimrc | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.bashrc b/.bashrc index 803bce9..d4b9e85 100644 --- a/.bashrc +++ b/.bashrc @@ -134,4 +134,4 @@ source "$HOME/.bash-git-prompt/gitprompt.sh" fi #---------point to local--------------- -[ -f ~/.bashrc_local ] && source ~/.bashrc_local +[ -f ~/dot_config/.bashrc_local ] && source ~/dot_config/.bashrc_local diff --git a/.tmux.conf b/.tmux.conf index aa216f6..b8602ac 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -14,3 +14,5 @@ set -g @plugin 'tmux-plugins/tmux-resurrect' # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run '~/.tmux/plugins/tpm/tpm' + +set-option -g default-path ~ diff --git a/.vimrc b/.vimrc index 9ba8895..3f3cf10 100644 --- a/.vimrc +++ b/.vimrc @@ -24,7 +24,7 @@ map h map l let NERDTreeShowHidden=1 set tabstop=4 softtabstop=0 expandtab shiftwidth=4 smarttab -colorscheme desert +colorscheme ron syntax on set splitright set splitbelow @@ -37,9 +37,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 = 'dark' -let g:tmuxline_powerline_separators = 0 -let g:airline_powerline_fonts = 0 +let g:airline_theme = 'violet' +let g:tmuxline_powerline_separators = 1 +let g:airline_powerline_fonts = 1 let mapleader = ";" set showcmd map a :bn From 6ffa44ddf2c29007ffbf50e1f81c6f12dcf1a34f Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Tue, 4 Apr 2023 10:28:29 -0400 Subject: [PATCH 9/9] nvim alias and tmux theme --- .bashrc | 3 +++ .tmux.conf | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.bashrc b/.bashrc index fb9c2df..77d5283 100644 --- a/.bashrc +++ b/.bashrc @@ -97,6 +97,9 @@ alias opg="lsof 2>/dev/null +D . | grep 'pg.*swp$' | awk '{print \$9}' | sed 's/ 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 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 diff --git a/.tmux.conf b/.tmux.conf index b8602ac..7ce833e 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -11,8 +11,21 @@ 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/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' - -set-option -g default-path ~