diff --git a/desktop/configs/shell-files/.bashrc b/desktop/configs/shell-files/.bashrc index ffa3bf7..8d293f8 100644 --- a/desktop/configs/shell-files/.bashrc +++ b/desktop/configs/shell-files/.bashrc @@ -23,3 +23,4 @@ alias ls="ls --color" LS_COLORS='di=1;35:fi=0:ln=31:pi=5:so=5:bd=5:cd=5:or=31:mi=0:ex=35:*.rpm=90:*.png=35:*.gif=36:*.jpg=35:*.c=92:*.jar=33:*.py=93:*.h=90:*.txt=94:*.doc=104:*.docx=104:*.odt=104:*.csv=102:*.xlsx=102:*.xlsm=102:*.rb=31:*.cpp=92:*.sh=92:*.html=96:*.zip=4;33:*.tar.gz=4;33:*.mp4=105:*.mp3=106' export LS_COLORS export HISTFILE="${XDG_STATE_HOME}"/bash/history +. "$HOME/.cargo/env" diff --git a/desktop/configs/shell-files/.zshrc b/desktop/configs/shell-files/.zshrc index 7ee3739..41976cd 100644 --- a/desktop/configs/shell-files/.zshrc +++ b/desktop/configs/shell-files/.zshrc @@ -1,7 +1,5 @@ export PATH=$HOME/.local/bin:$PATH export PATH=$HOME/.ghcup/bin:$PATH -export PATH=$HOME/.cargo/bin:$PATH -export PATH=$HOME/.config/emacs/bin:$PATH export PATH=/sbin:$PATH export PATH=$HOME/.local/share/nvim/mason/bin:$PATH export PATH=$HOME/go/bin:$PATH @@ -11,6 +9,8 @@ export R2MOD_INSTALL_DIR="/games/SteamLibrary/steamapps/common/Risk of Rain 2" export R2MOD_COMPAT_DIR="/games/SteamLibrary/steamapps/compatdata/632360" export GTK_THEME=NumixSolarizedDarkCyan +. "$HOME/.cargo/env" + # ZSH_THEME="daivasmara" ZSH_THEME="common" zstyle ':omz:update' mode auto # update automatically without asking @@ -47,6 +47,7 @@ alias ff="fastfetch" alias feh="imv" alias cop="wl-copy" alias lg="lazygit" +alias cpr="cd ~/repos/cports-docker && docker compose run --build --rm cports" export BAT_THEME="Solarized (light)" export FPATH="/hdd/docs/eza/completions/zsh:$FPATH" @@ -59,22 +60,33 @@ eval `dircolors /yang/docs/dircolors.256dark` if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then export XDG_CURRENT_DESKTOP="sway" - dbus-run-session sway + sway fi -paste() { +pst() { local file + local use_ansifilter=false + + # Check if ansifilter exists + if command -v ansifilter >/dev/null 2>&1; then + use_ansifilter=true + fi + if [[ -p /dev/stdin ]]; then file=$(mktemp) - cat > "$file" + if $use_ansifilter; then + ansifilter > "$file" + else + cat > "$file" + fi elif [[ -n $1 ]]; then file="$1" else - echo "Usage: paste [file]" + echo "Usage: pst [file]" return 1 fi - curl -F "file=@$file" -H "X-Auth: $(cat ~/.key)" https://paste.jabuxas.xyz/upload + curl -F "file=@$file" -H "X-Auth: $(cat ~/.key)" https://paste.jabuxas.xyz if [[ -p /dev/stdin ]]; then rm "$file" @@ -82,8 +94,18 @@ paste() { } + # The next line updates PATH for the Google Cloud SDK. if [ -f '/yang/tmp/google-cloud-sdk/path.zsh.inc' ]; then . '/yang/tmp/google-cloud-sdk/path.zsh.inc'; fi # The next line enables shell command completion for gcloud. if [ -f '/yang/tmp/google-cloud-sdk/completion.zsh.inc' ]; then . '/yang/tmp/google-cloud-sdk/completion.zsh.inc'; fi + + +# BEGIN opam configuration +# This is useful if you're using opam as it adds: +# - the correct directories to the PATH +# - auto-completion for the opam binary +# This section can be safely removed at any time if needed. +[[ ! -r '/yang/.opam/opam-init/init.zsh' ]] || source '/yang/.opam/opam-init/init.zsh' > /dev/null 2> /dev/null +# END opam configuration