From ef4b898ce59bd09700e15048951dd8981bfef851 Mon Sep 17 00:00:00 2001 From: Miquel Sabaté Solà Date: Wed, 23 Aug 2023 09:28:12 +0200 Subject: Tidying up my bashrc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Moved XDG variable into the proper user-dirs.dirs file, and ensured that the RVM lines are on the end. Signed-off-by: Miquel Sabaté Solà --- .bashrc | 14 ++++++-------- .config/user-dirs.dirs | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.bashrc b/.bashrc index e70d4a2..0ef012d 100644 --- a/.bashrc +++ b/.bashrc @@ -134,10 +134,6 @@ source_maybe "$HOME/.cargo/env" # SUSE export NODE_VERSION="14" -# Finally RVM requires it to be the last thing on the PATH for whatever reason. -[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" -export PATH="$PATH:$HOME/.rvm/bin" - ## # Lastly I had some problems with the GPG agent recently. So I copied a solution # from https://github.com/jessfraz/dotfiles @@ -165,9 +161,6 @@ alias ssh="gpg-connect-agent updatestartuptty /bye >/dev/null; ssh" alias ip="ip --color" alias ipb="ip --color --brief" -# Needed by Alacritty -export XDG_CONFIG_HOME="$HOME/.config" - # Add the binaries of Doom Emacs into my PATH. export PATH=$PATH:$HOME/.emacs.d/bin @@ -179,4 +172,9 @@ if command -v rustc &> /dev/null; then fi fi -export MB_PATH="$HOME/doc/bib" +# Yarn thingies. +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" + +# Finally RVM requires it to be the last thing on the PATH. +[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" +export PATH="$PATH:$HOME/.rvm/bin" diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs index d396454..fcf544f 100644 --- a/.config/user-dirs.dirs +++ b/.config/user-dirs.dirs @@ -5,4 +5,5 @@ XDG_MUSIC_DIR="/home/backup/Music" XDG_PICTURES_DIR="$HOME/doc/imatges" XDG_PUBLICSHARE_DIR="$HOME" XDG_TEMPLATES_DIR="$HOME/doc/Templates" -XDG_VIDEOS_DIR="$HOME/doc/vídeos" \ No newline at end of file +XDG_VIDEOS_DIR="$HOME/doc/vídeos" +XDG_CONFIG_HOME="$HOME/.config" -- cgit v1.2.3