diff options
Diffstat (limited to 'pkgs/custom-neovim/config')
| -rw-r--r-- | pkgs/custom-neovim/config/lua/keymaps.lua | 5 | ||||
| -rw-r--r-- | pkgs/custom-neovim/config/lua/plugins/heirline.lua | 223 | ||||
| -rw-r--r-- | pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua | 2 |
3 files changed, 228 insertions, 2 deletions
diff --git a/pkgs/custom-neovim/config/lua/keymaps.lua b/pkgs/custom-neovim/config/lua/keymaps.lua index 95d120d..1057181 100644 --- a/pkgs/custom-neovim/config/lua/keymaps.lua +++ b/pkgs/custom-neovim/config/lua/keymaps.lua @@ -33,7 +33,10 @@ mapkey("n", "<leader>t", "Open terminal", ":botright terminal<cr>") mapkey({"n", "v"}, "<leader>d", "Really delete", [["_d]]) mapkey({"n", "v"}, "<leader>x", "Really delete character", [["_x]]) --- Visual Movement Keys. +-- Paste on newline +mapkey("n", "<leader>p", "Paste on newline", ":pu<cr>") + +-- Visual Movement Keys mapkey({"n", "v"}, "j", "Go down visually", "gj") mapkey({"n", "v"}, "k", "Go up visually", "gk") diff --git a/pkgs/custom-neovim/config/lua/plugins/heirline.lua b/pkgs/custom-neovim/config/lua/plugins/heirline.lua index e69de29..adb7c92 100644 --- a/pkgs/custom-neovim/config/lua/plugins/heirline.lua +++ b/pkgs/custom-neovim/config/lua/plugins/heirline.lua @@ -0,0 +1,223 @@ +return { + "heirline.nvim", + lazy = false, + after = function () + -- Extra stuff from heirline. + local conditions = require("heirline.conditions") + local utils = require("heirline.utils") + + local using_icons = true + + -- Define Colors + local colors = { + bright_bg = utils.get_highlight("Folded").bg, + bright_fg = utils.get_highlight("Folded").fg, + red = utils.get_highlight("DiagnosticError").fg, + dark_red = utils.get_highlight("DiffDelete").bg, + green = utils.get_highlight("String").fg, + blue = utils.get_highlight("Function").fg, + gray = utils.get_highlight("NonText").fg, + light_gray = utils.get_highlight("Visual").bg, + orange = utils.get_highlight("Constant").fg, + purple = utils.get_highlight("Statement").fg, + cyan = utils.get_highlight("Special").fg, + diag_warn = utils.get_highlight("DiagnosticWarn").fg, + diag_error = utils.get_highlight("DiagnosticError").fg, + diag_hint = utils.get_highlight("DiagnosticHint").fg, + diag_info = utils.get_highlight("DiagnosticInfo").fg, + git_del = utils.get_highlight("diffDeleted").fg, + git_add = utils.get_highlight("diffAdded").fg, + git_change = utils.get_highlight("diffChanged").fg, + } + + -- Define components table. + local components = {} + + -- Mode Component + components.mode = { + init = function (self) + self.mode = vim.fn.mode(1) + end, + static = { + mode_names = { -- change the strings if you like it vvvvverbose! + n = "N", + no = "N?", + nov = "N?", + noV = "N?", + ["no\22"] = "N?", + niI = "Ni", + niR = "Nr", + niV = "Nv", + nt = "Nt", + v = "V", + vs = "Vs", + V = "V_", + Vs = "Vs", + ["\22"] = "^V", + ["\22s"] = "^V", + s = "S", + S = "S_", + ["\19"] = "^S", + i = "I", + ic = "Ic", + ix = "Ix", + R = "R", + Rc = "Rc", + Rx = "Rx", + Rv = "Rv", + Rvc = "Rv", + Rvx = "Rv", + c = "C", + cv = "Ex", + r = "...", + rm = "M", + ["r?"] = "?", + ["!"] = "!", + t = "T", + }, + mode_colors = { + n = "red" , + i = "green", + v = "cyan", + V = "cyan", + ["\22"] = "cyan", + c = "orange", + s = "purple", + S = "purple", + ["\19"] = "purple", + R = "orange", + r = "orange", + ["!"] = "red", + t = "red", + }, + }, + provider = function (self) + return "%2("..self.mode_names[self.mode].."%)" + end, + hl = function(self) + local mode = self.mode:sub(1, 1) -- get only the first mode character + return { fg = self.mode_colors[mode], bold = true, } + end, + update = { + "ModeChanged", + pattern = "*:*", + callback = vim.schedule_wrap(function () + vim.cmd.redrawstatus() + end) + }, + } + + -- Location Component + components.location = { + -- %l = current line number + -- %L = number of lines in the buffer + -- %c = column number + -- %P = percentage through file of displayed window + provider = "%7(%l/%L%): %c", + } + + -- Progress component. + components.progress ={ + static = { + sbar = { '▁', '▂', '▃', '▄', '▅', '▆', '▇', '█' } + -- Another variant, because the more choice the better. + -- sbar = { '🭶', '🭷', '🭸', '🭹', '🭺', '🭻' } + }, + provider = function(self) + local curr_line = vim.api.nvim_win_get_cursor(0)[1] + local lines = vim.api.nvim_buf_line_count(0) + local i = math.floor((curr_line - 1) / lines * #self.sbar) + 1 + return string.rep(self.sbar[i], 2) + end, + hl = { fg = "blue", bg = "light_gray" }, + } + + -- Diagnostics component + vim.diagnostic.config({ + signs = { + text = { + [vim.diagnostic.severity.ERROR] = using_icons and ' ' or "E", + [vim.diagnostic.severity.WARN] = using_icons and ' ' or "W", + [vim.diagnostic.severity.INFO] = using_icons and ' ' or "I", + [vim.diagnostic.severity.HINT] = using_icons and ' ' or "H", + }, + }, + }) + + components.diagnostics = { + condition = conditions.has_diagnostics, + -- Example of defining custom LSP diagnostic icons, you can copypaste in your config: + -- Fetching custom diagnostic icons + error_icon = vim.diagnostic.config()['signs']['text'][vim.diagnostic.severity.ERROR] or "", + warn_icon = vim.diagnostic.config()['signs']['text'][vim.diagnostic.severity.WARN] or "", + info_icon = vim.diagnostic.config()['signs']['text'][vim.diagnostic.severity.INFO] or "", + hint_icon = vim.diagnostic.config()['signs']['text'][vim.diagnostic.severity.HINT] or "", + + init = function(self) + self.errors = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.ERROR }) + self.warnings = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.WARN }) + self.hints = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.HINT }) + self.info = #vim.diagnostic.get(0, { severity = vim.diagnostic.severity.INFO }) + end, + + update = { "DiagnosticChanged", "BufEnter" }, + + { + provider = "![", + }, + { + provider = function(self) + -- 0 is just another output, we can decide to print it or not! + return self.errors > 0 and (self.error_icon .. self.errors .. " ") + end, + hl = { fg = "diag_error" }, + }, + { + provider = function(self) + return self.warnings > 0 and (self.warn_icon .. self.warnings .. " ") + end, + hl = { fg = "diag_warn" }, + }, + { + provider = function(self) + return self.info > 0 and (self.info_icon .. self.info .. " ") + end, + hl = { fg = "diag_info" }, + }, + { + provider = function(self) + return self.hints > 0 and (self.hint_icon .. self.hints) + end, + hl = { fg = "diag_hint" }, + }, + { + provider = "]", + }, + } + + -- Spacers + local space = {provider = " "} + local dynamic_space = {provider = "%="} + + -- Assemble statusline. + local statusline = { + components.mode, + space, + components.diagnostics, + + dynamic_space, + + components.location, + space, + components.progress, + } + + -- Setup heirline. + require("heirline").setup { + opts = { + colors = colors, + }, + statusline = statusline, + } + end +} diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua b/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua index f6bfc80..1edd711 100644 --- a/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua +++ b/pkgs/custom-neovim/config/lua/plugins/mini-statusline.lua @@ -1,6 +1,6 @@ return { "mini.statusline", - -- enabled = false, + enabled = false, lazy = false, after = function() MiniStatusline = require("mini.statusline") |