Compare commits

..

No commits in common. "b97d011b55b62bea646d3cdd4cb600e3e1079b0d" and "4a47c79be242872a3b8071a6b98e6210d8c63b66" have entirely different histories.

5 changed files with 142 additions and 190 deletions

View File

@ -0,0 +1,21 @@
-- Author : swytch
-- Created : Sunday Jan. 29, 2023 00:20:31 CET
-- License : GPLv3
-- Description : Mini.comment plugin config file
return {
"echasnovski/mini.comment",
version = "*",
opts = {
mappings = {
comment = "<leader>c",
comment_line = "<leader><Space>",
text_object = "gc",
},
},
config = function(_, opts)
require("mini.comment").setup(opts)
end,
}

View File

@ -1,44 +0,0 @@
-- Author : swytch
-- Created : Sunday Jan. 29, 2023 00:20:31 CET
-- License : GPLv3
-- Description : Mini.comment plugin config file
return {
{
"echasnovski/mini.comment",
version = "*",
opts = {
mappings = {
comment = "<leader>c",
comment_line = "<leader><Space>",
text_object = "gc",
},
},
config = function(_, opts)
require("mini.comment").setup(opts)
end
},
{
"echasnovski/mini.pairs",
version = "*",
config = function() require("mini.pairs").setup() end,
},
{
"echasnovski/mini.indentscope",
version = "*",
opts = function()
local plugin = require("mini.indentscope")
return {
draw = {
animation = plugin.gen_animation.none()
}
}
end,
config = function(_, opts)
require("mini.indentscope").setup(opts)
end,
}
}

View File

@ -9,7 +9,7 @@ _G.lsp_root_dir = vim.fn.stdpath("data") .. "/mason/bin"
local servers = { local servers = {
"clangd", "clangd",
"rust_analyzer", "rust_analyzer",
"lua_ls", "sumneko_lua",
"texlab", "texlab",
} }

View File

@ -98,29 +98,6 @@ local function get_mode_color(m)
return color[m] return color[m]
end end
-- from https://github.com/nvim-lualine/lualine.nvim/blob/master/lua/lualine/components/filename.lua
local function shorten_path(path, max_len)
local sep = '/'
local len = #path
if len <= max_len then
return path
end
local segments = vim.split(path, sep)
for idx = 1, #segments - 1 do
if len <= max_len then
break
end
local segment = segments[idx]
local shortened = segment:sub(1, vim.startswith(segment, '.') and 2 or 1)
segments[idx] = shortened
len = len - (#segment - #shortened)
end
return table.concat(segments, sep)
end
-- from https://github.com/nvim-lua/lsp-status.nvim/blob/master/lua/lsp-status/diagnostics.lua -- from https://github.com/nvim-lua/lsp-status.nvim/blob/master/lua/lsp-status/diagnostics.lua
local function get_lsp_diagnostics() local function get_lsp_diagnostics()
local result = {} local result = {}
@ -161,16 +138,14 @@ local function spell_check()
end end
local function statusline_focused() local function statusline_focused()
local file = vim.fn.expand("%:p:~")
local diagnostics = get_lsp_diagnostics() local diagnostics = get_lsp_diagnostics()
local mode = vim.fn.mode() local mode = vim.fn.mode()
local mg = get_mode(mode) local mg = get_mode(mode)
local accent_color = get_mode_color(mg) local accent_color = get_mode_color(mg)
local winwidth = vim.fn.winwidth(0)
local left = table.concat { local left = table.concat {
gen_section(accent_color, {get_mode_display_name(mg)}), gen_section(accent_color, {get_mode_display_name(mg)}),
gen_section("%#Middle#", { shorten_path(file, winwidth / 3) }), gen_section("%#Middle#", {"%f"}),
gen_section("%#Bottom#", {"%m", "%r"}), gen_section("%#Bottom#", {"%m", "%r"}),
gen_section( gen_section(
"%#Alert#", "%#Alert#",