From 76679dde9ab76e9c9edc25f9b434c5ed3df7ba31 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrel@tyrelsouza.com>
Date: Tue, 4 Oct 2022 23:52:00 -0400
Subject: [PATCH] more fish

---
 config/fish/config.fish          |  9 ++++++---
 config/fish/fish_variables       | 30 ++++++++++++++++++++++++++++++
 config/fish/functions/adg.fish   |  9 ---------
 config/fish/functions/atest.fish |  7 -------
 config/fish/functions/cg.fish    |  4 ----
 config/fish/functions/dots.fish  |  2 +-
 6 files changed, 37 insertions(+), 24 deletions(-)
 create mode 100644 config/fish/fish_variables
 delete mode 100644 config/fish/functions/adg.fish
 delete mode 100644 config/fish/functions/atest.fish
 delete mode 100644 config/fish/functions/cg.fish

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 8411844..a8807f1 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,3 +1,6 @@
-set fish_greeting ''
-eval (python -m virtualfish)
-
+if status is-interactive
+    nitch
+    set fish_greeting
+    # Commands to run in interactive sessions can go here
+    source ~/code/dotfiles/shell_funcs.fish
+end
diff --git a/config/fish/fish_variables b/config/fish/fish_variables
new file mode 100644
index 0000000..1b4481a
--- /dev/null
+++ b/config/fish/fish_variables
@@ -0,0 +1,30 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_initialized:3100
+SETUVAR fish_color_autosuggestion:555\x1ebrblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:005fd7
+SETUVAR fish_color_comment:990000
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:009900
+SETUVAR fish_color_error:ff0000
+SETUVAR fish_color_escape:00a6b2
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:00a6b2
+SETUVAR fish_color_param:00afff
+SETUVAR fish_color_quote:999900
+SETUVAR fish_color_redirection:00afff
+SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_completion:\x1d
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
diff --git a/config/fish/functions/adg.fish b/config/fish/functions/adg.fish
deleted file mode 100644
index 9e89add..0000000
--- a/config/fish/functions/adg.fish
+++ /dev/null
@@ -1,9 +0,0 @@
-function adg
-	vf activate addgene-core                                                     
-    if test -d ~/code/github/addgene/addgene-core
-        cd ~/code/github/addgene/addgene-core
-    end
-    if test -d ~/AddgeneProjects/addgene-core
-		cd ~/AddgeneProjects/addgene-core
-    end
-end
diff --git a/config/fish/functions/atest.fish b/config/fish/functions/atest.fish
deleted file mode 100644
index baa6680..0000000
--- a/config/fish/functions/atest.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-function atest
-	set a_test (echo $argv | sed -e 's/\//\./g' | sed -e 's/.py//g')
-	set a_project (echo -n $a_test | python -c "import sys; print sys.stdin.read().split('.', 1)[0]");
-    set run_test (echo "bin/manage_"$a_project".py test "$a_test)
-    echo $run_test
-    eval $run_test
-end
diff --git a/config/fish/functions/cg.fish b/config/fish/functions/cg.fish
deleted file mode 100644
index 9480c4d..0000000
--- a/config/fish/functions/cg.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function cg
-	set toplev (git rev-parse --show-toplevel)
-    cd $toplev
-end
diff --git a/config/fish/functions/dots.fish b/config/fish/functions/dots.fish
index e8e5df3..b74248b 100644
--- a/config/fish/functions/dots.fish
+++ b/config/fish/functions/dots.fish
@@ -1,3 +1,3 @@
 function dots
-	cd ~/code/gitlab/tyrelsouza/dotfiles/
+	cd ~/code/dotfiles/
 end