From b0a3f691541903ebf8109eba968c0d4b4ba54b21 Mon Sep 17 00:00:00 2001
From: Tom Barrett <spalf0@gmail.com>
Date: Tue, 3 Sep 2019 07:54:01 -0500
Subject: more paths, firefox desktop and download dirs, aerc makefile change,
 new src directory

---
 .config/fish/config.fish                |  1 -
 .config/fish/fish_variables             |  3 +++
 .config/fish/functions/fish_prompt.fish | 42 +++++++++++++++++++++++++++++++++
 .config/user-dirs.dirs                  |  2 ++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 .config/fish/functions/fish_prompt.fish
 create mode 100644 .config/user-dirs.dirs

(limited to '.config')

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index f6ebca8..d13dd2a 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,4 +1,3 @@
-#fish_vi_key_bindings
 function fish_user_key_bindings
 	for mode in insert default visual
 		bind -M $mode \cf forward-char
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index 6442ac4..12cdc2d 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -3,6 +3,9 @@
 SETUVAR __fish_init_2_39_8:\x1d
 SETUVAR __fish_init_2_3_0:\x1d
 SETUVAR __fish_init_3_x:\x1d
+SETUVAR --export --path GOPATH:/home/tom/src/go
+SETUVAR --export --path PATH:/usr/local/sbin\x1e/usr/sbin\x1e/sbin\x1e/usr/local/bin\x1e/usr/bin\x1e/bin\x1e/usr/local/games\x1e/usr/games
+SETUVAR EDITOR:nvim
 SETUVAR _fish_abbr_vim:nvim
 SETUVAR fish_color_autosuggestion:64DF85
 SETUVAR fish_color_cancel:\x2dr
diff --git a/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish
new file mode 100644
index 0000000..7f4860d
--- /dev/null
+++ b/.config/fish/functions/fish_prompt.fish
@@ -0,0 +1,42 @@
+function fish_prompt --description 'Write out the prompt'
+	
+    set stat $status
+
+    if not set -q __fish_prompt_normal
+        set -g __fish_prompt_normal (set_color normal)
+    end
+
+    if not set -q __fish_color_blue
+        set -g __fish_color_blue (set_color -o blue)
+    end
+
+    #Set the color for the status depending on the value
+    set __fish_color_status (set_color -o green)
+    if test $stat -gt 0
+        set __fish_color_status (set_color -o red)
+    end
+
+    switch "$USER"
+
+        case root toor
+
+            if not set -q __fish_prompt_cwd
+                if set -q fish_color_cwd_root
+                    set -g __fish_prompt_cwd (set_color $fish_color_cwd_root)
+                else
+                    set -g __fish_prompt_cwd (set_color $fish_color_cwd)
+                end
+            end
+
+            printf '%s@%s %s%s%s# ' $USER (prompt_hostname) "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal"
+
+        case '*'
+
+            if not set -q __fish_prompt_cwd
+                set -g __fish_prompt_cwd (set_color $fish_color_cwd)
+            end
+
+            printf '[%s] %s%s@%s %s%s %s(%s)%s \f\r> ' (date "+%H:%M:%S") "$__fish_color_blue" $USER (prompt_hostname) "$__fish_prompt_cwd" "$PWD" "$__fish_color_status" "$stat" "$__fish_prompt_normal"
+
+    end
+end
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
new file mode 100644
index 0000000..aab4a51
--- /dev/null
+++ b/.config/user-dirs.dirs
@@ -0,0 +1,2 @@
+XDG_DESKTOP_DIR="$HOME/"
+XDG_DOWNLOAD_DIR="$HOME/downloads/"
-- 
cgit v1.2.3