diff options
| -rw-r--r-- | .config/shell/envvarrc | 36 | ||||
| -rw-r--r-- | .profile | 22 |
2 files changed, 32 insertions, 26 deletions
diff --git a/.config/shell/envvarrc b/.config/shell/envvarrc index 62aaf2f..42e9d3e 100644 --- a/.config/shell/envvarrc +++ b/.config/shell/envvarrc @@ -1,19 +1,39 @@ #!/bin/sh # This little script sets my environment variables. -export ALIASRC="$ZSHDIR/aliasrc" +# Primary programs export BROWSER="librewolf" export EDITOR="vim" -export MANPAGER="vim -M +MANPAGER - " -export RSYNC_OPTIONS="-rtvzP" -export SCRIPTS="$HOME/.scripts" +export IMAGE_VIEWER="sxiv" +export MANPAGER="vim -M +MANPAGER -" export SHELL="/usr/bin/zsh" -export VIMINFO="$HOME/.config/vim/.viminfo" -export VIMINIT="source $HOME/.config/vim/.vimrc" +export TERMINAL="st" + +# PATH and scripts directory +export SCRIPTS="$HOME/.scripts" +export PATH="$SCRIPTS:$HOME/.cargo/bin:$HOME/.local/bin:$PATH" + +# TODO: clean up this mess export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.config" +export XDG_DATA_HOME="$HOME/.local/share" +export XDG_CACHE_HOME="$HOME/.cache" +export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" + +export ALIASRC="$HOME/.config/shell/aliasrc" export ZSHDIR="$HOME/.config/shell" +export ENVVARRC="$HOME/.config/shell/envvarrc" + +export CONDARC="$HOME/.config/conda/.condarc" +export _CONDA_ROOT="$HOME/.local/opt/miniconda3" + +export GOPATH="$HOME/langs/go" export STARDICT_DATA_DIR="$HOME/.local/share/stardict" + +export R_HISTFILE="$HOME/langs/R/.Rhistory" export R_HOME="$HOME/langs/R" export R_LIBS_USER="$HOME/langs/R" -export _CONDA_ROOT="$HOME/.local/opt/miniconda3" +export R_PROFILE="$HOME/langs/R/.Rprofile" + +export MYVIMRC="$HOME/.config/vim/.vimrc" +export VIMINFO="$HOME/.config/vim/.viminfo" +export VIMINIT="source $MYVIMRC" @@ -1,25 +1,11 @@ #!/bin/sh # Filip's .profile -# Environmental variables +# Set environmental variables +. /home/filipek/.config/shell/envvarrc -export BROWSER="librewolf" -export EDITOR="vim" -export SHELL="zsh" -export TERMINAL="st" -export IMAGE_VIEWER="sxiv" -export SCRIPTS="$HOME/.scripts" -export ALIASRC="$HOME/.config/shell/aliasrc" -export VIMINFO="$HOME/.config/vim/.viminfo" -export MYVIMRC="$HOME/.config/vim/.vimrc" -export VIMINIT="source $MYVIMRC" -export MANPAGER="vim -M +MANPAGER -" -export PATH="$SCRIPTS:$HOME/.cargo/bin:$HOME/.local/bin:$PATH" -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.config" - -# Use custom remaps from the script -autostart="remaps xcompmgr xhidecursor slstatus" +# Autostart stuff on reboot +autostart="remaps slstatus xcompmgr xhidecursor" for program in $autostart; do pidof -sx "$program" || "$program" & |