.profile: Move desktop-specific vars to .config/profile.d
This commit is contained in:
parent
92f87bbadd
commit
3050db0a9b
3
.bashrc
3
.bashrc
|
|
@ -1,5 +1,6 @@
|
||||||
#
|
#
|
||||||
# ~/.bashrc -- Sourced by bash in interactive non-login shells; includes ~/bashrc.d/* and ~/.bashrc.local
|
# ~/.bashrc -- Sourced by bash in interactive non-login shells.
|
||||||
|
# Includes ~/.config/bashrc.d/*
|
||||||
#
|
#
|
||||||
|
|
||||||
# If not running interactively, don't do anything
|
# If not running interactively, don't do anything
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
#
|
||||||
|
# ~/.config/profile.d/30_desktop.sh -- Environment variables for clients / desktop environments.
|
||||||
|
#
|
||||||
|
|
||||||
|
# GNOME Keyring is used as an SSH agent on desktops
|
||||||
|
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
|
||||||
|
|
||||||
|
# Preferred applications
|
||||||
|
export TERMINAL=sakura
|
||||||
|
export BROWSER=firefox
|
||||||
|
|
||||||
|
# Wine: Do not change filetype associations
|
||||||
|
export WINEDLLOVERRIDES=winemenubuilder.exe=d
|
||||||
|
|
||||||
|
# Firefox: Enable pixel-perfect scrolling
|
||||||
|
export MOZ_USE_XINPUT2=1
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/ssh-agent.sock"
|
|
||||||
37
.profile
37
.profile
|
|
@ -1,30 +1,33 @@
|
||||||
#
|
#
|
||||||
# ~/.profile -- Included by .bash_profile; includes ~/.profile.local
|
# ~/.profile -- Included by .bash_profile, i.e. sourced in login shells.
|
||||||
|
# Includes ~/.config/profile.d/*
|
||||||
#
|
#
|
||||||
|
|
||||||
# SSH key agent
|
|
||||||
[[ -e "$XDG_RUNTIME_DIR/gcr/ssh" ]] && export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
|
|
||||||
|
|
||||||
# GPG key stuff
|
# GPG key stuff
|
||||||
export GPG_TTY=$(tty)
|
export GPG_TTY=$(tty)
|
||||||
|
|
||||||
# Environment variables
|
# Set terminal type to support colors
|
||||||
export TERM=xterm-color
|
export TERM=xterm-color
|
||||||
export TERMINAL=mate-terminal
|
|
||||||
export EDITOR=vim
|
|
||||||
export BROWSER=firefox
|
|
||||||
export BC_ENV_ARGS="-lq"
|
|
||||||
[[ -f "$HOME/.bcrc" ]] && export BC_ENV_ARGS="$BC_ENV_ARGS $HOME/.bcrc"
|
|
||||||
|
|
||||||
# PATH
|
# Preferred editor
|
||||||
|
export EDITOR=vim
|
||||||
|
|
||||||
|
# Set PATH
|
||||||
[[ -d "$HOME/.local/bin" ]] && export PATH="$HOME/.local/bin:$PATH"
|
[[ -d "$HOME/.local/bin" ]] && export PATH="$HOME/.local/bin:$PATH"
|
||||||
[[ -d "$HOME/bin" ]] && export PATH="$HOME/bin:$PATH"
|
[[ -d "$HOME/bin" ]] && export PATH="$HOME/bin:$PATH"
|
||||||
|
|
||||||
# Wine: do not change filetype associations
|
# Settings for bc
|
||||||
export WINEDLLOVERRIDES=winemenubuilder.exe=d
|
export BC_ENV_ARGS="-lq"
|
||||||
|
[[ -f "$HOME/.bcrc" ]] && export BC_ENV_ARGS="$BC_ENV_ARGS $HOME/.bcrc"
|
||||||
|
|
||||||
# Firefox: Enable pixel-perfect scrolling
|
# Include drop-in files
|
||||||
export MOZ_USE_XINPUT2=1
|
if [[ -d ~/.config/profile.d ]]; then
|
||||||
|
for f in ~/.config/profile.d/*; do
|
||||||
|
[[ -f $f ]] && source "$f"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
# Include host-specific .profile
|
# Deprecation warning for .profile.local
|
||||||
[ -f ~/.profile.local ] && source ~/.profile.local
|
if [[ -e ~/.profile.local ]]; then
|
||||||
|
echo "WARNING: ~/.profile.local is ignored, please use ~/.config/profile.d/ instead."
|
||||||
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue