chore: restructure repo
This commit is contained in:
parent
e27b322c8a
commit
e47f0bb403
SSH key fingerprint:
SHA256:WcjW5NJPQ8Dx4uQDmoIlVPLWE27Od3fxoe0IUvuoPHE
27 changed files with 593 additions and 752 deletions
|
|
@ -1,19 +0,0 @@
|
|||
## Telescope @custom:
|
||||
Search, Preview and Open file | <leader>ff
|
||||
Live grep of all files in current directory| <leader>fg
|
||||
|
||||
## Formatter @custom:
|
||||
Format current buffer | <leader>f
|
||||
Format and write current buffer | <leader>F
|
||||
|
||||
## NERDCommenter @custom:
|
||||
Toggles the comment state of the selected line(s) | [count]<leader>c<space>
|
||||
Comment out the current line or text selected in visual mode | [count]<leader>cc
|
||||
Toggles the comment state of the selected line(s) individually | [count]<leader>ci
|
||||
|
||||
## cheatsheet @custom:
|
||||
Shows a searchable list of all keybindings | <leader>?
|
||||
|
||||
## Term @custom
|
||||
Opens a normal interactive terminal | <c-c>
|
||||
Opens lazygit | <leader>g
|
||||
76
init.lua
76
init.lua
|
|
@ -1,75 +1 @@
|
|||
vim.o.showmatch = true
|
||||
|
||||
vim.wo.number = true
|
||||
vim.wo.relativenumber = true
|
||||
|
||||
vim.o.mouse = "a"
|
||||
|
||||
vim.o.ignorecase = true
|
||||
vim.o.smartcase = true
|
||||
vim.o.expandtab = true
|
||||
vim.o.shiftwidth = 4
|
||||
vim.o.tabstop = 4
|
||||
vim.o.cursorline = true
|
||||
|
||||
-- Enable auto-indentation
|
||||
vim.o.autoindent = true
|
||||
|
||||
-- Highlight search results
|
||||
vim.o.hlsearch = true
|
||||
|
||||
-- Highlight current line
|
||||
vim.o.cursorline = true
|
||||
vim.o.cursorlineopt = "number"
|
||||
|
||||
-- Increase speed for terminals
|
||||
vim.o.ttyfast = true
|
||||
|
||||
vim.diagnostic.config({ virtual_text = false })
|
||||
vim.g.nvim_tree_respect_buf_cwd = 1
|
||||
vim.g.NERDCompactSexyComs = 1
|
||||
--Set completeopt to have a better completion experience
|
||||
-- :help completeopt
|
||||
-- menuone: popup even when there's only one match
|
||||
-- noinsert: Do not insert text until a selection is made
|
||||
-- noselect: Do not select, force to select one from the menu
|
||||
-- shortness: avoid showing extra messages when using completion
|
||||
-- updatetime: set updatetime for CursorHold
|
||||
vim.opt.completeopt = { "menuone", "noselect", "noinsert" }
|
||||
vim.opt.shortmess = vim.opt.shortmess + { c = true }
|
||||
vim.g.updatetime = 300
|
||||
|
||||
vim.api.nvim_create_autocmd("TextYankPost", {
|
||||
callback = function()
|
||||
vim.highlight.on_yank()
|
||||
end,
|
||||
})
|
||||
|
||||
vim.o.signcolumn = "yes"
|
||||
|
||||
vim.g.mapleader = " "
|
||||
|
||||
vim.o.clipboard = "unnamedplus"
|
||||
|
||||
vim.filetype.add({
|
||||
pattern = {
|
||||
[".*/hypr/.*%.conf"] = "hyprlang",
|
||||
[".*%.typ"] = "typst",
|
||||
},
|
||||
})
|
||||
|
||||
vim.o.undofile = true
|
||||
|
||||
require("plugins")
|
||||
|
||||
--vim.cmd([[
|
||||
--highlight Normal guibg=none ctermbg=none
|
||||
--highlight NonText guibg=none ctermbg=none
|
||||
--highlight LineNr guifg=#606060
|
||||
--highlight SignColumn guibg=none ctermbg=none
|
||||
--highlight LspInlayHint guibg=none ctermbg=none
|
||||
--]])
|
||||
|
||||
require("notify").setup({
|
||||
background_colour = "#000000",
|
||||
})
|
||||
require("config/lazy")
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "61850bf7df4af8398e97559a35b62378ba8435b1" },
|
||||
"rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
|
||||
"telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
|
||||
"tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "d10c9fda7b8b7b81b2c6eb4c3909adfe9812c6bf" },
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
return {
|
||||
keys = {
|
||||
["("] = { escape = false, close = true, pair = "()" },
|
||||
["["] = { escape = false, close = true, pair = "[]" },
|
||||
["{"] = { escape = false, close = true, pair = "{}" },
|
||||
|
||||
[">"] = { escape = true, close = false, pair = "<>" },
|
||||
[")"] = { escape = true, close = false, pair = "()" },
|
||||
["]"] = { escape = true, close = false, pair = "[]" },
|
||||
["}"] = { escape = true, close = false, pair = "{}" },
|
||||
|
||||
['"'] = { escape = true, close = true, pair = '""' },
|
||||
["'"] = { escape = true, close = true, pair = "''" },
|
||||
["`"] = { escape = true, close = true, pair = "``" },
|
||||
},
|
||||
options = {
|
||||
disabled_filetypes = { "TelescopePrompt", "text", "markdown" },
|
||||
disable_when_touch = true,
|
||||
touch_regex = "[%w(%[{]",
|
||||
pair_spaces = false,
|
||||
auto_indent = true,
|
||||
disable_command_mode = false,
|
||||
},
|
||||
}
|
||||
15
lua/config/autocommands.lua
Normal file
15
lua/config/autocommands.lua
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
local augroup = vim.api.nvim_create_augroup
|
||||
local autocmd = vim.api.nvim_create_autocmd
|
||||
|
||||
augroup("__formatter__", { clear = true })
|
||||
autocmd("BufWritePost", {
|
||||
group = "__formatter__",
|
||||
command = ":FormatWrite",
|
||||
})
|
||||
|
||||
-- Blink on copy
|
||||
autocmd("TextYankPost", {
|
||||
callback = function()
|
||||
vim.highlight.on_yank()
|
||||
end,
|
||||
})
|
||||
51
lua/config/lazy.lua
Normal file
51
lua/config/lazy.lua
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
require("config/options")
|
||||
require("config/autocommands")
|
||||
|
||||
require("lazy").setup({
|
||||
spec = {
|
||||
{ import = "plugins" },
|
||||
},
|
||||
defaults = {
|
||||
lazy = false,
|
||||
version = false, -- always use the latest git commit
|
||||
},
|
||||
install = { colorscheme = { "tokyonight", "habamax" } },
|
||||
checker = {
|
||||
enabled = true, -- check for plugin updates periodically
|
||||
notify = false, -- notify on update
|
||||
}, -- automatically check for plugin updates
|
||||
performance = {
|
||||
rtp = {
|
||||
-- disable some rtp plugins
|
||||
disabled_plugins = {
|
||||
"gzip",
|
||||
-- "matchit",
|
||||
-- "matchparen",
|
||||
-- "netrwPlugin",
|
||||
"tarPlugin",
|
||||
"tohtml",
|
||||
"tutor",
|
||||
"zipPlugin",
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd("colorscheme tokyonight-night")
|
||||
67
lua/config/options.lua
Normal file
67
lua/config/options.lua
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
vim.o.showmatch = true
|
||||
|
||||
vim.wo.number = true
|
||||
vim.wo.relativenumber = true
|
||||
|
||||
vim.o.mouse = "a"
|
||||
|
||||
vim.o.ignorecase = true
|
||||
vim.o.smartcase = true
|
||||
vim.o.expandtab = true
|
||||
vim.o.shiftwidth = 4
|
||||
vim.o.tabstop = 4
|
||||
vim.o.cursorline = true
|
||||
|
||||
-- Enable auto-indentation
|
||||
vim.o.autoindent = true
|
||||
|
||||
-- Highlight search results
|
||||
vim.o.hlsearch = true
|
||||
|
||||
-- Highlight current line
|
||||
vim.o.cursorline = true
|
||||
vim.o.cursorlineopt = "number"
|
||||
|
||||
-- Increase speed for terminals
|
||||
vim.o.ttyfast = true
|
||||
|
||||
vim.g.nvim_tree_respect_buf_cwd = 1
|
||||
vim.g.NERDCompactSexyComs = 1
|
||||
--Set completeopt to have a better completion experience
|
||||
-- :help completeopt
|
||||
-- menuone: popup even when there's only one match
|
||||
-- noinsert: Do not insert text until a selection is made
|
||||
-- noselect: Do not select, force to select one from the menu
|
||||
-- shortness: avoid showing extra messages when using completion
|
||||
-- updatetime: set updatetime for CursorHold
|
||||
vim.opt.completeopt = { "menuone", "noselect", "noinsert" }
|
||||
vim.opt.shortmess = vim.opt.shortmess + { c = true }
|
||||
vim.g.updatetime = 300
|
||||
|
||||
vim.o.signcolumn = "yes"
|
||||
|
||||
vim.g.mapleader = " "
|
||||
|
||||
vim.o.clipboard = "unnamedplus"
|
||||
|
||||
vim.filetype.add({
|
||||
pattern = {
|
||||
[".*/hypr/.*%.conf"] = "hyprlang",
|
||||
[".*%.typ"] = "typst",
|
||||
},
|
||||
})
|
||||
|
||||
vim.o.undofile = true
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
signs = true,
|
||||
update_in_insert = true,
|
||||
underline = true,
|
||||
severity_sort = false,
|
||||
float = {
|
||||
border = "rounded",
|
||||
source = true,
|
||||
header = "",
|
||||
prefix = "",
|
||||
},
|
||||
})
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
local devicons = require("nvim-web-devicons")
|
||||
require("incline").setup({
|
||||
render = function(props)
|
||||
local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ":t")
|
||||
if filename == "" then
|
||||
filename = "[No Name]"
|
||||
end
|
||||
local ft_icon, ft_color = devicons.get_icon_color(filename)
|
||||
|
||||
local function get_git_diff()
|
||||
local icons = { removed = "", changed = "", added = "" }
|
||||
local signs = vim.b[props.buf].gitsigns_status_dict
|
||||
local labels = {}
|
||||
if signs == nil then
|
||||
return labels
|
||||
end
|
||||
for name, icon in pairs(icons) do
|
||||
if tonumber(signs[name]) and signs[name] > 0 then
|
||||
table.insert(labels, { icon .. signs[name] .. " ", group = "Diff" .. name })
|
||||
end
|
||||
end
|
||||
if #labels > 0 then
|
||||
table.insert(labels, { "┊ " })
|
||||
end
|
||||
return labels
|
||||
end
|
||||
|
||||
local function get_diagnostic_label()
|
||||
local icons = { error = "", warn = " ", info = " ", hint = "" }
|
||||
local label = {}
|
||||
|
||||
for severity, icon in pairs(icons) do
|
||||
local n = #vim.diagnostic.get(props.buf, { severity = vim.diagnostic.severity[string.upper(severity)] })
|
||||
if n > 0 then
|
||||
table.insert(label, { icon .. n .. " ", group = "DiagnosticSign" .. severity })
|
||||
end
|
||||
end
|
||||
if #label > 0 then
|
||||
table.insert(label, { "┊ " })
|
||||
end
|
||||
return label
|
||||
end
|
||||
|
||||
return {
|
||||
--{ get_diagnostic_label() },
|
||||
--{ get_git_diff() },
|
||||
{ (ft_icon or "") .. " ", guifg = ft_color, guibg = "none" },
|
||||
{ filename .. " ", gui = vim.bo[props.buf].modified and "bold,italic" or "bold" },
|
||||
}
|
||||
end,
|
||||
})
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
require("nightfox").setup({
|
||||
options = {
|
||||
styles = {
|
||||
comments = "italic",
|
||||
keywords = "bold",
|
||||
types = "italic,bold",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd("colorscheme carbonfox")
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
local cmp = require("cmp")
|
||||
|
||||
cmp.setup({
|
||||
-- Enable LSP snippets
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = {
|
||||
-- Add tab support
|
||||
["<S-Tab>"] = cmp.mapping.select_prev_item(),
|
||||
["<Tab>"] = cmp.mapping.select_next_item(),
|
||||
["<C-S-f>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.close(),
|
||||
["<CR>"] = cmp.mapping.confirm({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true,
|
||||
}),
|
||||
},
|
||||
sources = {
|
||||
{ name = "path" }, -- file paths
|
||||
{ name = "nvim_lsp", keyword_length = 1 }, -- from language server
|
||||
{ name = "nvim_lsp_signature_help" }, -- display function signatures with current parameter emphasized
|
||||
{ name = "buffer", keyword_length = 2 }, -- source current buffer
|
||||
{ name = "vsnip", keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
|
||||
{ name = "calc" }, -- source for math calculation
|
||||
},
|
||||
formatting = {
|
||||
fields = { "menu", "abbr", "kind" },
|
||||
format = function(entry, item)
|
||||
local menu_icon = {
|
||||
nvim_lsp = "λ",
|
||||
vsnip = "⋗",
|
||||
buffer = "Ω",
|
||||
path = "/",
|
||||
}
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
cmp.setup.filetype("gitcommit", {
|
||||
sources = cmp.config.sources({
|
||||
{ name = "git" },
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
|
||||
require("cmp_git").setup()
|
||||
|
||||
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline({ "/", "?" }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = "buffer" },
|
||||
},
|
||||
})
|
||||
|
||||
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline(":", {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
}, {
|
||||
{ name = "cmdline" },
|
||||
}),
|
||||
})
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
local lspconfig = require("lspconfig")
|
||||
|
||||
--vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
|
||||
--virtual_text = true,
|
||||
--})
|
||||
|
||||
lspconfig.pyright.setup({})
|
||||
|
||||
lspconfig.clangd.setup({})
|
||||
|
||||
lspconfig.rust_analyzer.setup({})
|
||||
|
||||
lspconfig.nil_ls.setup({})
|
||||
|
||||
lspconfig.r_language_server.setup({})
|
||||
|
||||
lspconfig.qmlls.setup({})
|
||||
|
||||
lspconfig.lua_ls.setup({
|
||||
on_init = function(client)
|
||||
if client.workspace_folders then
|
||||
local path = client.workspace_folders[1].name
|
||||
if vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc") then
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, {
|
||||
runtime = {
|
||||
version = "LuaJIT",
|
||||
},
|
||||
workspace = {
|
||||
checkThirdParty = false,
|
||||
library = {
|
||||
vim.env.VIMRUNTIME,
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
settings = {
|
||||
Lua = {
|
||||
hint = { enable = true },
|
||||
},
|
||||
},
|
||||
single_file_support = true,
|
||||
})
|
||||
|
||||
lspconfig.bashls.setup({})
|
||||
|
||||
lspconfig.zls.setup({})
|
||||
|
||||
lspconfig.ts_ls.setup({})
|
||||
|
||||
lspconfig.tinymist.setup({
|
||||
single_file_support = true,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
callback = function(args)
|
||||
local bufnr = args.buf ---@type number
|
||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||
if client.supports_method("textDocument/inlayHint") then
|
||||
vim.lsp.inlay_hint.enable(true, { bufnr = bufnr })
|
||||
vim.keymap.set("n", "<leader>i", function()
|
||||
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }), { bufnr = bufnr })
|
||||
end, { buffer = bufnr })
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
vim.g.loaded_netrw = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
local api = require("nvim-tree.api")
|
||||
|
||||
local function open_nvim_tree(data)
|
||||
if api.tree.is_visible() then
|
||||
return
|
||||
end
|
||||
|
||||
-- buffer is a real file on the disk
|
||||
local real_file = vim.fn.filereadable(data.file) == 1
|
||||
|
||||
-- buffer is a [No Name]
|
||||
--local no_name = data.file == "" and vim.bo[data.buf].buftype == ""
|
||||
|
||||
if not real_file then --and not no_name then
|
||||
return
|
||||
end
|
||||
|
||||
local path = data.file
|
||||
|
||||
if vim.fn.isdirectory(data.file) == 0 then
|
||||
local _, _, i = path:find(".*()/.*")
|
||||
path = path:sub(0, i)
|
||||
end
|
||||
|
||||
-- open the tree, find the file but don't focus it
|
||||
api.tree.toggle({
|
||||
focus = false,
|
||||
find_file = true,
|
||||
path = vim.loop.cwd(),
|
||||
})
|
||||
end
|
||||
|
||||
-- Using VimEnter is crucial, other autocmds will break the "focus = false" behaviour
|
||||
--vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
|
||||
|
||||
-- From https://github.com/nvim-tree/nvim-tree.lua/issues/1368#issuecomment-1512248492
|
||||
vim.api.nvim_create_autocmd("QuitPre", {
|
||||
callback = function()
|
||||
local invalid_win = {}
|
||||
local wins = vim.api.nvim_list_wins()
|
||||
for _, w in ipairs(wins) do
|
||||
local bufname = vim.api.nvim_buf_get_name(vim.api.nvim_win_get_buf(w))
|
||||
if bufname:match("NvimTree_") ~= nil then
|
||||
table.insert(invalid_win, w)
|
||||
end
|
||||
end
|
||||
if #invalid_win == #wins - 1 then
|
||||
-- Should quit, so we close all invalid windows.
|
||||
for _, w in ipairs(invalid_win) do
|
||||
vim.api.nvim_win_close(w, true)
|
||||
end
|
||||
end
|
||||
end,
|
||||
})
|
||||
298
lua/plugins.lua
298
lua/plugins.lua
|
|
@ -1,298 +0,0 @@
|
|||
-- vim:fileencoding=utf-8:foldmethod=marker
|
||||
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
"--branch=stable",
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
require("lazy").setup({
|
||||
--: Behaviour {{{
|
||||
{
|
||||
"nvzone/typr",
|
||||
lazy = true,
|
||||
dependencies = "nvzone/volt",
|
||||
opts = {},
|
||||
cmd = { "Typr", "TyprStats" },
|
||||
},
|
||||
{
|
||||
"folke/lazydev.nvim",
|
||||
ft = "lua",
|
||||
dependencies = { { "Bilal2453/luvit-meta", lazy = true } },
|
||||
opts = {
|
||||
library = {
|
||||
{ path = "luvit-meta/library", words = { "vim%.uv" } },
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"MeanderingProgrammer/render-markdown.nvim",
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.icons" }, -- if you use standalone mini plugins
|
||||
---@module 'render-markdown'
|
||||
---@type render.md.UserConfig
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = {
|
||||
"hrsh7th/cmp-buffer",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
"hrsh7th/cmp-cmdline",
|
||||
"hrsh7th/cmp-path",
|
||||
"hrsh7th/cmp-nvim-lua",
|
||||
"hrsh7th/cmp-nvim-lsp-signature-help",
|
||||
"hrsh7th/cmp-vsnip",
|
||||
"hrsh7th/vim-vsnip",
|
||||
"petertriho/cmp-git",
|
||||
},
|
||||
init = function()
|
||||
require("nvim-cmp-config")
|
||||
end,
|
||||
},
|
||||
"VonHeikemen/lsp-zero.nvim",
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
lazy = false,
|
||||
opts = {
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
ensure_installed = {
|
||||
"c",
|
||||
"lua",
|
||||
"vim",
|
||||
"vimdoc",
|
||||
"query",
|
||||
"json",
|
||||
"javascript",
|
||||
"typescript",
|
||||
"json5",
|
||||
"jsonc",
|
||||
"xml",
|
||||
"html",
|
||||
"zig",
|
||||
"rust",
|
||||
"qmljs",
|
||||
},
|
||||
auto_install = true,
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
end,
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig", -- Configurations for Nvim LSP
|
||||
init = function()
|
||||
require("nvim-lsp-config")
|
||||
end,
|
||||
},
|
||||
{ "simrat39/rust-tools.nvim", ft = "rust" },
|
||||
"preservim/nerdcommenter", -- (batch)commenting tool
|
||||
{ -- fuzzy file finder
|
||||
"nvim-telescope/telescope.nvim",
|
||||
opts = {
|
||||
pickers = {
|
||||
find_files = {
|
||||
--hidden = true,
|
||||
no_ignore = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"nvim-telescope/telescope-file-browser.nvim",
|
||||
dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
|
||||
opts = {
|
||||
extensions = {
|
||||
file_browser = {
|
||||
theme = "ivy",
|
||||
hijack_netrw = true,
|
||||
auto_depth = true,
|
||||
no_ignore = false,
|
||||
hidden = { file_browser = true, folder_browser = true },
|
||||
},
|
||||
},
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("telescope").setup(opts)
|
||||
require("telescope").load_extension("file_browser")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"folke/trouble.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
opts = {
|
||||
auto_close = true,
|
||||
modes = {
|
||||
diagnostics = {
|
||||
auto_open = false,
|
||||
},
|
||||
},
|
||||
|
||||
win = { position = "right" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
init = function()
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
end,
|
||||
opts = {
|
||||
preset = "helix",
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("which-key").setup(opts)
|
||||
require("which-key-config")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"mhartington/formatter.nvim",
|
||||
config = function()
|
||||
local opts = require("formatter-config").build()
|
||||
|
||||
require("formatter").setup(opts)
|
||||
end,
|
||||
},
|
||||
{
|
||||
"direnv/direnv.vim",
|
||||
},
|
||||
{
|
||||
"akinsho/toggleterm.nvim",
|
||||
version = "*",
|
||||
opts = {
|
||||
direction = "float",
|
||||
},
|
||||
config = function(_, opts)
|
||||
local Terminal = require("toggleterm.terminal").Terminal
|
||||
local lazygit = Terminal:new({ cmd = "lazygit", hidden = true, direction = "float" })
|
||||
|
||||
function _Lazygit_toggle()
|
||||
lazygit:toggle()
|
||||
end
|
||||
|
||||
require("toggleterm").setup(opts)
|
||||
end,
|
||||
},
|
||||
--:}}}
|
||||
--: Visuals {{{
|
||||
{
|
||||
"rachartier/tiny-inline-diagnostic.nvim",
|
||||
event = "VeryLazy", -- Or `LspAttach`
|
||||
opts = {
|
||||
options = {
|
||||
show_all_diags_on_cursorline = true,
|
||||
multilines = true,
|
||||
enable_on_insert = true,
|
||||
throttle = 0,
|
||||
},
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("tiny-inline-diagnostic").setup(opts)
|
||||
end,
|
||||
},
|
||||
{
|
||||
"echasnovski/mini.indentscope",
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"echasnovski/mini.cursorword",
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
opts = { options = { globalstatus = true } },
|
||||
},
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"folke/todo-comments.nvim",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"romgrk/barbar.nvim",
|
||||
dependencies = {
|
||||
"nvim-tree/nvim-web-devicons", -- optional, for file icons
|
||||
"lewis6991/gitsigns.nvim",
|
||||
},
|
||||
opts = {
|
||||
-- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default:
|
||||
animation = true,
|
||||
-- insert_at_start = true,
|
||||
-- …etc.
|
||||
},
|
||||
},
|
||||
{
|
||||
-- thin bar indicating an arbitray character limit
|
||||
"lukas-reineke/virt-column.nvim",
|
||||
opts = {
|
||||
virtcolumn = "120,100,80",
|
||||
char = "│",
|
||||
exclude = {
|
||||
buftypes = {},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"rcarriga/nvim-notify",
|
||||
opts = {
|
||||
render = "wrapped-compact",
|
||||
max_width = function()
|
||||
return math.floor(vim.o.columns * 0.5)
|
||||
end,
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("notify").setup(opts)
|
||||
vim.notify = require("notify")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"b0o/incline.nvim",
|
||||
config = function()
|
||||
require("incline").setup()
|
||||
require("incline-config")
|
||||
end,
|
||||
-- Optional: Lazy load Incline
|
||||
event = "VeryLazy",
|
||||
},
|
||||
{
|
||||
"stevearc/dressing.nvim",
|
||||
},
|
||||
{
|
||||
"folke/tokyonight.nvim",
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
opts = {},
|
||||
},
|
||||
--:}}}
|
||||
})
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
signs = true,
|
||||
update_in_insert = true,
|
||||
underline = true,
|
||||
severity_sort = false,
|
||||
float = {
|
||||
border = "rounded",
|
||||
source = true,
|
||||
header = "",
|
||||
prefix = "",
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd([[colorscheme tokyonight]])
|
||||
93
lua/plugins/cmp.lua
Normal file
93
lua/plugins/cmp.lua
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
return {
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = {
|
||||
"hrsh7th/cmp-buffer",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
"hrsh7th/cmp-cmdline",
|
||||
"hrsh7th/cmp-path",
|
||||
"hrsh7th/cmp-nvim-lua",
|
||||
"hrsh7th/cmp-nvim-lsp-signature-help",
|
||||
"hrsh7th/cmp-vsnip",
|
||||
"hrsh7th/vim-vsnip",
|
||||
"petertriho/cmp-git",
|
||||
},
|
||||
init = function()
|
||||
local cmp = require("cmp")
|
||||
|
||||
cmp.setup({
|
||||
-- Enable LSP snippets
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = {
|
||||
-- Add tab support
|
||||
["<S-Tab>"] = cmp.mapping.select_prev_item(),
|
||||
["<Tab>"] = cmp.mapping.select_next_item(),
|
||||
["<C-S-f>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.close(),
|
||||
["<CR>"] = cmp.mapping.confirm({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true,
|
||||
}),
|
||||
},
|
||||
sources = {
|
||||
{ name = "path" }, -- file paths
|
||||
{ name = "nvim_lsp", keyword_length = 1 }, -- from language server
|
||||
{ name = "nvim_lsp_signature_help" }, -- display function signatures with current parameter emphasized
|
||||
{ name = "buffer", keyword_length = 2 }, -- source current buffer
|
||||
{ name = "vsnip", keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
|
||||
{ name = "calc" }, -- source for math calculation
|
||||
},
|
||||
formatting = {
|
||||
expandable_indicator = true,
|
||||
fields = { "menu", "abbr", "kind" },
|
||||
format = function(entry, item)
|
||||
local menu_icon = {
|
||||
nvim_lsp = "λ",
|
||||
vsnip = "⋗",
|
||||
buffer = "Ω",
|
||||
path = "/",
|
||||
}
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
cmp.setup.filetype("gitcommit", {
|
||||
sources = cmp.config.sources({
|
||||
{ name = "git" },
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
|
||||
require("cmp_git").setup()
|
||||
|
||||
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline({ "/", "?" }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = "buffer" },
|
||||
},
|
||||
})
|
||||
|
||||
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
||||
cmp.setup.cmdline(":", {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
}, {
|
||||
{ name = "cmdline" },
|
||||
}),
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
|
@ -1,10 +1,6 @@
|
|||
-- https://github.com/mhartington/formatter.nvim/tree/master/lua/formatter/filetypes
|
||||
local util = require("formatter.util")
|
||||
|
||||
local M = {}
|
||||
|
||||
local function prettier()
|
||||
return {
|
||||
local function opts()
|
||||
local util = require("formatter.util")
|
||||
local prettier = {
|
||||
exe = "prettier",
|
||||
args = {
|
||||
"--stdin-filepath",
|
||||
|
|
@ -13,9 +9,7 @@ local function prettier()
|
|||
stdin = true,
|
||||
try_node_modules = true,
|
||||
}
|
||||
end
|
||||
|
||||
local function build()
|
||||
return {
|
||||
logging = true,
|
||||
log_level = vim.log.levels.WARN,
|
||||
|
|
@ -24,21 +18,13 @@ local function build()
|
|||
require("formatter.filetypes.lua").stylua,
|
||||
},
|
||||
rust = {
|
||||
function()
|
||||
return {
|
||||
exe = "rustfmt",
|
||||
args = { "--edition 2021" },
|
||||
stdin = true,
|
||||
}
|
||||
end,
|
||||
exe = "rustfmt",
|
||||
args = { "--edition 2021" },
|
||||
stdin = true,
|
||||
},
|
||||
qml = {
|
||||
function()
|
||||
return {
|
||||
exe = "qmlformat",
|
||||
args = { "--inplace" },
|
||||
}
|
||||
end,
|
||||
exe = "qmlformat",
|
||||
args = { "--inplace" },
|
||||
},
|
||||
nix = {
|
||||
require("formatter.filetypes.nix").nixfmt,
|
||||
|
|
@ -89,12 +75,8 @@ local function build()
|
|||
require("formatter.filetypes.sh").shfmt,
|
||||
},
|
||||
typst = {
|
||||
function()
|
||||
return {
|
||||
exe = "typstyle",
|
||||
args = { "--inplace" },
|
||||
}
|
||||
end,
|
||||
exe = "typstyle",
|
||||
args = { "--inplace" },
|
||||
},
|
||||
["*"] = {
|
||||
require("formatter.filetypes.any").remove_trailing_whitespace,
|
||||
|
|
@ -103,14 +85,9 @@ local function build()
|
|||
}
|
||||
end
|
||||
|
||||
M.build = build
|
||||
|
||||
local augroup = vim.api.nvim_create_augroup
|
||||
local autocmd = vim.api.nvim_create_autocmd
|
||||
augroup("__formatter__", { clear = true })
|
||||
autocmd("BufWritePost", {
|
||||
group = "__formatter__",
|
||||
command = ":FormatWrite",
|
||||
})
|
||||
|
||||
return M
|
||||
return {
|
||||
"mhartington/formatter.nvim",
|
||||
config = function()
|
||||
require("formatter").setup(opts())
|
||||
end,
|
||||
}
|
||||
6
lua/plugins/incline.lua
Normal file
6
lua/plugins/incline.lua
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
return {
|
||||
"b0o/incline.nvim",
|
||||
opts = {},
|
||||
-- Optional: Lazy load Incline
|
||||
event = "VeryLazy",
|
||||
}
|
||||
10
lua/plugins/lazydev.lua
Normal file
10
lua/plugins/lazydev.lua
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
return {
|
||||
"folke/lazydev.nvim",
|
||||
ft = "lua",
|
||||
dependencies = { { "Bilal2453/luvit-meta", lazy = true } },
|
||||
opts = {
|
||||
library = {
|
||||
{ path = "luvit-meta/library", words = { "vim%.uv" } },
|
||||
},
|
||||
},
|
||||
}
|
||||
74
lua/plugins/lspconfig.lua
Normal file
74
lua/plugins/lspconfig.lua
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
return {
|
||||
"neovim/nvim-lspconfig", -- Configurations for Nvim LSP
|
||||
opts = {},
|
||||
config = function()
|
||||
local lspconfig = require("lspconfig")
|
||||
|
||||
lspconfig.pyright.setup({})
|
||||
|
||||
lspconfig.clangd.setup({})
|
||||
|
||||
lspconfig.rust_analyzer.setup({})
|
||||
|
||||
lspconfig.nil_ls.setup({})
|
||||
|
||||
lspconfig.r_language_server.setup({})
|
||||
|
||||
lspconfig.qmlls.setup({})
|
||||
|
||||
lspconfig.lua_ls.setup({
|
||||
on_init = function(client)
|
||||
if client.workspace_folders then
|
||||
local path = client.workspace_folders[1].name
|
||||
if vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc") then
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, {
|
||||
runtime = {
|
||||
version = "LuaJIT",
|
||||
},
|
||||
workspace = {
|
||||
checkThirdParty = false,
|
||||
library = {
|
||||
vim.env.VIMRUNTIME,
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
settings = {
|
||||
Lua = {
|
||||
hint = { enable = true },
|
||||
},
|
||||
},
|
||||
single_file_support = true,
|
||||
})
|
||||
|
||||
lspconfig.bashls.setup({})
|
||||
|
||||
lspconfig.zls.setup({})
|
||||
|
||||
lspconfig.ts_ls.setup({})
|
||||
|
||||
lspconfig.tinymist.setup({
|
||||
single_file_support = true,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
callback = function(args)
|
||||
local bufnr = args.buf ---@type number
|
||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||
if client ~= nil and client.supports_method("textDocument/inlayHint") then
|
||||
vim.lsp.inlay_hint.enable(true, { bufnr = bufnr })
|
||||
vim.keymap.set("n", "<leader>i", function()
|
||||
vim.lsp.inlay_hint.enable(
|
||||
not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }),
|
||||
{ bufnr = bufnr }
|
||||
)
|
||||
end, { buffer = bufnr })
|
||||
end
|
||||
end,
|
||||
})
|
||||
end,
|
||||
}
|
||||
133
lua/plugins/plugins.lua
Normal file
133
lua/plugins/plugins.lua
Normal file
|
|
@ -0,0 +1,133 @@
|
|||
-- vim:fileencoding=utf-8:foldmethod=marker
|
||||
|
||||
return {
|
||||
--: Behaviour {{{
|
||||
{
|
||||
"MeanderingProgrammer/render-markdown.nvim",
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.icons" }, -- if you use standalone mini plugins
|
||||
---@module 'render-markdown'
|
||||
---@type render.md.UserConfig
|
||||
opts = {},
|
||||
},
|
||||
"preservim/nerdcommenter", -- (batch)commenting tool
|
||||
{ -- fuzzy file finder
|
||||
"nvim-telescope/telescope.nvim",
|
||||
opts = {
|
||||
pickers = {
|
||||
find_files = {
|
||||
--hidden = true,
|
||||
no_ignore = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"nvim-telescope/telescope-file-browser.nvim",
|
||||
dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
|
||||
opts = {
|
||||
extensions = {
|
||||
file_browser = {
|
||||
theme = vim.g.colors_name,
|
||||
hijack_netrw = true,
|
||||
auto_depth = true,
|
||||
no_ignore = false,
|
||||
hidden = { file_browser = true, folder_browser = true },
|
||||
},
|
||||
},
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("telescope").setup(opts)
|
||||
require("telescope").load_extension("file_browser")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"direnv/direnv.vim",
|
||||
},
|
||||
{
|
||||
"akinsho/toggleterm.nvim",
|
||||
version = "*",
|
||||
opts = {
|
||||
direction = "float",
|
||||
},
|
||||
config = function(_, opts)
|
||||
local Terminal = require("toggleterm.terminal").Terminal
|
||||
local lazygit = Terminal:new({ cmd = "lazygit", hidden = true, direction = "float" })
|
||||
|
||||
function _Lazygit_toggle()
|
||||
lazygit:toggle()
|
||||
end
|
||||
|
||||
require("toggleterm").setup(opts)
|
||||
end,
|
||||
},
|
||||
--:}}}
|
||||
--: Visuals {{u{
|
||||
{
|
||||
"rachartier/tiny-inline-diagnostic.nvim",
|
||||
event = "LspAttach",
|
||||
opts = {
|
||||
options = {
|
||||
show_all_diags_on_cursorline = true,
|
||||
multilines = true,
|
||||
enable_on_insert = true,
|
||||
throttle = 0,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"echasnovski/mini.cursorword",
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
opts = { options = { globalstatus = true } },
|
||||
},
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"folke/todo-comments.nvim",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"romgrk/barbar.nvim",
|
||||
dependencies = {
|
||||
"nvim-tree/nvim-web-devicons", -- optional, for file icons
|
||||
"lewis6991/gitsigns.nvim",
|
||||
},
|
||||
opts = {
|
||||
-- lazy.nvim will automatically call setup for you. put your options here, anything missing will use the default:
|
||||
animation = true,
|
||||
-- insert_at_start = true,
|
||||
-- …etc.
|
||||
},
|
||||
},
|
||||
{
|
||||
"rcarriga/nvim-notify",
|
||||
opts = {
|
||||
render = "wrapped-compact",
|
||||
max_width = function()
|
||||
return math.floor(vim.o.columns * 0.5)
|
||||
end,
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("notify").setup(opts)
|
||||
vim.notify = require("notify")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"stevearc/dressing.nvim",
|
||||
},
|
||||
{
|
||||
"folke/tokyonight.nvim",
|
||||
lazy = true,
|
||||
opts = {},
|
||||
config = function()
|
||||
vim.cmd("colorscheme tokyonight-night")
|
||||
end,
|
||||
},
|
||||
--:}}}
|
||||
}
|
||||
15
lua/plugins/snacks-explorer.lua
Normal file
15
lua/plugins/snacks-explorer.lua
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
return {
|
||||
"folke/snacks.nvim",
|
||||
recommended = true,
|
||||
---@type snacks.Config
|
||||
opts = { explorer = {} },
|
||||
keys = {
|
||||
{
|
||||
"<leader>e",
|
||||
function()
|
||||
require("snacks").explorer()
|
||||
end,
|
||||
desc = "Explorer Snacks (root dir)",
|
||||
},
|
||||
},
|
||||
}
|
||||
7
lua/plugins/tools/typr.lua
Normal file
7
lua/plugins/tools/typr.lua
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
return {
|
||||
"nvzone/typr",
|
||||
lazy = true,
|
||||
dependencies = "nvzone/volt",
|
||||
opts = {},
|
||||
cmd = { "Typr", "TyprStats" },
|
||||
}
|
||||
32
lua/plugins/treesitter.lua
Normal file
32
lua/plugins/treesitter.lua
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
lazy = false,
|
||||
opts = {
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
ensure_installed = {
|
||||
"c",
|
||||
"lua",
|
||||
"vim",
|
||||
"vimdoc",
|
||||
"query",
|
||||
"json",
|
||||
"javascript",
|
||||
"typescript",
|
||||
"json5",
|
||||
"jsonc",
|
||||
"xml",
|
||||
"html",
|
||||
"zig",
|
||||
"rust",
|
||||
"qmljs",
|
||||
},
|
||||
auto_install = true,
|
||||
},
|
||||
config = function(_, opts)
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
end,
|
||||
}
|
||||
17
lua/plugins/trouble.lua
Normal file
17
lua/plugins/trouble.lua
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
return {
|
||||
"folke/trouble.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
opts = {},
|
||||
keys = {
|
||||
{
|
||||
"<leader>xl",
|
||||
function()
|
||||
require("trouble").open({ mode = "loclist" })
|
||||
end,
|
||||
desc = "Location List (Trouble)",
|
||||
},
|
||||
{ "<leader>xq", "<cmd>Trouble quickfix toggle<cr>", desc = "" },
|
||||
{ "<leader>xr", "<cmd>Trouble lsp_references toggle<cr>", desc = "" },
|
||||
{ "<leader>xx", "<cmd>Trouble diagnostics toggle<cr>", desc = "Diagnostics (Trouble)" },
|
||||
},
|
||||
}
|
||||
7
lua/plugins/ui/mini-indentscope.lua
Normal file
7
lua/plugins/ui/mini-indentscope.lua
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
return {
|
||||
"echasnovski/mini.indentscope",
|
||||
opts = {
|
||||
symbol = "│",
|
||||
options = { try_as_border = true },
|
||||
},
|
||||
}
|
||||
10
lua/plugins/ui/virt-column.lua
Normal file
10
lua/plugins/ui/virt-column.lua
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
return {
|
||||
"lukas-reineke/virt-column.nvim",
|
||||
opts = {
|
||||
virtcolumn = "120,100,80",
|
||||
char = "│",
|
||||
exclude = {
|
||||
buftypes = {},
|
||||
},
|
||||
},
|
||||
}
|
||||
38
lua/plugins/which-key.lua
Normal file
38
lua/plugins/which-key.lua
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
return {
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
preset = "helix",
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
"<leader>?",
|
||||
function()
|
||||
require("which-key").show({ global = true })
|
||||
end,
|
||||
desc = "Buffer Local Keymaps (which-key)",
|
||||
},
|
||||
{ "<leader>bt", "<cmd>BlameToggle virtual<cr>", desc = "Toggle Virtual Blame" },
|
||||
{ "<leader>c", desc = "NerdCommenter" },
|
||||
{ "<leader>f", desc = "Telescope - Finder" },
|
||||
{ "<leader>fb", "<cmd>Telescope buffers<CR>", desc = "Find Open Buffers" },
|
||||
{ "<leader>ff", require("telescope").extensions.file_browser.file_browser, desc = "Find File" },
|
||||
{ "<leader>fg", "<cmd>Telescope live_grep<CR>", desc = "Live Grep" },
|
||||
{ "<leader>fh", "<cmd>Telescope help_tags<CR>", desc = "Find Help" },
|
||||
{ "<leader>fi", "<cmd>Telescope builtin<cr>", desc = "Search all Telescope builtins" },
|
||||
{ "<leader>ft", "<cmd>TodoTelescope <cr>", desc = "Open Todo in Telescope" },
|
||||
{ "<leader>fu", "<cmd>UrlView<cr>", desc = "Display and open URLs in current buffer" },
|
||||
{ "<leader>n", desc = "Terminal" },
|
||||
{ "<leader>nb", "<cmd>lua _Lazygit_toggle()<CR>", desc = "Open Lazygit" },
|
||||
{ "<leader>nj", "<cmd>ToggleTerm<CR>", desc = "Open Terminal" },
|
||||
{ "<leader>r", "<cmd>lua vim.lsp.buf.rename()<CR>", desc = "Rename a token" },
|
||||
{ "<leader>t1", "<Cmd>BufferGoto 1<CR>", desc = "Go to Buffer 1" },
|
||||
{ "<leader>td", "<Cmd>BufferClose<CR>", desc = "Close Current Buffer" },
|
||||
{ "<leader>tt", require("telescope").extensions.file_browser.file_browser, desc = "Open the file browser" },
|
||||
{
|
||||
"/",
|
||||
require("telescope.builtin").current_buffer_fuzzy_find,
|
||||
desc = "Search for a string in the current buffer",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
local wk = require("which-key")
|
||||
|
||||
wk.add({
|
||||
{
|
||||
"<leader>?",
|
||||
function()
|
||||
require("which-key").show({ global = true })
|
||||
end,
|
||||
desc = "Buffer Local Keymaps (which-key)",
|
||||
},
|
||||
{ "<leader>bt", "<cmd>BlameToggle virtual<cr>", desc = "Toggle Virtual Blame" },
|
||||
{ "<leader>c", desc = "NerdCommenter" },
|
||||
{ "<leader>f", desc = "Telescope - Finder" },
|
||||
{ "<leader>fb", "<cmd>Telescope buffers<CR>", desc = "Find Open Buffers" },
|
||||
{ "<leader>ff", require("telescope").extensions.file_browser.file_browser, desc = "Find File" },
|
||||
{ "<leader>fg", "<cmd>Telescope live_grep<CR>", desc = "Live Grep" },
|
||||
{ "<leader>fh", "<cmd>Telescope help_tags<CR>", desc = "Find Help" },
|
||||
{ "<leader>fi", "<cmd>Telescope builtin<cr>", desc = "Search all Telescope builtins" },
|
||||
{ "<leader>ft", "<cmd>TodoTelescope <cr>", desc = "Open Todo in Telescope" },
|
||||
{ "<leader>fu", "<cmd>UrlView<cr>", desc = "Display and open URLs in current buffer" },
|
||||
{ "<leader>n", desc = "Terminal" },
|
||||
{ "<leader>nb", "<cmd>lua _Lazygit_toggle()<CR>", desc = "Open Lazygit" },
|
||||
{ "<leader>nj", "<cmd>ToggleTerm<CR>", desc = "Open Terminal" },
|
||||
{ "<leader>r", "<cmd>lua vim.lsp.buf.rename()<CR>", desc = "Rename a token" },
|
||||
{ "<leader>t1", "<Cmd>BufferGoto 1<CR>", desc = "Go to Buffer 1" },
|
||||
{ "<leader>td", "<Cmd>BufferClose<CR>", desc = "Close Current Buffer" },
|
||||
{ "<leader>x", desc = "Toggle Trouble" },
|
||||
{ "<leader>xl", "<cmd>Trouble loclist toggle<cr>", desc = "" },
|
||||
{ "<leader>xq", "<cmd>Trouble quickfix toggle<cr>", desc = "" },
|
||||
{ "<leader>xr", "<cmd>Trouble lsp_references toggle<cr>", desc = "" },
|
||||
{ "<leader>xx", "<cmd>Trouble diagnostics toggle<cr>", desc = "Open Trouble" },
|
||||
{ "<leader>tt", require("telescope").extensions.file_browser.file_browser, desc = "Open the file browser" },
|
||||
{ "/", require("telescope.builtin").current_buffer_fuzzy_find, desc = "Search for a string in the current buffer" },
|
||||
})
|
||||
Loading…
Add table
Reference in a new issue