aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins.lua2
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua27
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua216
-rw-r--r--nvim/.config/nvim/lua/tobyvin/plugins/nvim-navic.lua9
-rw-r--r--nvim/.config/nvim/lua/tobyvin/utils.lua18
-rw-r--r--nvim/.config/nvim/lua/tobyvin/utils/diagnostic.lua8
6 files changed, 121 insertions, 159 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua
index e161de8..5bfea55 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua
@@ -327,7 +327,7 @@ M.plugins = function(use)
"SmiteshP/nvim-navic",
requires = "onsails/lspkind-nvim",
config = function()
- require("tobyvin.plugins.lualine").setup()
+ require("tobyvin.plugins.nvim-navic").setup()
end,
})
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua b/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
index 604ec46..efaa628 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
@@ -14,18 +14,39 @@ end
M.toggle_blameline = function()
require("gitsigns").toggle_current_line_blame()
end
+M.next_hunk = function()
+ local gitsigns = package.loaded.gitsigns
+ if vim.wo.diff then
+ return "]c"
+ end
+ vim.schedule(function()
+ gitsigns.next_hunk()
+ end)
+ return "<Ignore>"
+end
+
+M.prev_hunk = function()
+ local gitsigns = package.loaded.gitsigns
+ if vim.wo.diff then
+ return "[c"
+ end
+ vim.schedule(function()
+ gitsigns.prev_hunk()
+ end)
+ return "<Ignore>"
+end
M.on_attach = function(bufnr)
local gitsigns = package.loaded.gitsigns
utils.keymap.group("n", "<leader>g", { desc = "Git", buffer = bufnr })
+ vim.keymap.set("n", "]c", M.next_hunk, { expr = true, desc = "Next hunk", buffer = bufnr })
+ vim.keymap.set("n", "[c", M.prev_hunk, { expr = true, desc = "Previous hunk", buffer = bufnr })
+
vim.keymap.set("n", "<leader>gb", gitsigns.blame_line, { desc = "Show blame", buffer = bufnr })
vim.keymap.set("n", "<leader>gB", M.show_blameline, { desc = "Show blame", buffer = bufnr })
vim.keymap.set("n", "<leader>g<C-b>", M.toggle_blameline, { desc = "Toggle blame", buffer = bufnr })
- vim.keymap.set("n", "<leader>gj", gitsigns.next_hunk, { desc = "Next Hunk", buffer = bufnr })
- vim.keymap.set("n", "<leader>gk", gitsigns.prev_hunk, { desc = "Prev Hunk", buffer = bufnr })
-
vim.keymap.set("n", "<leader>gp", gitsigns.preview_hunk, { desc = "Preview Hunk", buffer = bufnr })
vim.keymap.set("n", "<leader>gr", gitsigns.reset_hunk, { desc = "Reset Hunk", buffer = bufnr })
vim.keymap.set("n", "<leader>gs", gitsigns.stage_hunk, { desc = "Stage Hunk", buffer = bufnr })
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua b/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua
index 06e6701..70e0eb7 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua
@@ -9,100 +9,70 @@ M.to_char = function(str)
return str:sub(1, 1)
end
-M.diff_source = function()
- local gitsigns = vim.b.gitsigns_status_dict
- if gitsigns then
- return {
- added = gitsigns.added,
- modified = gitsigns.changed,
- removed = gitsigns.removed,
- }
- end
-end
-
M.setup = function()
local status_ok, lualine = pcall(require, "lualine")
if not status_ok then
return
end
- local navic_ok, navic = pcall(require, "nvim-navic")
- local auto_session_ok, auto_session_library = pcall(require, "auto-session-library")
-
- local modules = require("lualine_require").lazy_require({
- highlight = "lualine.highlight",
- utils = "lualine.utils.utils",
- })
+ local diff = {
+ "diff",
+ source = function()
+ local gitsigns = vim.b.gitsigns_status_dict
+ if gitsigns then
+ return {
+ added = gitsigns.added,
+ modified = gitsigns.changed,
+ removed = gitsigns.removed,
+ }
+ end
+ end,
+ padding = { left = 0, right = 1 },
+ }
- local buffer = require("lualine.components.buffers.buffer")
- ---returns rendered buffer
- ---@return string
- function buffer:render()
- local name = self:name()
- if self.options.fmt then
- name = self.options.fmt(name or "", self.bufnr)
- end
-
- if self.ellipse then -- show ellipsis
- name = "..."
- else
- name = self:apply_mode(name)
- end
- name = buffer.apply_padding(name, self.options.padding)
- self.len = vim.fn.strchars(name)
-
- -- setup for mouse clicks
- local line = self:configure_mouse_click(name)
- -- apply highlight
- line = modules.highlight.component_format_highlight(self.highlights[(self.current and "active" or "inactive")])
- .. line
+ local diagnostics = {
+ "diagnostics",
+ sources = { utils.diagnostic.count },
+ symbols = {
+ error = utils.diagnostic.signs.error.text,
+ warn = utils.diagnostic.signs.warn.text,
+ info = utils.diagnostic.signs.info.text,
+ hint = utils.diagnostic.signs.hint.text,
+ },
+ update_in_insert = true,
- -- apply separators
- if self.options.self.section < "x" and not self.first then
- local sep_before = self:separator_before()
- line = sep_before .. line
- self.len = self.len + vim.fn.strchars(sep_before)
- elseif self.options.self.section >= "x" and not self.last then
- local sep_after = self:separator_after()
- line = line .. sep_after
- self.len = self.len + vim.fn.strchars(sep_after)
- end
- return line
- end
+ padding = { left = 0, right = 1 },
+ }
- local tab = require("lualine.components.tabs.tab")
+ local workspace = {
+ { "b:gitsigns_head", icon = "" },
+ diff,
+ diagnostics,
+ }
- ---returns name for tab. Tabs name is the name of buffer in last active window
- --- of the tab.
- ---@return string
- function tab:label()
- local ok, custom_tabname = pcall(vim.api.nvim_tabpage_get_var, self.tabId, "tabname")
- if not ok then
- custom_tabname = nil
- end
- if custom_tabname and custom_tabname ~= "" then
- return modules.utils.stl_escape(custom_tabname)
- elseif self.options.mode == 1 then
- return tostring(self.tabnr)
- end
- local buflist = vim.fn.tabpagebuflist(self.tabnr)
- local winnr = vim.fn.tabpagewinnr(self.tabnr)
- local bufnr = buflist[winnr]
- local file = modules.utils.stl_escape(vim.api.nvim_buf_get_name(bufnr))
- local buftype = vim.fn.getbufvar(bufnr, "&buftype")
- if buftype == "help" then
- return "help:" .. vim.fn.fnamemodify(file, ":t:r")
- elseif buftype == "terminal" then
- ---@diagnostic disable-next-line: missing-parameter
- local match = string.match(vim.split(file, " ")[1], "term:.*:(%a+)")
- return match ~= nil and match or vim.fn.fnamemodify(vim.env.SHELL, ":t")
- elseif vim.fn.isdirectory(file) == 1 then
- return vim.fn.fnamemodify(file, ":p:.")
- elseif file == "" then
- return "[No Name]"
- end
- return vim.fn.fnamemodify(file, ":t")
- end
+ local buffer = {
+ {
+ "filetype",
+ colored = false,
+ icon_only = true,
+ padding = { left = 1, right = 0 },
+ },
+ "filename",
+ vim.tbl_extend("force", diagnostics, { source = { utils.diagnostic.buf_count }, colored = false }),
+ {
+ require("nvim-navic").get_location,
+ color = { bg = "" },
+ },
+ {
+ "string.format(' ')",
+ color = { bg = "" },
+ },
+ }
+ local filetypes = vim.fn.getcompletion("", "filetype")
+ local disabled = vim.tbl_filter(function(ft)
+ return string.match(ft, "^Neogit.*") ~= nil
+ end, filetypes)
+ table.insert(disabled, "gitcommit")
lualine.setup({
options = {
@@ -111,57 +81,21 @@ M.setup = function()
},
component_separators = "",
section_separators = "",
+ disabled_filetypes = {
+ "netrw",
+ "alpha",
+ "",
+ winbar = disabled,
+ },
},
+
sections = {
lualine_a = { { "mode", fmt = M.to_char } },
- lualine_b = {
- "branch",
- {
- "diff",
- source = M.diff_source,
- padding = { left = 0, right = 1 },
- },
- {
- "diagnostics",
- sources = { utils.diagnostic.count },
- symbols = {
- error = utils.diagnostic.signs.error.text,
- warn = utils.diagnostic.signs.warn.text,
- info = utils.diagnostic.signs.info.text,
- hint = utils.diagnostic.signs.hint.text,
- },
- update_in_insert = false,
- padding = { left = 0, right = 1 },
- },
- },
+ lualine_b = workspace,
lualine_c = {
{
"filename",
path = 1,
- shorting_target = 100,
- },
- {
- "diagnostics",
- sources = {
- function()
- return utils.diagnostic.count(0)
- end,
- },
- symbols = {
- error = utils.diagnostic.signs.error.text,
- warn = utils.diagnostic.signs.warn.text,
- info = utils.diagnostic.signs.info.text,
- hint = utils.diagnostic.signs.hint.text,
- },
- update_in_insert = false,
- padding = { left = 0, right = 1 },
- separator = ">",
- },
- {
- navic.get_location,
- cond = function()
- return navic_ok and navic.is_available()
- end,
},
},
lualine_x = {
@@ -170,6 +104,7 @@ M.setup = function()
"filetype",
},
},
+
inactive_sections = {
lualine_c = { "filename" },
lualine_x = {
@@ -177,17 +112,16 @@ M.setup = function()
"location",
},
},
+
+ winbar = {
+ lualine_c = buffer,
+ },
+
tabline = {
- lualine_b = {
- {
- "buffers",
- fmt = function(name, bufnr)
- return string.format("%s %s", name, utils.diagnostic.indicator(bufnr))
- end,
- },
- },
- lualine_y = { { "tabs", mode = 1 } },
+ lualine_b = { "buffers" },
+ lualine_y = { "tabs" },
},
+
extensions = {
"quickfix",
"man",
@@ -197,14 +131,6 @@ M.setup = function()
"toggleterm",
{
sections = {
- lualine_b = {
- {
- auto_session_library.current_session_name,
- cond = function()
- return auto_session_ok
- end,
- },
- },
lualine_c = {
get_short_cwd,
},
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/nvim-navic.lua b/nvim/.config/nvim/lua/tobyvin/plugins/nvim-navic.lua
index b6040e4..720d79e 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/nvim-navic.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/nvim-navic.lua
@@ -7,12 +7,17 @@ M.setup = function()
return
end
+ local icons = require("lspkind").symbol_map
+ for i, _ in pairs(icons) do
+ icons[i] = icons[i] .. " "
+ end
+
nvim_navic.setup({
- icons = require("lspkind").symbol_map,
+ icons = icons,
})
vim.api.nvim_create_autocmd("LspAttach", {
- group = vim.api.nvim_create_augroup("tobyvin_nvim-navic", { clear = true }),
+ group = vim.api.nvim_create_augroup("tobyvin_nvim-navic", { clear = true }),
desc = "setup nvim-navic",
callback = function(args)
local bufnr = args.buf
diff --git a/nvim/.config/nvim/lua/tobyvin/utils.lua b/nvim/.config/nvim/lua/tobyvin/utils.lua
index 8aab6f4..316cbae 100644
--- a/nvim/.config/nvim/lua/tobyvin/utils.lua
+++ b/nvim/.config/nvim/lua/tobyvin/utils.lua
@@ -1,10 +1,12 @@
-local M = {}
-
-setmetatable(M, {
- __index = function(_, k)
- local _, result = pcall(require, string.format("tobyvin.utils.%s", k))
- return result
- end,
-})
+local M = {
+ buffer = require("tobyvin.utils.buffer"),
+ debug = require("tobyvin.utils.debug"),
+ diagnostic = require("tobyvin.utils.diagnostic"),
+ documentation = require("tobyvin.utils.documentation"),
+ fs = require("tobyvin.utils.fs"),
+ job = require("tobyvin.utils.job"),
+ keymap = require("tobyvin.utils.keymap"),
+ status = require("tobyvin.utils.status"),
+}
return M
diff --git a/nvim/.config/nvim/lua/tobyvin/utils/diagnostic.lua b/nvim/.config/nvim/lua/tobyvin/utils/diagnostic.lua
index d4900ed..6b90c64 100644
--- a/nvim/.config/nvim/lua/tobyvin/utils/diagnostic.lua
+++ b/nvim/.config/nvim/lua/tobyvin/utils/diagnostic.lua
@@ -45,4 +45,12 @@ M.indicator = function(bufnr)
return table.concat(tbl, " ")
end
+M.buf_count = function(bufnr)
+ return M.count(vim.F.if_nil(bufnr, vim.fn.bufnr()))
+end
+
+M.buf_indicator = function(bufnr)
+ return M.indicator(vim.F.if_nil(bufnr, vim.fn.bufnr()))
+end
+
return M
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-21 07:31:33 +0000