update shell files to add new bin directories

This commit is contained in:
frosty 2024-07-12 12:21:47 -04:00
parent 7c65668266
commit 4427df2ae5
2 changed files with 12 additions and 25 deletions

View file

@ -1,5 +1,7 @@
# shellcheck disable=SC2155 # shellcheck disable=SC2155
[ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc"
# XDG base directories # XDG base directories
export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
@ -14,7 +16,6 @@ export BROWSER="${BROWSER:-firefox}"
# $HOME cleanup # $HOME cleanup
export HISTFILE="$XDG_STATE_HOME/bash_history" export HISTFILE="$XDG_STATE_HOME/bash_history"
export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc"
export XCURSOR_PATH="/usr/share/icons:$XDG_DATA_HOME/icons" export XCURSOR_PATH="/usr/share/icons:$XDG_DATA_HOME/icons"
export GNUPGHOME="$XDG_DATA_HOME/gnupg" export GNUPGHOME="$XDG_DATA_HOME/gnupg"
export GOPATH="$XDG_DATA_HOME/go" export GOPATH="$XDG_DATA_HOME/go"
@ -26,11 +27,14 @@ export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
# Other program settings # Other program settings
export SVDIR="$XDG_CONFIG_HOME/service" export SVDIR="$XDG_CONFIG_HOME/service"
export PIPX_BIN_DIR="$XDG_DATA_HOME/pipx/bin"
export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java" export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java"
# $PATH additions # $PATH additions
export PATH="$PATH:$(find "$HOME/.local/bin/" -type d | paste -sd ':' -)" export PATH="$PATH:$(find "$HOME/.local/bin/" -type d | paste -sd ':' -)"
export PATH="$PATH:$GOPATH/bin" export PATH="$PATH:$GOPATH/bin"
export PATH="$PATH:$XDG_DATA_HOME/pipx/bin"
export PATH="$PATH:$HOME/.cabal/bin"
# Automatic graphical start on tty1 # Automatic graphical start on tty1
[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx [ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx

31
.bashrc
View file

@ -3,44 +3,27 @@ case "$-" in
*) return ;; *) return ;;
esac esac
[ -f "$HOME/.ghcup/env" ] && . "$HOME/.ghcup/env"
shopt -s autocd shopt -s autocd
HISTFILESIZE=100000 HISTFILESIZE=100000
HISTCONTROL="ignoredups" HISTCONTROL="ignoredups"
alias cp='cp -iv' alias v='nvim'
alias mv='mv -iv'
alias rm='rm -vI'
alias mkdir='mkdir -pv'
alias ll='ls -lAF' alias ll='ls -lAF'
alias la='ls -AF' alias la='ls -AF'
alias cp='cp -iv'
alias mv='mv -iv'
alias rm='rm -vI'
alias mkdir='mkdir -pv'
alias ls='ls --color=auto' alias ls='ls --color=auto'
alias grep='grep --color=auto' alias grep='grep --color=auto'
alias v='nvim'
skli() { skli() {
[ -f config.h ] && rm config.h [ -f config.h ] && rm config.h
make || return make || return
doas make install doas make install
} }
ncd() {
if [ "${NNNLVL:-0}" -ne 0 ]; then
echo "nnn is already running"
return
fi
export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
command nnn "$@"
if [ -f "$NNN_TMPFILE" ]; then
. "$NNN_TMPFILE"
rm -f -- "$NNN_TMPFILE" >/dev/null
fi
}
bind '"\C-f": "ncd\r"'