Add right prompt

functions/lean_load_right_prompt_modules.fish

@@ -0,0 +1,11 @@
+function lean_load_right_prompt_modules
+    set -g lean_right_prompt_modules_order leanTimer
+    set -g leanTimer (_lean_timer)
+end
+
+function _lean_timer
+    if test (math $CMD_DURATION/1000) -gt $lean_timer_duration
+        set -l leanTimerOutput (math --scale=$lean_timer_decimals $CMD_DURATION/1000)"s"
+        echo -n $leanTimerOutput
+    end
+end

functions/lean_right_prompt.fish

@@ -0,0 +1,7 @@
+function lean_right_prompt
+    set -l n (set_color normal)
+    set -l ltc (set_color $lean_timer_color)
+
+    set -l leanRightPrompt " "$ltc$leanTimer$n" "
+    echo $leanRightPrompt
+end

functions/lean_wizard.fish

@@ -27,10 +27,10 @@ end
 function _promptHeight
     _title "Prompt Height"
 
-    echo "(1)  One line"
+    _option 1 "One line"
     _displayPrompt prompt_height 1
 
-    echo "(2)  Two lines"
+    _option 2 "Two lines"
     _displayPrompt prompt_height 2
 
     _displayRestartAndQuit
@@ -38,7 +38,7 @@ function _promptHeight
     switch (lean_user_ask "Choice" 1/2/r/q)
         case 1
             set -g prompt_height 1
-            _finish
+            _promptSpacing
         case 2
             set -g prompt_height 2
             _promptConnection
@@ -53,13 +53,13 @@ function _promptConnection
     clear
     _title "Prompt Connection"
 
-    echo "(1)  Disconnected"
+    _option 1 "Disconnected"
     _displayPrompt fake_lean_prompt_connection " "
 
-    echo "(2)  Dotted"
+    _option 2 "Dotted"
     _displayPrompt fake_lean_prompt_connection "·"
 
-    echo "(3)  Solid"
+    _option 3 "Solid"
     _displayPrompt fake_lean_prompt_connection "─"
 
     _displayRestartAndQuit
@@ -85,16 +85,16 @@ function _promptConnectionColor
     clear
     _title "Connection Color"
 
-    echo "(1) Lightest"
+    _option 1 "Lightest"
     _displayPrompt fake_lean_prompt_connection_color 808080
 
-    echo "(2) Light"
+    _option 2 "Light"
     _displayPrompt fake_lean_prompt_connection_color 6C6C6C
 
-    echo "(3) Dark"
+    _option 3 "Dark"
     _displayPrompt fake_lean_prompt_connection_color 585858
 
-    echo "(4) Darkest"
+    _option 4 "Darkest"
     _displayPrompt fake_lean_prompt_connection_color 444444
 
     _displayRestartAndQuit
@@ -123,12 +123,14 @@ function _promptSpacing
     clear
     _title "Prompt Spacing"
 
-    echo "(1) Compact"
+    _option 1 "Compact"
     _displayPrompt newline false
+    echo -ne "\r\033[1A"
     _displayPrompt newline false
 
-    echo "(2) Sparse"
+    _option 2 "Sparse"
     _displayPrompt newline true
+    echo -ne "\r\033[1A"
     _displayPrompt newline true
 
     _displayRestartAndQuit
@@ -164,10 +166,16 @@ function _assemblePrompt --argument-names which
     end
     _addMod "3_"$prompt_height"Line"
     _addMod 4_final
+    if test $prompt_height -eq 1
+        # breakpoint
+        _addMod 5_rightPrompt
+    else
+        _addMod 5_rPromptNoColor
+    end
 end
 
 function _addMod --argument-names file
-    cat "$moduleDir/$file" >>$promptDir
+    cat "$moduleDir/$file.fish" >>$promptDir
     printf "\n\n" >>$promptDir
 end
 
@@ -178,13 +186,22 @@ function _title --argument-names title
     for i in (seq (math $midCols-$midTitle))
         echo -n " "
     end
