pt
/
dot_config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
Paul Trowbridge 2023-10-28 19:16:35 -04:00
parent ed811bbae2 c7bc5d1f60
commit ae4ce36eb4
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.bashrc
View File

@ -87,6 +87,11 @@ fi
# colored GCC warnings and errors # colored GCC warnings and errors
#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
vc() {
git add .
git commit -m "vault backup: $(date "+%Y-%m-%d %H:%M:%S")"
git push
}
# some more ls aliases # some more ls aliases
alias ll='ls -alFh' alias ll='ls -alFh'
alias la='ls -A' alias la='ls -A'
@ -108,11 +113,17 @@ alias gr='git reset HEAD'
alias gc='git commit -v' alias gc='git commit -v'
alias gd='git difftool' alias gd='git difftool'
alias gl='git log --graph --oneline --format="%C(yellow)%h %C(green)%an%Creset %C(blue)%ad%Creset %s"' alias gl='git log --graph --oneline --format="%C(yellow)%h %C(green)%an%Creset %C(blue)%ad%Creset %s"'
<<<<<<< HEAD
vc() { vc() {
git add . git add .
git commit -m "vault backup: $(date "+%Y-%m-%d %H:%M:%S")" git commit -m "vault backup: $(date "+%Y-%m-%d %H:%M:%S")"
git push git push
} }
=======
alias cj='cd ~/storage/shared/Documents/journal/'
alias jr='cd ~/storage/shared/Documents/journal/ && git pull && vc && cd -'
alias hc='cd ~/storage/shared/Documents/hc_notes/ && git pull && git push && cd -'
>>>>>>> c7bc5d1f60c8611a1f5a7e85b2cd5495696adc8e
# Add an "alert" alias for long running commands. Use like so: # Add an "alert" alias for long running commands. Use like so:
# sleep 10; alert # sleep 10; alert
@ -138,15 +149,17 @@ if ! shopt -oq posix; then
fi fi
fi fi
EDITOR=/usr/bin/vim.basic #EDITOR=/usr/bin/vim.basic
export EDITOR=vim
export VISUAL=vim
PAGER="less" PAGER="less"
LESS="-S" LESS="-S"
export PSQL_PAGER="pspg" export PSQL_PAGER="pspg"
if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then #if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
GIT_PROMPT_ONLY_IN_REPO=1 # GIT_PROMPT_ONLY_IN_REPO=1
source $HOME/.bash-git-prompt/gitprompt.sh # source $HOME/.bash-git-prompt/gitprompt.sh
fi #fi
bind 'set bell-style none' bind 'set bell-style none'

2
.gitconfig
View File

@ -22,5 +22,7 @@
directory = /opt/forecast_api directory = /opt/forecast_api
directory = /etc/postgresql/15/main/ directory = /etc/postgresql/15/main/
directory = /etc/postgresql/15/main directory = /etc/postgresql/15/main
directory = /storage/emulated/0/Documents/journal
directory = /storage/emulated/0/Documents/hc_notes
[pull] [pull]
rebase = false rebase = false