From 1ad10fb4dfafcd7dd189a25ca69f6961985484d2 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Wed, 10 Mar 2021 21:13:58 +0100 Subject: Updates to color scheme, fzf sourcing, vim pydocstring --- .config/nvim/lua/statusline.lua | 136 ++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 76 deletions(-) (limited to '.config/nvim/lua') diff --git a/.config/nvim/lua/statusline.lua b/.config/nvim/lua/statusline.lua index 5e88ec0..a745a8e 100644 --- a/.config/nvim/lua/statusline.lua +++ b/.config/nvim/lua/statusline.lua @@ -4,38 +4,22 @@ local gl = require("galaxyline") local section = gl.section gl.short_line_list = {"LuaTree", "packager", "Floaterm", "coc-eplorer"} -local one_dark_colors = { - bg = "#2e3440", - fg = "#81a1c1", - line_bg = "#2e3440", - fg_green = "#6d96a5", - yellow = "#fabd2f", - cyan = "#008080", - darkblue = "#081633", - green = "#608B4E", - orange = "#FF8800", - purple = "#5d4d7a", - magenta = "#d16d9e", - grey = "#c0c0c0", - blue = "#569CD6", - red = "#D16969" -} -local nord_colors = { - bg = "#2E3440", - fg = "#81A1C1", - line_bg = "#2E3440", - fg_green = "#8FBCBB", - yellow = "#EBCB8B", - cyan = "#A3BE8C", - darkblue = "#81A1C1", - green = "#8FBCBB", +local colors = { + bg = "#0A0A0A", + fg = "#d0d0d0", + line_bg = "#0A0A0A", + fg_green = "#90a959", + yellow = "#f4bf75", + cyan = "#75b5aa", + darkblue = "#6a9fb5", + green = "#90a959", orange = "#D08770", purple = "#B48EAD", - magenta = "#BF616A", - gray = "#616E88", - blue = "#5E81AC", - red = "#BF616A" + magenta = "#aa759f", + gray = "#505050", + blue = "#6a9fb5", + red = "#ac4142" } local buffer_not_empty = function() @@ -51,7 +35,7 @@ section.left[1] = { provider = function() return " " end, - highlight = {nord_colors.blue, nord_colors.line_bg} + highlight = {colors.blue, colors.line_bg} } } section.left[2] = { @@ -59,38 +43,38 @@ section.left[2] = { provider = function() -- auto change color according the vim mode local mode_color = { - n = nord_colors.magenta, - i = nord_colors.green, - v = nord_colors.blue, - [""] = nord_colors.blue, - V = nord_colors.blue, - c = nord_colors.red, - no = nord_colors.magenta, - s = nord_colors.orange, - S = nord_colors.orange, - [""] = nord_colors.orange, - ic = nord_colors.yellow, - R = nord_colors.purple, - Rv = nord_colors.purple, - cv = nord_colors.red, - ce = nord_colors.red, - r = nord_colors.cyan, - rm = nord_colors.cyan, - ["r?"] = nord_colors.cyan, - ["!"] = nord_colors.red, - t = nord_colors.red + n = colors.magenta, + i = colors.green, + v = colors.blue, + [""] = colors.blue, + V = colors.blue, + c = colors.red, + no = colors.magenta, + s = colors.orange, + S = colors.orange, + [""] = colors.orange, + ic = colors.yellow, + R = colors.purple, + Rv = colors.purple, + cv = colors.red, + ce = colors.red, + r = colors.cyan, + rm = colors.cyan, + ["r?"] = colors.cyan, + ["!"] = colors.red, + t = colors.red } cmd("hi GalaxyViMode guifg=" .. mode_color[fn.mode()]) return "  " end, - highlight = {nord_colors.red, nord_colors.line_bg, "bold"} + highlight = {colors.red, colors.line_bg, "bold"} } } section.left[3] = { FileIcon = { provider = "FileIcon", condition = buffer_not_empty, - highlight = {require("galaxyline.provider_fileinfo").get_file_icon_color, nord_colors.line_bg} + highlight = {require("galaxyline.provider_fileinfo").get_file_icon_color, colors.line_bg} } } section.left[4] = { @@ -101,8 +85,8 @@ section.left[4] = { end, condition = buffer_not_empty, separator = " ", - separator_highlight = {nord_colors.purple, nord_colors.bg}, - highlight = {nord_colors.purple, nord_colors.line_bg, "bold"} + separator_highlight = {colors.purple, colors.bg}, + highlight = {colors.purple, colors.line_bg, "bold"} } } @@ -112,7 +96,7 @@ section.right[1] = { return " " end, condition = require("galaxyline.provider_vcs").check_git_workspace, - highlight = {nord_colors.orange, nord_colors.line_bg} + highlight = {colors.orange, colors.line_bg} } } section.right[2] = { @@ -120,8 +104,8 @@ section.right[2] = { provider = "GitBranch", condition = require("galaxyline.provider_vcs").check_git_workspace, separator = "", - separator_highlight = {nord_colors.purple, nord_colors.bg}, - highlight = {nord_colors.orange, nord_colors.line_bg, "bold"} + separator_highlight = {colors.purple, colors.bg}, + highlight = {colors.orange, colors.line_bg, "bold"} } } @@ -138,7 +122,7 @@ section.right[3] = { provider = "DiffAdd", condition = checkwidth, icon = " ", - highlight = {nord_colors.green, nord_colors.line_bg} + highlight = {colors.green, colors.line_bg} } } section.right[4] = { @@ -146,7 +130,7 @@ section.right[4] = { provider = "DiffModified", condition = checkwidth, icon = "柳", - highlight = {nord_colors.yellow, nord_colors.line_bg} + highlight = {colors.yellow, colors.line_bg} } } section.right[5] = { @@ -154,7 +138,7 @@ section.right[5] = { provider = "DiffRemove", condition = checkwidth, icon = " ", - highlight = {nord_colors.red, nord_colors.line_bg} + highlight = {colors.red, colors.line_bg} } } @@ -162,8 +146,8 @@ section.right[6] = { LineInfo = { provider = "LineColumn", separator = "", - separator_highlight = {nord_colors.blue, nord_colors.line_bg}, - highlight = {nord_colors.gray, nord_colors.line_bg} + separator_highlight = {colors.blue, colors.line_bg}, + highlight = {colors.gray, colors.line_bg} } } -- section.right[7] = { @@ -171,8 +155,8 @@ section.right[6] = { -- provider = "FileSize", -- separator = " ", -- condition = buffer_not_empty, --- separator_highlight = {nord_colors.blue, nord_colors.line_bg}, --- highlight = {nord_colors.fg, nord_colors.line_bg} +-- separator_highlight = {colors.blue, colors.line_bg}, +-- highlight = {colors.fg, colors.line_bg} -- } -- } @@ -181,8 +165,8 @@ section.right[8] = { provider = "DiagnosticError", separator = " ", icon = " ", - highlight = {nord_colors.red, nord_colors.line_bg}, - separator_highlight = {nord_colors.bg, nord_colors.bg} + highlight = {colors.red, colors.line_bg}, + separator_highlight = {colors.bg, colors.bg} } } section.right[9] = { @@ -190,8 +174,8 @@ section.right[9] = { provider = "DiagnosticWarn", -- separator = " ", icon = " ", - highlight = {nord_colors.yellow, nord_colors.line_bg}, - separator_highlight = {nord_colors.bg, nord_colors.bg} + highlight = {colors.yellow, colors.line_bg}, + separator_highlight = {colors.bg, colors.bg} } } @@ -200,8 +184,8 @@ section.right[10] = { -- separator = " ", provider = "DiagnosticInfo", icon = " ", - highlight = {nord_colors.green, nord_colors.line_bg}, - separator_highlight = {nord_colors.bg, nord_colors.bg} + highlight = {colors.green, colors.line_bg}, + separator_highlight = {colors.bg, colors.bg} } } @@ -210,8 +194,8 @@ section.right[11] = { provider = "DiagnosticHint", -- separator = " ", icon = " ", - highlight = {nord_colors.blue, nord_colors.line_bg}, - separator_highlight = {nord_colors.bg, nord_colors.bg} + highlight = {colors.blue, colors.line_bg}, + separator_highlight = {colors.bg, colors.bg} } } @@ -219,8 +203,8 @@ section.short_line_left[1] = { BufferType = { provider = 'FileTypeName', separator = ' ', - separator_highlight = {'NONE',nord_colors.bg}, - highlight = {nord_colors.blue,nord_colors.bg,'bold'} + separator_highlight = {'NONE',colors.bg}, + highlight = {colors.blue,colors.bg,'bold'} } } @@ -237,13 +221,13 @@ section.short_line_left[2] = { return fname end, condition = buffer_not_empty, - highlight = {nord_colors.white,nord_colors.bg,'bold'} + highlight = {colors.white,colors.bg,'bold'} } } section.short_line_right[1] = { BufferIcon = { provider= 'BufferIcon', - highlight = {nord_colors.fg,nord_colors.bg} + highlight = {colors.fg,colors.bg} } } -- cgit v1.2.3-70-g09d2