diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2020-04-08 17:22:15 -0400 |
|---|---|---|
| committer | Luke Smith <luke@lukesmith.xyz> | 2020-04-08 17:22:15 -0400 |
| commit | 0948cd95f3dec7694186fb4fbe31a3c46289f7a0 (patch) | |
| tree | f6a04c7eabbad04e7c11b3da8e683e69b9df5da2 /.profile | |
| parent | f68f3119c1da3c6229c0c26e41b60f20ce7bc84a (diff) | |
| parent | 422d106fbab5505f3810fa845f4f71547c7a4332 (diff) | |
| download | eibhear-0948cd95f3dec7694186fb4fbe31a3c46289f7a0.tar.gz eibhear-0948cd95f3dec7694186fb4fbe31a3c46289f7a0.tar.zst eibhear-0948cd95f3dec7694186fb4fbe31a3c46289f7a0.zip | |
Merge branch 'dennisleexyz-xdgify'
Diffstat (limited to '.profile')
| -rw-r--r-- | .profile | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -3,8 +3,8 @@ # Adds `~/.local/bin` to $PATH export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" -# Get default LARBS WM from ~/.local/share/larbs/wm -export LARBSWM="$(cat ~/.local/share/larbs/wm 2>/dev/null)" && +# Get default LARBS WM from ${XDG_DATA_HOME:$HOME/.local/share}/larbs/wm +export LARBSWM="$(cat ${XDG_DATA_HOME:$HOME/.local/share}/larbs/wm 2>/dev/null)" && [ "$LARBSWM" = "dwm" ] || export LARBSWM="i3" # Default programs: @@ -19,13 +19,16 @@ eval "$(sed 's/^[^#].*/export &/g;t;d' ~/.config/user-dirs.dirs)" # ~/ Clean-up: #export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs. -export NOTMUCH_CONFIG="$HOME/.config/notmuch-config" -export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0" +export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:$HOME/.config}/notmuch-config" +export GTK2_RC_FILES="${XDG_CONFIG_HOME:$HOME/.config}/gtk-2.0/gtkrc-2.0" export LESSHISTFILE="-" -export WGETRC="$HOME/.config/wget/wgetrc" -export INPUTRC="$HOME/.config/inputrc" -export ZDOTDIR="$HOME/.config/zsh" -export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" +export WGETRC="${XDG_CONFIG_HOME:$HOME/.config}/wget/wgetrc" +export INPUTRC="${XDG_CONFIG_HOME:$HOME/.config}/inputrc" +export ZDOTDIR="${XDG_CONFIG_HOME:$HOME/.config}/zsh" +export PASSWORD_STORE_DIR="${XDG_DATA_HOME:$HOME/.local/share}/password-store" +export TMUX_TMPDIR="$XDG_RUNTIME_DIR" +export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:$HOME/.config}/android" +export CARGO_HOME="${XDG_DATA_HOME:$HOME/.local/share}/cargo" # Other program settings: export DICS="/usr/share/stardict/dic/" @@ -40,10 +43,10 @@ export LESS_TERMCAP_se="$(printf '%b' '[0m')" export LESS_TERMCAP_us="$(printf '%b' '[1;32m')" export LESS_TERMCAP_ue="$(printf '%b' '[0m')" -[ ! -f ~/.config/shortcutrc ] && shortcuts >/dev/null 2>&1 +[ ! -f ${XDG_CONFIG_HOME:$HOME/.config}/shortcutrc ] && shortcuts >/dev/null 2>&1 # Start graphical server on tty1 if not already running. [ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx # Switch escape and caps if tty and no passwd required: -sudo -n loadkeys ~/.local/share/larbs/ttymaps.kmap 2>/dev/null +sudo -n loadkeys ${XDG_DATA_HOME:$HOME/.local/share}/larbs/ttymaps.kmap 2>/dev/null |