aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bash/.bashrc10
-rw-r--r--fish/.config/fish/config.fish6
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