frebib/dotfiles
1
0
Fork 0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: frebib:d3910bda18e3b30873bd2c370fa3a300d5dae5b0
Branches Tags
frebib:master
frebib:frebib-PC
frebib:systemd-session
frebib:surface
frebib:surface-docked
..
compare: frebib:c719fad76a7ee3f84339b93ee9b3dc629e4166b9
Branches Tags
frebib:master
frebib:frebib-PC
frebib:systemd-session
frebib:surface
frebib:surface-docked

3 Commits
d3910bda18 ... c719fad76a

Author SHA1 Message Date
Joe Groocock
c719fad76a
zsh: skip loading environment if ZDOTDIR is set 
Loading the environment on every shell invocation is slow. We can speed
up shell startup a little by skipping this for ever shell because it's
loaded on login by systemd.

Signed-off-by: Joe Groocock <me@frebib.net>
 2020-08-23 12:03:27 +01:00
Joe Groocock
9d34d3250b
environment: force aspell to respect XDG directories 
Signed-off-by: Joe Groocock <me@frebib.net>
 2020-08-23 11:50:27 +01:00
Joe Groocock
cda9cb6570
environment: split XDG base directory overrides 
Move environment variable overrides for non-XDG compliant applications
into it's own file. I expect this list will get a lot longer over time.

Signed-off-by: Joe Groocock <me@frebib.net>
 2020-08-23 11:49:52 +01:00
3 changed files with 33 additions and 25 deletions
Show Stats Expand all files Collapse all files

22
environment.d/10-profile.conf
View File

@ -9,28 +9,6 @@ XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
EDITOR="vim" EDITOR="vim"
VISUAL="vim" VISUAL="vim"
# Override paths for non-compliant programs
# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
ADOTDIR="$XDG_DATA_HOME/zsh/antigen"
CARGO_HOME="$XDG_DATA_HOME/cargo"
GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
GOPATH="$XDG_DATA_HOME/go"
ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
#PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup"
RUSTUP_HOME="$XDG_DATA_HOME/rustup"
TERMINFO="$XDG_DATA_HOME/terminfo"
TERMINFO_DIRS="$XDG_DATA_HOME/terminfo:/usr/share/terminfo"
TS3_CONFIG_DIR="$XDG_CONFIG_HOME/teamspeak3"
VIMDIR="$XDG_CONFIG_HOME/vim"
VIMRC="$VIMDIR/vimrc"
VIMINIT=":so $VIMRC"
WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
ZDOTDIR="$XDG_CONFIG_HOME/zsh"
PATH="${PATH}:/sbin:/usr/sbin:${XDG_CONFIG_HOME}/scripts:${GOPATH}/bin" PATH="${PATH}:/sbin:/usr/sbin:${XDG_CONFIG_HOME}/scripts:${GOPATH}/bin"
# vim: ft=sh # vim: ft=sh

24
environment.d/20-xdg-overrides.conf Normal file
View File

@ -0,0 +1,24 @@
# Override paths for non-compliant programs
# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
ADOTDIR="$XDG_DATA_HOME/zsh/antigen"
ASPELL_CONF="per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_CONFIG_HOME/aspell/en.pws; repl $XDG_CONFIG_HOME/aspell/en.prepl"
CARGO_HOME="$XDG_DATA_HOME/cargo"
GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
GOPATH="$XDG_DATA_HOME/go"
ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
#PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup"
RUSTUP_HOME="$XDG_DATA_HOME/rustup"
TERMINFO="$XDG_DATA_HOME/terminfo"
TERMINFO_DIRS="$XDG_DATA_HOME/terminfo:/usr/share/terminfo"
TS3_CONFIG_DIR="$XDG_CONFIG_HOME/teamspeak3"
VIMDIR="$XDG_CONFIG_HOME/vim"
VIMRC="$VIMDIR/vimrc"
VIMINIT=":so $VIMRC"
WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
ZDOTDIR="$XDG_CONFIG_HOME/zsh"
# vim: ft=sh

12
zsh/.zshenv
View File

@ -1,5 +1,11 @@
set -o allexport # Assume environment is already loaded if ZDOTDIR is set.
. ~/.config/environment.d/*.conf # This speeds up starting zsh if it's not required. Attempt
set +o allexport # to load the environment if it's absent, though, in case
# ZDOTDIR is overriden and .zshrc is not in ~
if [ -z "$ZDOTDIR" ]; then
set -o allexport
. ~/.config/environment.d/*.conf
set +o allexport
fi
# vim: ft=sh # vim: ft=sh