commit a862dd3c76408a16cff79876b7d63b75fae8a91c parent 3b8939e8a1bbc4237a0bace85e3dc5364f3a1c4e Author: Oscar Benedito <oscar@oscarbenedito.com> Date: Tue, 23 Jun 2020 19:59:05 +0200 Move .zshenv into .profile Diffstat:
| D | .config/zsh/.zshenv | | | 29 | ----------------------------- |
| M | .profile | | | 31 | +++++++++++++++++++++++++++++-- |
2 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv @@ -1,29 +0,0 @@ -# Local bin to path -[ -d "$HOME/.local/bin" ] && \ - export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | paste -sd ':')" - -# XDG dirs -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_CACHE_HOME="$HOME/.cache" - -# XDG paths -export R_LIBS_USER="$XDG_DATA_HOME/R" -export ATOM_HOME="$XDG_DATA_HOME/atom" -export GOPATH="$XDG_DATA_HOME/go" -export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" -export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter" -export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc -export ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority" -export RXVT_SOCKET="$XDG_RUNTIME_DIR/urxvtd" -export LESSHISTFILE="-" - -# Environment variables -export VISUAL="nvim" -export EDITOR="nvim" -export TERMINAL="alacritty" -export SUDO_ASKPASS="$HOME/.local/bin/sudoaskpass-dmenu" - -# Go bin to path -[ -d "$XDG_DATA_HOME/go/bin" ] && export PATH="$XDG_DATA_HOME/go/bin:$PATH" diff --git a/.profile b/.profile @@ -1,4 +1,31 @@ xrdb "${XDG_CONFIG_HOME:-$HOME/.config}/Xresources" & -[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/.zshenv" ] && \ - . "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/.zshenv" +# Local bin to path +[ -d "$HOME/.local/bin" ] && \ + export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | sed 's/\/$//g' | paste -sd ':')" + +# XDG dirs +export XDG_DATA_HOME="$HOME/.local/share" +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_CACHE_HOME="$HOME/.cache" + +# XDG paths +export R_LIBS_USER="$XDG_DATA_HOME/R" +export ATOM_HOME="$XDG_DATA_HOME/atom" +export GOPATH="$XDG_DATA_HOME/go" +export ZDOTDIR="$XDG_CONFIG_HOME/zsh" +export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" +export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter" +export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc +export ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority" +export RXVT_SOCKET="$XDG_RUNTIME_DIR/urxvtd" +export LESSHISTFILE="-" + +# Environment variables +export VISUAL="nvim" +export EDITOR="nvim" +export TERMINAL="alacritty" +export SUDO_ASKPASS="$HOME/.local/bin/sudoaskpass-dmenu" + +# Go bin to path +[ -d "$GOPATH/bin" ] && export PATH="$PATH:$GOPATH/bin"