Compare commits

..

No commits in common. "main" and "canary" have entirely different histories.
main ... canary

7 changed files with 84 additions and 150 deletions

3
.gitignore vendored
View File

@ -1,3 +0,0 @@
.neoconf.json
.stylua.toml
lazy-lock.json

View File

@ -1,7 +1,6 @@
require("hover").setup { require("hover").setup {
init = function() init = function()
require("hover.providers.lsp") require("hover.providers.lsp")
require('hover.providers.diagnostic')
end, end,
preview_opts = { preview_opts = {
border = 'single' border = 'single'

View File

@ -1,61 +0,0 @@
vim.o.foldcolumn = "auto:9"
vim.o.foldlevel = 99
vim.o.foldlevelstart = 99
vim.o.foldenable = true
vim.o.fillchars = [[eob: ,fold: ,foldopen:󰅀,foldsep:│,foldclose:󰅂]]
vim.keymap.set('n', 'zR', require('ufo').openAllFolds)
vim.keymap.set('n', 'zM', require('ufo').closeAllFolds)
local handler = function(virtText, lnum, endLnum, width, truncate)
local newVirtText = {}
local totalLines = vim.api.nvim_buf_line_count(0)
local foldedLines = endLnum - lnum
local suffix = ("  %d %d%%"):format(foldedLines, foldedLines / totalLines * 100)
local sufWidth = vim.fn.strdisplaywidth(suffix)
local targetWidth = width - sufWidth
local curWidth = 0
for _, chunk in ipairs(virtText) do
local chunkText = chunk[1]
local chunkWidth = vim.fn.strdisplaywidth(chunkText)
if targetWidth > curWidth + chunkWidth then
table.insert(newVirtText, chunk)
else
chunkText = truncate(chunkText, targetWidth - curWidth)
local hlGroup = chunk[2]
table.insert(newVirtText, { chunkText, hlGroup })
chunkWidth = vim.fn.strdisplaywidth(chunkText)
-- str width returned from truncate() may less than 2nd argument, need padding
if curWidth + chunkWidth < targetWidth then
suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
end
break
end
curWidth = curWidth + chunkWidth
end
local rAlignAppndx =
math.max(math.min(vim.opt.textwidth["_value"], width - 1) - curWidth - sufWidth, 0)
suffix = (" "):rep(rAlignAppndx) .. suffix
table.insert(newVirtText, { suffix, "MoreMsg" })
return newVirtText
end
require('ufo').setup({
fold_virt_text_handler = handler,
open_fold_hl_timeout = 400,
preview = {
win_config = {
border = { "", "", "", "", "", "", "", "" },
winblend = 0,
},
mappings = {
scrollU = "<C-u>",
scrollD = "<C-d>",
jumpTop = "[",
jumpBot = "]",
},
},
provider_selector = function(bufnr, filetype, buftype)
return { 'treesitter', 'indent' }
end
})

View File

@ -21,6 +21,7 @@ vim.g.rustaceanvim = {
}, },
cargo = { allFeatures = true }, cargo = { allFeatures = true },
checkOnSave = { checkOnSave = {
-- default: `cargo check`
command = "clippy", command = "clippy",
allFeatures = true allFeatures = true
}, },

View File

@ -1,5 +1,4 @@
local map = vim.keymap.set local map = vim.keymap.set
local bl_utils = require("config.utils.bufferline") local bl_utils = require("config.utils.bufferline")
local hover = require "hover" local hover = require "hover"

View File

@ -17,6 +17,9 @@ return {
{ {
"nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
}, },
{
"akinsho/toggleterm.nvim",
},
{ {
"windwp/nvim-autopairs", "windwp/nvim-autopairs",
}, },

View File

@ -15,9 +15,6 @@ return {
{ {
"savq/melange-nvim" "savq/melange-nvim"
}, },
{
'akinsho/toggleterm.nvim', version = "*", config = true
},
{ {
"mlaursen/vim-react-snippets", "mlaursen/vim-react-snippets",
lazy = true, lazy = true,
@ -50,5 +47,4 @@ return {
lazy = false, -- This plugin is already lazy lazy = false, -- This plugin is already lazy
ft = { "rust" }, ft = { "rust" },
}, },
} }