+    set_color -o
     echo $title
+    set_color normal
+end
+
+function _option --argument-names number text
+    set_color -o
+    echo "($number) $text"
+    set_color normal
 end
 
 function _displayPrompt --argument-names var_name var_value
     set -g $var_name $var_value
     _assemblePrompt fake
     source $promptDir
+    
     fake_prompt
     echo
     echo

install.fish

@@ -55,6 +55,6 @@ function lean_install
     source "$__fish_config_dir/functions/fish_prompt.fish"
 
     set_color $lean_color_green
-    echo "Lean theme installed!"
+    echo "Lean theme installed! Run 'lean_wizard' to configure your prompt."
     set_color $fish_color_normal
 end

lean_theme/prompt_modules/fake_prompt/3_2Line.fish

@@ -8,4 +8,14 @@
     set_color $lean_timer_color
     echo -n $timerOutput
     set_color $fish_color_normal
-    echo -e "\r"(lean_pwd)(lean_git_prompt)" "
+    
+    echo -ne "\r"
+    
+    set -l Lblue (set_color -o $lean_color_light_blue)
+    set -l Dblue (set_color $lean_color_dark_blue)
+    set -l n (set_color $fish_color_normal)
+    echo -n $Lblue"~"$n$Dblue"/"$n$Lblue"src "$n
+    
+    set_color $lean_color_green
+    echo "master "
+    set_color $fish_color_normal

lean_theme/prompt_modules/fake_prompt/5_rPromptNoColor.fish

@@ -0,0 +1,4 @@
+function _lean_right_prompt_nocolor
+    set -l leanRightPromptDecolored " "$leanTimer" "
+    echo $leanRightPromptDecolored
+end

lean_theme/prompt_modules/fake_prompt/5_rightPrompt.fish

@@ -0,0 +1,5 @@
+function fish_right_prompt
+    set_color $lean_timer_color
+    echo " 5s "
+    set_color $fish_color_normal
+end

lean_theme/prompt_modules/fish_prompt/3_2Line

@@ -1,13 +0,0 @@
-    set_color $lean_prompt_connection_color
-    printf "%.s$lean_prompt_connection" (seq (math $COLUMNS-1))
-    set_color $fish_color_normal
-    if test (math $CMD_DURATION/1000) -gt $lean_timer_duration
-        set -l timerOutput " "(math --scale=$lean_timer_decimals $CMD_DURATION/1000)"s "
-        set -l timerStartLocation (math $COLUMNS-(string length $timerOutput))
-
-        printf "\r\033["$timerStartLocation"C"
-        set_color $lean_timer_color
-        echo -n $timerOutput
-        set_color $fish_color_normal
-    end
-    echo -e "\r"(lean_pwd)(lean_git_prompt)" "

lean_theme/prompt_modules/fish_prompt/3_2Line.fish

@@ -0,0 +1,10 @@
+    set_color $lean_prompt_connection_color
+    printf "%.s$lean_prompt_connection" (seq (math $COLUMNS-1))
+    set_color $fish_color_normal
+
+    lean_load_right_prompt_modules
+    set -l leanRightPromptStartLocation (math $COLUMNS-(string length (_lean_right_prompt_nocolor)))
+    printf "\r\033["$leanRightPromptStartLocation"C"
+    echo -n (lean_right_prompt)
+    
+    echo -e "\r"(lean_pwd)(lean_git_prompt)" "

lean_theme/prompt_modules/fish_prompt/5_rPromptNoColor.fish

@@ -0,0 +1,4 @@
+function _lean_right_prompt_nocolor
+    set -l leanRightPromptDecolored " "$leanTimer" "
+    echo $leanRightPromptDecolored
+end

lean_theme/prompt_modules/fish_prompt/5_rightPrompt.fish

@@ -0,0 +1,4 @@
+function fish_right_prompt
+    lean_load_right_prompt_modules
+    lean_right_prompt
+end