diff options
| author | Florian Fischer <muhq@muhq.space> | 2017-05-11 22:56:13 +0200 |
|---|---|---|
| committer | Florian Fischer <muhq@muhq.space> | 2017-05-11 22:56:13 +0200 |
| commit | be80f9b46eefc89b30d5609b799a62056ebb0693 (patch) | |
| tree | ed115528e6e9c7660c13f2b40c875afb4d6eaf94 /xinitrc | |
| parent | c2275cb0074f030904d6cb3ad7393b32530f4c9f (diff) | |
| parent | f677f94928b9ae0f2b549bef11c60bbdb6e37f51 (diff) | |
| download | dotfiles-be80f9b46eefc89b30d5609b799a62056ebb0693.tar.gz dotfiles-be80f9b46eefc89b30d5609b799a62056ebb0693.zip | |
Merge branch 'master' of https://github.com/fischerling/dotfiles
Diffstat (limited to 'xinitrc')
| -rw-r--r-- | xinitrc | 59 |
1 files changed, 3 insertions, 56 deletions
@@ -1,59 +1,6 @@ #!/bin/bash -# Set my favorite terminal -if type st >/dev/null 2>/dev/null -then - export TERMINAL=st -elif type urxvt >/dev/null 2>/dev/null -then - export TERMINAL=urxvt -elif type terminator >/dev/null 2>/dev/null -then - export TERMINAL=terminator -fi +[ -f /etc/xprofile ] && . /etc/xprofile +[ -f ~/.xprofile ] && . ~/.xprofile -# agetty unsets passed locale vars. -# See: -# /etc/systemd/system/getty.target.wants/getty@tty1.service -# /usr/lib/systemd/system/getty@.service -# Because of problems with some locales. -# See: -# https://github.com/fish-shell/fish-shell/issues/3092#issuecomment-223154845 -# => Set correct locale. Copied from arch's /etc/profile.d/locale.sh - -if [ -z "$LANG" ]; then - if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then - . "$XDG_CONFIG_HOME/locale.conf" - elif [ -n "$HOME" ] && [ -r "$HOME/.config/locale.conf" ]; then - . "$HOME/.config/locale.conf" - elif [ -r /etc/locale.conf ]; then - . /etc/locale.conf - fi -fi - -LANG=${LANG:-C} -export LANG -[ -n "$LC_CTYPE" ] && export LC_CTYPE -[ -n "$LC_NUMERIC" ] && export LC_NUMERIC -[ -n "$LC_TIME" ] && export LC_TIME -[ -n "$LC_COLLATE" ] && export LC_COLLATE -[ -n "$LC_MONETARY" ] && export LC_MONETARY -[ -n "$LC_MESSAGES" ] && export LC_MESSAGES -[ -n "$LC_PAPER" ] && export LC_PAPER -[ -n "$LC_NAME" ] && export LC_NAME -[ -n "$LC_ADDRESS" ] && export LC_ADDRESS -[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE -[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT -[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION - -# Export DOTFILES_LOCATION (should be exported allready - -if [ -z "$DOTFILES_LOCATION" ]; then - export DOTFILES_LOCATION=$(get_dotfiles_location) -fi - -eval $(ssh-agent -s -a ~/.ssh/agent.sock) - -[[ -f $HOME/.Xresources ]] && xrdb -merge $HOME/.Xresources - -exec i3 -V > $HOME/.i3/log +exec i3 -V > ~/.i3/log
\ No newline at end of file |