diff options
| author | Adrian Kummerlaender | 2016-05-28 16:58:45 +0200 |
|---|---|---|
| committer | Adrian Kummerlaender | 2016-05-28 16:58:45 +0200 |
| commit | d2b24636731c0555f6561cee2eb9b4d4d375aa3b (patch) | |
| tree | 5dcbec0d208b934a89c61f1788f5433d422fda6f | |
| parent | 5ce877c5bcd484a64c4457ace746013af977642f (diff) | |
| download | dotfiles-d2b24636731c0555f6561cee2eb9b4d4d375aa3b.tar dotfiles-d2b24636731c0555f6561cee2eb9b4d4d375aa3b.tar.gz dotfiles-d2b24636731c0555f6561cee2eb9b4d4d375aa3b.tar.bz2 dotfiles-d2b24636731c0555f6561cee2eb9b4d4d375aa3b.tar.lz dotfiles-d2b24636731c0555f6561cee2eb9b4d4d375aa3b.tar.xz dotfiles-d2b24636731c0555f6561cee2eb9b4d4d375aa3b.tar.zst dotfiles-d2b24636731c0555f6561cee2eb9b4d4d375aa3b.zip | |
Only use fish as graphical shell
This mitigates some issues with correctly loading the system locales
| -rw-r--r-- | bash/.bashrc | 10 | ||||
| -rw-r--r-- | fish/.config/fish/config.fish | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/bash/.bashrc b/bash/.bashrc new file mode 100644 index 0000000..eb33c7a --- /dev/null +++ b/bash/.bashrc @@ -0,0 +1,10 @@ +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then + exec startx +fi + +if [[ "$TERM" != linux ]]; then + exec fish +fi diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index f49bfe0..f7fd5a4 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -11,9 +11,3 @@ alias dict='sdcv' alias mp3-dl='youtube-dl --extract-audio --audio-format mp3' eval (dircolors -c ~/.dir_colors) - -if status --is-login - if test -z "$DISPLAY" -a $XDG_VTNR = 1 - exec startx - end -end |