From 3189943dec20bef155614bd43f5704dd48834a20 Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Fri, 14 Aug 2020 11:34:09 -0400
Subject: [PATCH] Fish: clean up config and show prompt only in tty

---
 .config/fish/config.fish                  | 10 ++--------
 .config/fish/fish_variables               |  4 +++-
 .config/fish/functions/fish_greeting.fish |  4 ----
 3 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 .config/fish/functions/fish_greeting.fish

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index fa3a96e..baa5aff 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -2,11 +2,5 @@
 set fish_user_paths ~/.local/bin $D/Installs/bin /usr/lib/ccache/bin /usr/bin /usr/sbin /sbin /bin 
 set fish_function_path $fish_function_path $D/Games/Minecraft/Game/functions
 
-# PROGRAM SETTINGS #
-set -gx EDITOR nvim
-set -gx PAGER nvimpager
-set -U Z_CMD "j"
-
-set -x QT_QPA_PLATFORMTHEME gtk2
-
-starship init fish | source
+# FOR INTERACTIVE TERMINAL #
+tty -s && starship init fish | source
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index e05ed79..67ebfdb 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -2,6 +2,8 @@
 # VERSION: 3.0
 SETUVAR --export ARCH:x86_64
 SETUVAR --export D:/mnt/LocalDiskD
+SETUVAR --export EDITOR:nvim
+SETUVAR --export PAGER:nvimpager
 SETUVAR ZO_CMD:jo
 SETUVAR Z_CMD:j
 SETUVAR Z_DATA:/home/glados/\x2elocal/share/z/data
@@ -34,7 +36,7 @@ SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrbl
 SETUVAR fish_color_status:red
 SETUVAR fish_color_user:brgreen
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell
+SETUVAR fish_greeting:\x1d
 SETUVAR fish_key_bindings:fish_default_key_bindings
 SETUVAR fish_pager_color_completion:\x1d
 SETUVAR fish_pager_color_description:B3A06D\x1eyellow
diff --git a/.config/fish/functions/fish_greeting.fish b/.config/fish/functions/fish_greeting.fish
deleted file mode 100644
index 2256392..0000000
--- a/.config/fish/functions/fish_greeting.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.hGIIv7/fish_greeting.fish @ line 2
-function fish_greeting
-
-end