merge

.bashrc

@@ -87,6 +87,11 @@ fi
 # colored GCC warnings and errors
 #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
 alias ll='ls -alFh'
 alias la='ls -A'
@@ -108,11 +113,17 @@ alias gr='git reset HEAD'
 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"'
+<<<<<<< HEAD
 vc() {
     git add .
     git commit -m "vault backup: $(date "+%Y-%m-%d %H:%M:%S")"
     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:
 #   sleep 10; alert
@@ -138,15 +149,17 @@ if ! shopt -oq posix; then
   fi
 fi
 
-EDITOR=/usr/bin/vim.basic
+#EDITOR=/usr/bin/vim.basic
+export EDITOR=vim
+export VISUAL=vim
 PAGER="less"
 LESS="-S"
 export PSQL_PAGER="pspg"
 
-if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
-    GIT_PROMPT_ONLY_IN_REPO=1
-    source $HOME/.bash-git-prompt/gitprompt.sh
-fi
+#if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
+#    GIT_PROMPT_ONLY_IN_REPO=1
+#    source $HOME/.bash-git-prompt/gitprompt.sh
+#fi
 
 bind 'set bell-style none'
 

.gitconfig

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