experiment without powerline

7 files changed, 21 insertions, 24 deletions

diff --git a/cli/.config/fish/conf.d/prompt.fish b/cli/.config/fish/conf.d/prompt.fish
index 8f82b8b..742f9b1 100644
--- a/cli/.config/fish/conf.d/prompt.fish
+++ b/cli/.config/fish/conf.d/prompt.fish
@@ -1,12 +1,12 @@
 if ! string match -eq linux $TERM
-    set prompt_sep \ue0b0
-    set prompt_bang \n\ (set_color brred)\u266a\ 
+#   set prompt_sep \ue0b0
+    set prompt_bang \n(set_color brred)\>\ 
     set git_sign \ue0a0
 else
-    set prompt_bang \n\ (set_color brred)\#\ 
+    set prompt_bang \n(set_color brred)\#\ 
     set git_sign g
 end
 
 set color_fg brwhite
-set color_git_branch 3c3c3c
+set color_git_branch brwhite
 set color_git yellow blue red purple
diff --git a/cli/.config/fish/functions/fish_prompt.fish b/cli/.config/fish/functions/fish_prompt.fish
index cf683ec..5d2dd5b 100644
--- a/cli/.config/fish/functions/fish_prompt.fish
+++ b/cli/.config/fish/functions/fish_prompt.fish
@@ -1,9 +1,11 @@
 function fish_prompt
     set -g prompt_string
     set -g prev_color
+    prompt.add white \[
     prompt.user
     prompt.add blue (prompt_pwd)
     prompt.git
+    prompt.add white \]
     prompt.add normal $prompt_bang
 
     echo $prompt_string
diff --git a/cli/.config/fish/functions/prompt.add.fish b/cli/.config/fish/functions/prompt.add.fish
index 5da49fa..13b324d 100644
--- a/cli/.config/fish/functions/prompt.add.fish
+++ b/cli/.config/fish/functions/prompt.add.fish
@@ -2,13 +2,14 @@ function prompt.add
     set -l color $argv[1]
     set -l text $argv[2]
     set -l sep ''
-    if test -n "$prompt_sep"
-        set sep (set_color $prev_color)$prompt_sep(set_color $color_fg)
-        set prev_color $color
-    end
-    if test -z "$prompt_string"
-        set prompt_string (set_color -b $color)(set_color $color_fg) $text
-    else
-        set -a prompt_string (set_color -b $color)$sep $text
-    end
+    set -a prompt_string (set_color $color)$text
+#   if test -n "$prompt_sep"
+#       set sep (set_color $prev_color)$prompt_sep(set_color $color_fg)
+#       set prev_color $color
+#   end
+#   if test -z "$prompt_string"
+#       set prompt_string (set_color -b $color)(set_color $color_fg) $text
+#   else
+#       set -a prompt_string (set_color -b $color)$sep $text
+#   end
 end
diff --git a/cli/.config/fish/functions/prompt.git.fish b/cli/.config/fish/functions/prompt.git.fish
index a457a89..1c4e5a3 100644
--- a/cli/.config/fish/functions/prompt.git.fish
+++ b/cli/.config/fish/functions/prompt.git.fish
@@ -1,6 +1,7 @@
 function prompt.git
     set -l is_git_tree (git rev-parse --is-inside-work-tree 2>/dev/null)
     string match -qe 'true' "$is_git_tree" || return
+    prompt.add white \]\[
     git status --porcelain -bu | while read line
         if string match -qr '^##' "$line"
             set git_branch (string match -r '[^# .]+' "$line")
diff --git a/cli/.config/fish/functions/prompt.user.fish b/cli/.config/fish/functions/prompt.user.fish
index 1bc2cc3..b2c87e7 100644
--- a/cli/.config/fish/functions/prompt.user.fish
+++ b/cli/.config/fish/functions/prompt.user.fish
@@ -1,5 +1,5 @@
 function prompt.user
     if test -n "$SSH_CONNECTION" || string match -qe root "$USER"
-        prompt.add black $USER@$hostname
+        prompt.add white $USER@$hostname
     end
 end
diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua
index cf705fc..2c9457c 100644
--- a/cli/.config/nvim/lua/plugins.lua
+++ b/cli/.config/nvim/lua/plugins.lua
@@ -25,18 +25,11 @@ end
 if require('packer_init').init(plugins) then return end
 
 --[[ plugins config ]]
-if os.getenv('TERM'):match('linux') then
-    lualine_section_separators = { left = nil, right = nil }
-    lualine_component_separators = { left = '|', right = '|' }
-else
-    lualine_section_separators = nil
-    lualine_component_separators = { left = '\u{2022}', right = '\u{2022}' }
-end
 require('lualine').setup{
     options = {
         icons_enabled = false,
-        section_separators = lualine_section_separators,
-        component_separators = lualine_component_separators
+        section_separators = { left = nil, right = nil },
+        component_separators = { left = '|', right = '|' }
     }
 }
 
diff --git a/cli/.tmux.conf b/cli/.tmux.conf
index 54e51dd..cf8cc6f 100644
--- a/cli/.tmux.conf
+++ b/cli/.tmux.conf
@@ -35,7 +35,7 @@ set -g message-style "bg=blue,fg=white"
 set -g message-command-style "bg=red,fg=white"
 set -g status on
 set -g status-style "fg=black,bg=white"
-set -g status-format[0] "#[fg=brightred,bg=black,italics] #h[#S] #[default]\ue0b0 #{W: #I:#W ,#[reverse] #I:#W #[noreverse]} #[align=right]\ue0b2#[reverse] %a %e %k:%M "
+set -g status-format[0] "#[fg=brightred,bg=black,italics] #h[#S] #[default] #{W: #I:#W ,#[reverse] #I:#W #[noreverse]} #[align=right]#[reverse] %a %e %k:%M "
 set -g status-interval 2
 set -g status-position "bottom"
 set -g status-justify "left"