mirror of
https://github.com/frebib/dotfiles.git
synced 2024-06-14 12:57:23 +00:00
Merge branch 'master' into surface
This commit is contained in:
36
.profile
36
.profile
@ -4,7 +4,12 @@ export LC_NUMERIC=en_GB
|
||||
|
||||
export CONFIG_DIR="$HOME/.config"
|
||||
export XDG_CONFIG_HOME="$CONFIG_DIR"
|
||||
export DOTFILES="$CONFIG_DIR/dotfiles"
|
||||
case "$(basename "$(readlink -f /proc/$$/exe)")" in
|
||||
zsh) thisfile="$(readlink -f "${(%):-%N}")";;
|
||||
bash) thisfile="$(readlink -f "${BASH_SOURCE[0]}")";;
|
||||
*) thisfile="$(find /proc/$$/fd/ | xargs readlink -f | grep .profile | head -n1)";;
|
||||
esac
|
||||
export DOTFILES="$(dirname "${thisfile:-$CONFIG_DIR/dotfiles}")"
|
||||
export PATH="${PATH}:$DOTFILES/scripts:$HOME/.local/share/surface-scripts"
|
||||
export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
|
||||
|
||||
@ -15,13 +20,32 @@ export VIMINIT=":so $MYVIMRC"
|
||||
|
||||
export EDITOR="vim"
|
||||
export VISUAL="vim"
|
||||
export LESS="-RNI"
|
||||
export PAGER="less $LESS"
|
||||
export MANPAGER="less -+N"
|
||||
export TERMINAL="termite"
|
||||
export BROWSER="chromium"
|
||||
export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
|
||||
export QT_QPA_PLATFORMTHEME=gtk2
|
||||
export GOPATH="$HOME/.cache/go"
|
||||
|
||||
exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; }
|
||||
|
||||
export LESS="-RI"
|
||||
export PAGER="less $LESS"
|
||||
if exists tput; then
|
||||
export LESS_TERMCAP_mb=$(tput bold; tput setaf 2) # green
|
||||
export LESS_TERMCAP_md=$(tput bold; tput setaf 6) # cyan
|
||||
export LESS_TERMCAP_me=$(tput sgr0)
|
||||
export LESS_TERMCAP_so=$(tput bold; tput setaf 4) # blue
|
||||
export LESS_TERMCAP_se=$(tput rmso; tput sgr0)
|
||||
export LESS_TERMCAP_us=$(tput smul; tput bold; tput setaf 7) # white
|
||||
export LESS_TERMCAP_ue=$(tput rmul; tput sgr0)
|
||||
export LESS_TERMCAP_mr=$(tput rev)
|
||||
export LESS_TERMCAP_mh=$(tput dim)
|
||||
export LESS_TERMCAP_ZN=$(tput ssubm)
|
||||
export LESS_TERMCAP_ZV=$(tput rsubm)
|
||||
export LESS_TERMCAP_ZO=$(tput ssupm)
|
||||
export LESS_TERMCAP_ZW=$(tput rsupm)
|
||||
fi
|
||||
|
||||
# Source secret keys and values into environment
|
||||
if [ -f "$CONFIG_DIR/secrets" ]; then
|
||||
@ -31,18 +55,18 @@ if [ -f "$CONFIG_DIR/secrets" ]; then
|
||||
fi
|
||||
|
||||
# Merge system clipboards
|
||||
if [ -n "$DISPLAY" ] && which autocutsel >/dev/null 2>&1; then
|
||||
if [ -n "$DISPLAY" ] && exists autocutsel && ! pidof autocutsel 1>/dev/null; then
|
||||
autocutsel -fork
|
||||
autocutsel -selection PRIMARY -fork
|
||||
fi
|
||||
|
||||
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && which dbus-launch >/dev/null 2>&1; then
|
||||
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then
|
||||
eval $(dbus-launch --sh-syntax --exit-with-session)
|
||||
dbus-update-activation-environment --systemd DISPLAY
|
||||
fi
|
||||
|
||||
# Start the gnome-keyring if it's installed
|
||||
if which gnome-keyring-daemon >/dev/null 2>&1; then
|
||||
if exists gnome-keyring-daemon; then
|
||||
export $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gnupg)
|
||||
fi
|
||||
|
||||
|
Reference in New Issue
Block a user