janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/zsh: move environment exports from zshrc to zprofile

This commit is contained in:
xeruf 2021-07-06 11:53:20 +02:00
parent 27df875f74
commit 5f287dde27
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.config/zsh/.zshrc
View File

@ -13,11 +13,6 @@ fi 2>/dev/null || return 0
# source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" # source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
#fi #fi
export PATH=$HOME/.local/bin/scripts:$HOME/.local/bin:$PATH:/opt/android-sdk/platform-tools:$XDG_CONFIG_HOME/emacs/bin
export CONFIG_ZSH="$XDG_CONFIG_HOME/zsh"
export CONFIG_SHELLS="$XDG_CONFIG_HOME/shell"
export ZSH="$XDG_DATA_HOME/oh-my-zsh"
DEFAULT_USER=$USER DEFAULT_USER=$USER
ZSH_THEME="powerlevel10k/powerlevel10k" ZSH_THEME="powerlevel10k/powerlevel10k"
@ -165,8 +160,6 @@ alias zcp='noglob zmv -C'
alias zln='noglob zmv -L' alias zln='noglob zmv -L'
alias zsy='noglob zmv -Ls' alias zsy='noglob zmv -Ls'
which nvim >/dev/null && export EDITOR='nvim' || export EDITOR='vim'
for file in $CONFIG_SHELLS/*; do source $file; done for file in $CONFIG_SHELLS/*; do source $file; done
# GENERATED SHIT # GENERATED SHIT

11
.zprofile
View File

@ -3,6 +3,7 @@ export DATA="$HOME/data"
export XDG_DATA_HOME="$HOME/.local/share" export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CACHE_HOME="$HOME/.cache" export XDG_CACHE_HOME="$HOME/.cache"
export XDG_CONFIG_HOME="$HOME/.config" export XDG_CONFIG_HOME="$HOME/.config"
export PATH="$HOME/.local/bin/scripts:$HOME/.local/bin:$PATH:$XDG_CONFIG_HOME/emacs/bin"
# adjust programs to use xdg # adjust programs to use xdg
export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
@ -25,7 +26,8 @@ export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java"
export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
export ANDROID_PREFS_ROOT="$XDG_CONFIG_HOME"/android export ANDROID_PREFS_ROOT="$XDG_CONFIG_HOME"/android
export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/emulator export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/emulator
export ANDROID_SDK_ROOT="/opt/android/sdk" export ANDROID_SDK_ROOT="/opt/android-sdk"
export PATH="$PATH:$ANDROID_SDK_ROOT/platform-tools"
# taskwarrior & timewarrior # taskwarrior & timewarrior
export TIMEWARRIORDB="$XDG_DATA_HOME/timewarrior" export TIMEWARRIORDB="$XDG_DATA_HOME/timewarrior"
export TASKRC="$XDG_CONFIG_HOME/task/taskrc" export TASKRC="$XDG_CONFIG_HOME/task/taskrc"
@ -33,14 +35,17 @@ export TASKDATA="$XDG_DATA_HOME/task"
# zsh dirs # zsh dirs
export ZDOTDIR="$XDG_CONFIG_HOME/zsh" export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
export HISTFILE="$XDG_DATA_HOME/zsh/history" export HISTFILE="$XDG_DATA_HOME/zsh/history"
export ZSH="$XDG_DATA_HOME/zsh/oh-my-zsh"
export CONFIG_ZSH="$XDG_CONFIG_HOME/zsh"
export CONFIG_SHELLS="$XDG_CONFIG_HOME/shell"
# ccache - can be removed with version 4 - https://github.com/ccache/ccache/issues/191 # ccache - can be removed with version 4 - https://github.com/ccache/ccache/issues/191
export CCACHE_CONFIGPATH="$XDG_CONFIG_HOME"/ccache.config export CCACHE_CONFIGPATH="$XDG_CONFIG_HOME"/ccache.config
export CCACHE_DIR="$XDG_CACHE_HOME"/ccache export CCACHE_DIR="$XDG_CACHE_HOME"/ccache
# environment # environment
export IGNOREDIRS=".sync,.stfolder,.git,out,build,dev" which nvim >/dev/null && export EDITOR='nvim' || export EDITOR='vim'
export EDITOR=/usr/bin/nvim
export LESS='--RAW-CONTROL-CHARS --ignore-case --incsearch --LONG-PROMPT --jump-target=5' export LESS='--RAW-CONTROL-CHARS --ignore-case --incsearch --LONG-PROMPT --jump-target=5'
export IGNOREDIRS=".sync,.stfolder,.git,out,build,dev"
# red stderr # red stderr
test -f "/usr/lib/libstderred.so" && export LD_PRELOAD="/usr/lib/libstderred.so${LD_PRELOAD:+:$LD_PRELOAD}" test -f "/usr/lib/libstderred.so" && export LD_PRELOAD="/usr/lib/libstderred.so${LD_PRELOAD:+:$LD_PRELOAD}"
# software config # software config