Update thesisHEADmaster

1 files changed, 54 insertions, 76 deletions

diff --git a/shell/bash/.bashrc b/shell/bash/.bashrc
index 61c9b03..75cc861 100644
--- a/shell/bash/.bashrc
+++ b/shell/bash/.bashrc
@@ -1,92 +1,70 @@
-parse_git_branch() {
-  local branch=""
-  branch=$(git branch 2> /dev/null | sed -n '/^[^*]/d;s/* \(.*\)/\1/p')
-  local git_status=$(git status --porcelain 2>/dev/null)
-
-  if [ -n "$branch" ]; then
-    branch="(${branch}) "
-  fi
+[[ $- != *i* ]] && return
 
-  echo "$branch"
+parse_git_branch() {
+  local branch
+  branch=$(git symbolic-ref --short HEAD 2>/dev/null) || return
+  printf '(%s) ' "$branch"
 }
 
-
 update_prompt() {
-  PS1="\[\e[31m\][\[\e[33m\]\u\[\e[32m\]@\[\e[34m\]\h \[\e[35m\]\w\[\e[31m\]]\[\e[35m\] \[\e[33m\]\$(parse_git_branch)\[\e[34m\]# \[\e[0m\]"
+  PS1="\u@\h \W \$(parse_git_branch)# "
 }
 
-PROMPT_COMMAND="update_prompt"
-
-if [ -z "$XDG_RUNTIME_DIR" ]; then
-        XDG_RUNTIME_DIR="/tmp/$(id -u)-runtime-dir"
-        mkdir -pm 0700 "$XDG_RUNTIME_DIR"
-        export XDG_RUNTIME_DIR
-fi
-
-export XDG_DATA_HOME="$HOME"/.local/share
-export XDG_CONFIG_HOME="$HOME"/.config
-export XDG_STATE_HOME="$HOME"/.local/state
-export XDG_CACHE_HOME="$HOME"/.cache
-#export PATH=$PATH:$(xdg-user-dir USER)/.local/bin
+PROMPT_COMMAND="update_prompt${PROMPT_COMMAND:+;$PROMPT_COMMAND}"
+
+export R_HOME_USER="$XDG_CONFIG_HOME/R"
+export R_PROFILE_USER="$XDG_CONFIG_HOME/R/profile"
+export R_HISTFILE="$XDG_CONFIG_HOME/R/history"
+export INPUTRC="$XDG_CONFIG_HOME/shell/inputrc"
+export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
+export SQLITE_HISTORY="$XDG_DATA_HOME/sqlite_history"
+export SCREENRC="$XDG_CONFIG_HOME/screen/screenrc"
+export SCREENDIR="$XDG_RUNTIME_DIR/screen"
+export PLATFORMIO_CORE_DIR="$XDG_DATA_HOME/platformio"
+export BUN_INSTALL="$XDG_DATA_HOME/bun"
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
+export W3M_DIR="$XDG_STATE_HOME/w3m"
+export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
 export XDG_CURRENT_DESKTOP=dwm
 export XDG_SESSION_DESKTOP=dwm
-export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
-export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
-export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
+export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
+export GOPATH="$XDG_DATA_HOME/go"
+export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc"
+export LESSHISTFILE="$XDG_CACHE_HOME/less/history"
+export HISTFILE="$XDG_STATE_HOME/bash/history"
 export EDITOR=/usr/bin/nvim
 export BUILDDIR=/tmp/makepkg
-export RAVEDUDE_PORT=/dev/ttyACM0
-export BUN_INSTALL="$HOME/.bun"
-export PATH="$BUN_INSTALL/bin:$PATH"
-export PATH="$HOME/.cargo/bin:$PATH"
-export ANDROID_HOME=$HOME/Android/sdk
-export PATH=$PATH:$ANDROID_HOME/emulator
-export PATH=$PATH:$ANDROID_HOME/platform-tools
 export AWT_TOOLKIT=MToolkit
 export _JAVA_AWT_WM_NONREPARENTING=1
-export JAVA_HOME=/usr/lib/jvm/openjdk17
 export RUST_LOG=debug
+export GPG_TTY=$(tty)
 
-alias get_idf='. $HOME/esp/esp-idf/export.sh'
+export PATH="$HOME/.local/bin:$CARGO_HOME/bin:$BUN_INSTALL/bin:$PATH"
 
-alias l='ls -la --color=auto'
-alias la='ls -la --color=auto'
-alias ls='ls --color=auto'
+alias l='ls -hN -la --group-directories-first'
+alias mbsync='mbsync --config "$XDG_CONFIG_HOME"/isync/mbsyncrc'
 alias ..='cd ..'
-
-alias mvn="~/Downloads/apache-maven-3.9.9/bin/mvn"
-alias v="nvim"
-alias c="clear"
-alias j="joshuto"
-alias zl="zellij"
-alias h="htop"
-alias n="neofetch"
-alias poweroff="doas /usr/bin/poweroff"
-alias reboot="doas /usr/bin/reboot"
-alias update-grub="doas grub-mkconfig -o /boot/grub/grub.cfg"
-
-alias gts="git status"
-alias gta="git add ."
-alias gtc="git commit -m"
-alias gpo="git push origin"
-alias pull="git pull origin"
-alias glg="git log"
-
-[ -s "/home/fw/.bun/_bun" ] && source "/home/fw/.bun/_bun"
-
-if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
-  exec startx &> /dev/null
-# exec dbus-run-session run_something &> /dev/null
-fi
-
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-
-export GPG_TTY=$(tty)
-export PATH=$PATH:$HOME/.local/bin
-. "$HOME/.cargo/env"
-
-#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
-export SDKMAN_DIR="$HOME/.sdkman"
-[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
+alias v=nvim
+alias c=clear
+alias j=joshuto
+alias zl=zellij
+alias h=htop
+alias sxiv=nsxiv
+alias poweroff='doas /usr/bin/poweroff'
+alias reboot='doas /usr/bin/reboot'
+alias update-grub='doas grub-mkconfig -o /boot/grub/grub.cfg'
+alias no-screen-dim='xset s off && xset -dpms'
+alias gts='git status'
+alias gta='git add .'
+alias gtc='git commit -m'
+alias gpo='git push origin'
+alias pull='git pull origin'
+alias glg='git log'
+alias rsync='rsync -avz --progress'
+alias orphans='doas pacman -Rcns $(pacman -Qqdt)'
+
+command -v cargo >/dev/null 2>&1 && [ -f "$CARGO_HOME/env" ] && . "$CARGO_HOME/env"