dotfiles

commit 0d9fbf28908460d2923997eb2303aac0965072b1
parent c0aa1e7e8a5cc5e801a8de3721e42ad38e8d4c49
Author: tongong <tongong@gmx.net>
Date:   Sun, 31 Oct 2021 21:42:32 +0100

[nvim] improved statusline

Diffstat:
M
config/nvim/init.vim
 | 
1
-
M
config/nvim/lua/statusline.lua
 | 
75
+++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------

2 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
@@ -69,7 +69,6 @@ call plug#end()
 colorscheme dim
 
 " statusline
-" TODO add git diff to statusline
 lua require("statusline")
 
 " spell check toggle
diff --git a/config/nvim/lua/statusline.lua b/config/nvim/lua/statusline.lua
@@ -7,16 +7,24 @@ local c_highlight  = 3 -- yellow
 local c_grey_light = 8
 local c_grey_dark  = 237
 local c_white      = 15
+-- for git diff counts
+local c_green      = 2
+local c_yellow     = 3
+local c_red        = 1
 
 local function highlight(group, fg, bg)
-    vim.cmd("highlight " .. group .. " ctermfg=" .. fg .. " ctermbg=" .. bg)
+    vim.cmd("highlight " .. group .. " ctermfg=" .. fg .. " ctermbg=" .. bg
+        .. " cterm=bold")
 end
 function status_line_highlights()
-    vim.cmd("highlight StatusLine cterm=None ctermfg=15 ctermbg=None")
+    vim.cmd("highlight StatusLine cterm=bold ctermfg=15 ctermbg=None")
     highlight("StatusHighlight", c_grey_dark, c_highlight)
     highlight("StatusLight",     c_white,     c_grey_light)
     highlight("StatusDark",      c_highlight, c_grey_dark)
     highlight("StatusNone",      "None",      "None")
+    highlight("StatusGitAdd",    c_green,     c_grey_light)
+    highlight("StatusGitChange", c_yellow,    c_grey_light)
+    highlight("StatusGitRemove", c_red,       c_grey_light)
 end
 
 local function get_mode()
@@ -37,36 +45,59 @@ local function get_mode()
     end
 end
 
+local function git_counts()
+    local summary = vim.api.nvim_call_function("GitGutterGetHunkSummary", {})
+    if summary[1] + summary[2] + summary[3] == 0 then
+        return ""
+    else
+        return "%#StatusGitAdd#"
+            .. " +" .. summary[1]
+            .. "%#StatusGitChange#"
+            .. " ~" .. summary[2]
+            .. "%#StatusGitRemove#"
+            .. " -" .. summary[3] .. " "
+    end
+end
+
+-- warn me about evil non-unix files
+local function fileformat()
+    local ff = vim.bo.fileformat
+    if ff ~= "unix" then
+        return "%#StatusHighlight# " .. string.upper(ff) .. " "
+            .. "%#StatusNone# "
+    else
+        return ""
+    end
+end
+
 function status_line(active)
     local active_highlight = "%#StatusHighlight#"
     if active == 0 then
         active_highlight = "%#StatusDark#"
     end
-    return table.concat {
-        active_highlight,
-        " ", get_mode(), " ",
-        "%#StatusLight#",
-        " %f ",
-        "%#StatusNone#",
-        "%=",
-        "%#StatusLight#",
-        " %p%% ",
-        active_highlight,
-        " %l:%c "
-    }
+    return active_highlight
+        .. " " .. get_mode() .. " "
+        .. "%#StatusLight#"
+        .. " %f "
+        .. "%#StatusNone#"
+        .. "%="
+        .. fileformat()
+        .. git_counts()
+        .. active_highlight
+        .. " %l:%c "
 end
 
 status_line_highlights()
 vim.o.statusline = "%!v:lua.status_line(0)"
 
 vim.api.nvim_exec([[
-  augroup Statusline
-  au!
-  au WinEnter,BufEnter * setlocal statusline=%!v:lua.status_line(1)
-  au WinLeave,BufLeave * setlocal statusline=%!v:lua.status_line(0)
+    augroup Statusline
+    au!
+    au WinEnter,BufEnter * setlocal statusline=%!v:lua.status_line(1)
+    au WinLeave,BufLeave * setlocal statusline=%!v:lua.status_line(0)
 
-  au FocusGained * setlocal statusline=%!v:lua.status_line(1)
-  au FocusLost   * setlocal statusline=%!v:lua.status_line(0)
-  au User GoyoLeave nested lua status_line_highlights()
-  augroup END
+    au FocusGained * setlocal statusline=%!v:lua.status_line(1)
+    au FocusLost   * setlocal statusline=%!v:lua.status_line(0)
+    au User GoyoLeave nested lua status_line_highlights()
+    augroup END
 ]], false)