updates to bashrc

1 files changed, 37 insertions, 3 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index d824461..849f400 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -9,11 +9,26 @@ fi
 # Enable android studio
 if [ -d $HOME/bin/android-studio/bin ]; then
     PATH="${HOME}/bin/android-studio/bin:${PATH}"
+    export JAVA_HOME="${HOME}/bin/android-studio/jre"
+fi
+
+# Set the AndroidSDK path
+if [ -d $HOME/.AndroidSDK ]; then
+    export ANDROID_SDK_ROOT=$HOME/.AndroidSDK/
 fi
 
 # Enable rust and cargo
-if [ -x $HOME/.cargo/bin/cargo ]; then
-    PATH="${HOME}/.cargo/bin:${PATH}"
+# if [ -x $HOME/.cargo/bin/cargo ]; then
+#     PATH="${HOME}/.cargo/bin:${PATH}"
+# fi
+if [ -f $HOME/.cargo/env ]; then
+    source "$HOME/.cargo/env"
+fi
+
+
+# Enable go
+if [ -d /usr/local/go/bin ]; then
+    PATH=$PATH:/usr/local/go/bin
 fi
 
 # Enable nix
@@ -26,6 +41,12 @@ fi
 if [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
 fi
+if [ -f /usr/share/doc/fzf/examples/completion.bash ]; then
+    # For apt install fzf
+    . /usr/share/doc/fzf/examples/completion.bash
+    . /usr/share/doc/fzf/examples/key-bindings.bash
+fi
+
 # FreeBSD
 [[ $PS1 && -f /usr/local/share/bash-completion/bash_completion.sh ]] && \
         source /usr/local/share/bash-completion/bash_completion.sh
@@ -38,7 +59,7 @@ TERM="xterm-256color"
 #EMACS_SERVER_SOCKET="${TMPDIR:-/tmp}/emacs$(id -u)/server"
 #EDITOR="emacsclient -s ${EMACS_SERVER_SOCKET}"
 
-EDITOR="emacsclient -nw"
+export EDITOR='emacsclient -nw'
 alias e="${EDITOR}"
 
 # History settings
@@ -63,6 +84,19 @@ alias define='sdcv'
 #alias cleanstale="git clean -fd -e'!__pycache__' -e'!*.py[cod]'"
 #alias dry-cleanstale="git clean -fdn -e'!__pycache__' -e'!*.py[cod]'"
 
+# Git Related
+function delete-branches() {
+    git branch |
+        grep --invert-match '\*' |
+        cut -c 3- |
+        fzf --multi --preview="git log {} --" |
+        xargs --no-run-if-empty git branch --delete --force
+}
+
+# The Gemini earbuds don't sync the volume. This turns up the hardware volume control
+alias geminiup="dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0/dev_7C_C4_EF_CC_45_43 org.bluez.MediaControl1.VolumeUp"
+alias geminidown="dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0/dev_7C_C4_EF_CC_45_43 org.bluez.MediaControl1.VolumeDown"
+
 # Enable firefox touchscreen scrolling
 export MOZ_USE_XINPUT2=1