From d2b24636731c0555f6561cee2eb9b4d4d375aa3b Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 28 May 2016 16:58:45 +0200
Subject: Only use fish as graphical shell

This mitigates some issues with correctly loading the system locales
---
 bash/.bashrc                  | 10 ++++++++++
 fish/.config/fish/config.fish |  6 ------
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 bash/.bashrc

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
-- 
cgit v1.2.3