1 files changed, 14 insertions, 16 deletions

diff --git a/nvim/.config/nvim/plugin/statusline.vim b/nvim/.config/nvim/plugin/statusline.vim
index a25fb6d..3241fc2 100644
--- a/nvim/.config/nvim/plugin/statusline.vim
+++ b/nvim/.config/nvim/plugin/statusline.vim
@@ -25,17 +25,17 @@ let g:currentmode={
 
 hi PrimaryBlock       ctermfg=00    ctermbg=6
 hi SecondaryBlock     ctermfg=07    ctermbg=10
-hi Blanks             ctermfg=11    ctermbg=0
+hi Blanks             ctermfg=08    ctermbg=0
 
 hi User1             ctermfg=01    ctermbg=0
 hi User2             ctermfg=02    ctermbg=0
 hi User3             ctermfg=03    ctermbg=0
-hi User4             ctermfg=04    ctermbg=0
+hi User4             ctermfg=12    ctermbg=0
 hi User5             ctermfg=05    ctermbg=0
 hi User6             ctermfg=06    ctermbg=0
 hi User7             ctermfg=07    ctermbg=0
 hi User8             ctermfg=08    ctermbg=0
-hi User9             ctermfg=09    ctermbg=0
+hi User9             ctermfg=00    ctermbg=0
 
 highlight EndOfBuffer ctermfg=black ctermbg=black
 
@@ -45,7 +45,7 @@ endfunction
 
 function! StatuslineGit()
     let l:branchname = GitBranch()
-    return strlen(l:branchname) > 0?' '.l:branchname.'  ':''
+    return strlen(l:branchname) > 0?l:branchname.' ':''
 endfunction
 
 function! ReadOnly() abort
@@ -68,11 +68,11 @@ function! Filepath() abort
                 \ '' : substitute(l:basename . '/', '\C^' . $HOME, '~', '')
 
     if empty(l:prefix) && empty(l:filename)
-        return printf('%%8*%%f%%*%s %%m%%*', '%8*')
+        return printf('%%4*%%f%%*%s %%m%%*', '%4*')
     elseif empty(l:prefix)
-        return printf('%%8*%%f%%*%s %%m%%*', '%6*')
+        return printf('%%4*%%f%%*%s %%m%%*', '%6*')
     else
-        return printf('%%8*%s%%*%s%s%%*', l:prefix, &modified ? '%6*' : '%8*', l:filename)
+        return printf('%%4*%s%%*%s%s%%*', l:prefix, &modified ? '%6*' : '%4*', l:filename)
     endif
 endfunction
 
@@ -81,12 +81,12 @@ function! LinterStatus() abort
   if empty(info) | return '' | endif
   let msgs = []
   if get(info, 'error', 0)
-    call add(msgs, printf('%%5*%s×%%*', info['error']))
+    call add(msgs, printf('%%5*%s×%%* ', info['error']))
   endif
   if get(info, 'warning', 0)
-    call add(msgs, printf('%%3*%s!%%*', info['warning']))
+    call add(msgs, printf('%%3*%s!%%* ', info['warning']))
   endif
-  return join(msgs, ' ')
+  return join(msgs, '')
 endfunction
 
 function! StatusLine(mode) abort
@@ -100,6 +100,7 @@ function! StatusLine(mode) abort
 
   " active
   if a:mode ==# 'active'
+    let l:line.='%6*·%*' . ' '
     let l:line.='%7*%{StatuslineGit()}'
     let l:line.='%<'
     let l:line.=Filepath()
@@ -108,15 +109,13 @@ function! StatusLine(mode) abort
     let l:line.=' %{ReadOnly()} %w%*'
     let l:line.='%9* %=%*'
 
-    let l:line.='%7* %l,%c  %*'
-    let l:line.='%8* %{g:currentmode[mode()]}%*'
-    let l:line.=' '
+    let l:line.=' ' . '%7*%l,%c%*' . ' '
     let l:line.=LinterStatus()
-    let l:line.=' '
-    let l:line.='%8*'. &filetype
+    let l:line.='%4*'. &filetype
 
   else
     " inactive
+    let l:line.='%5*·%*' . ' '
     let l:line.='%#Blanks#'
     let l:line.='%f %5*%m%*'
     let l:line.='%#Blanks# %=%*'
@@ -133,4 +132,3 @@ augroup MyStatusLine
   autocmd WinEnter * setl statusline=%!StatusLine('active')
   autocmd WinLeave * setl statusline=%!StatusLine('inactive')
 augroup END
-