new config using vim.pack
This commit is contained in:
parent
e685165044
commit
17fda33a90
41 changed files with 629 additions and 659 deletions
|
|
@ -1,12 +0,0 @@
|
|||
-- put this in your init.lua
|
||||
vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
|
||||
pattern = { "*.yuck" },
|
||||
callback = function(event)
|
||||
print(string.format("starting yuck;s for %s", vim.inspect(event)))
|
||||
vim.lsp.start({
|
||||
name = "YuckLs",
|
||||
cmd = { "yuckls" }, -- if installed from aur
|
||||
root_dir = vim.fn.getcwd(),
|
||||
})
|
||||
end,
|
||||
})
|
||||
|
|
@ -17,7 +17,11 @@ vim.keymap.set("t", "<Esc>", "<C-\\><C-N>", {})
|
|||
|
||||
vim.keymap.set("n", ".", ":", {})
|
||||
|
||||
vim.keymap.set("i", "jk", "", {})
|
||||
vim.keymap.set("i", "jk", "␛", {})
|
||||
|
||||
vim.cmd("nnoremap <Space> <Nop>")
|
||||
vim.g.mapleader = " "
|
||||
vim.g.maplocalleader = ","
|
||||
|
||||
vim.opt.termguicolors = true
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
-- Bootstrap lazy.nvim
|
||||
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)
|
||||
|
||||
-- Make sure to setup `mapleader` and `maplocalleader` before
|
||||
-- loading lazy.nvim so that mappings are correct.
|
||||
-- This is also a good place to setup other settings (vim.opt)
|
||||
vim.cmd("nnoremap <Space> <Nop>")
|
||||
vim.g.mapleader = " "
|
||||
vim.g.maplocalleader = ","
|
||||
|
||||
vim.keymap.set("n", "<leader>l", function() require"lazy".home() end, { silent = true, desc = "open lazy.nvim"})
|
||||
|
||||
-- Setup lazy.nvim
|
||||
require("lazy").setup("plugins")
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
-- lsp that are not on mason/beta branch lsp
|
||||
vim.lsp.enable("zls")
|
||||
vim.lsp.enable("ocamllsp")
|
||||
vim.lsp.enable("ocamllsp")
|
||||
|
|
@ -9,3 +8,4 @@ vim.lsp.config("llvm-ir-lsp", {
|
|||
cmd = { "llvm-ir-lsp" },
|
||||
filetypes = { "llvm" },
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
---@module "utils.plugins"
|
||||
---@type Plugin
|
||||
return {
|
||||
"0xferrous/ansi.nvim",
|
||||
config = true,
|
||||
opts = {
|
||||
auto_enable = false, -- Auto-enable for configured filetypes
|
||||
filetypes = { "log", "ansi" }, -- Filetypes to auto-enable
|
||||
},
|
||||
configure = function(load)
|
||||
load("0xferrous/ansi.nvim")
|
||||
require("ansi").setup({
|
||||
auto_enable = false, -- Auto-enable for configured filetypes
|
||||
filetypes = { "log", "ansi" }, -- Filetypes to auto-enable
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
return {
|
||||
"LukasPietzschmann/boo.nvim",
|
||||
opts = {},
|
||||
}
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
return {
|
||||
"stevearc/conform.nvim",
|
||||
dependencies = { "frostplexx/mason-bridge.nvim" },
|
||||
event = { "BufWritePre" },
|
||||
cmd = { "ConformInfo" },
|
||||
init = function()
|
||||
require("conform").setup({
|
||||
format_on_save = function(bufnr)
|
||||
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
|
||||
return
|
||||
end
|
||||
require("conform").formatters_by_ft = require("mason-bridge").get_formatters()
|
||||
return { timeout_ms = 200, lsp_fallback = true }, on_format
|
||||
end,
|
||||
formatters_by_ft = require("mason-bridge").get_formatters(), --[[ = {
|
||||
lua = { "stylua" },
|
||||
javascript = { "prettier" },
|
||||
html = { "prettier" },
|
||||
css = { "prettier" },
|
||||
c = { "clang-format" },
|
||||
cpp = { "clang-format" },
|
||||
arduino = { "clang-format" },
|
||||
sh = { "shfmt" },
|
||||
bash = { "shfmt" },
|
||||
mksh = { "shfmt" },
|
||||
json = { "jq" },
|
||||
}, ]] --
|
||||
|
||||
-- This will provide type hinting with LuaLS
|
||||
---@module "conform"
|
||||
---@type conform.setupOpts
|
||||
formatters = {
|
||||
prettier = {
|
||||
prepend_args = { "--use-tabs", "true" },
|
||||
},
|
||||
jq = {
|
||||
prepend_args = { "--tab" },
|
||||
},
|
||||
["clang-format"] = {
|
||||
prepend_args = function(self, ctx)
|
||||
return { "-style=file:/home/Dario48/.config/.clang-format" }
|
||||
end,
|
||||
},
|
||||
default_format_opts = {
|
||||
lsp_format = "fallback",
|
||||
},
|
||||
},
|
||||
})
|
||||
-- If you want the formatexpr, here is the place to set it
|
||||
vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
|
||||
vim.g.arduino_recommended_style = 0
|
||||
end,
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
return {
|
||||
"vyfor/cord.nvim",
|
||||
build = ":Cord update",
|
||||
-- opts = {}
|
||||
}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
return {
|
||||
url = "https://dario48.site/git/Dario48/darioline.git",
|
||||
config = true,
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
return {
|
||||
"3rd/diagram.nvim",
|
||||
dependencies = {
|
||||
{ "3rd/image.nvim" }, -- you'd probably want to configure image.nvim manually instead of doing this
|
||||
},
|
||||
opts = { -- you can just pass {}, defaults below
|
||||
events = {
|
||||
render_buffer = { "InsertLeave", "BufWinEnter", "TextChanged" },
|
||||
clear_buffer = { "BufLeave" },
|
||||
},
|
||||
renderer_options = {
|
||||
mermaid = {
|
||||
background = nil, -- nil | "transparent" | "white" | "#hex"
|
||||
theme = nil, -- nil | "default" | "dark" | "forest" | "neutral"
|
||||
scale = 1, -- nil | 1 (default) | 2 | 3 | ...
|
||||
width = nil, -- nil | 800 | 400 | ...
|
||||
height = nil, -- nil | 600 | 300 | ...
|
||||
cli_args = nil, -- nil | { "--no-sandbox" } | { "-p", "/path/to/puppeteer" } | ...
|
||||
},
|
||||
plantuml = {
|
||||
charset = nil,
|
||||
cli_args = nil, -- nil | { "-Djava.awt.headless=true" } | ...
|
||||
},
|
||||
d2 = {
|
||||
theme_id = nil,
|
||||
dark_theme_id = nil,
|
||||
scale = nil,
|
||||
layout = nil,
|
||||
sketch = nil,
|
||||
cli_args = nil, -- nil | { "--pad", "0" } | ...
|
||||
},
|
||||
gnuplot = {
|
||||
size = nil, -- nil | "800,600" | ...
|
||||
font = nil, -- nil | "Arial,12" | ...
|
||||
theme = nil, -- nil | "light" | "dark" | custom theme string
|
||||
cli_args = nil, -- nil | { "-p" } | { "-c", "config.plt" } | ...
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
21
lua/plugins/diagrams.lua
Normal file
21
lua/plugins/diagrams.lua
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
---@module "utils.plugins"
|
||||
---@type Plugin
|
||||
return {
|
||||
after = "images",
|
||||
configure = function(load)
|
||||
--load("3rd/diagram.nvim")
|
||||
--require("diagram").setup()
|
||||
|
||||
load("jbyuki/venn.nvim")
|
||||
vim.b.ve = "all"
|
||||
|
||||
vim.api.nvim_create_user_command("VennInit", function()
|
||||
vim.keymap.set("n", "J", "<C-v>j:VBox<CR>", { noremap = true })
|
||||
vim.keymap.set("n", "K", "<C-v>k:VBox<CR>", { noremap = true })
|
||||
vim.keymap.set("n", "L", "<C-v>l:VBox<CR>", { noremap = true })
|
||||
vim.keymap.set("n", "H", "<C-v>h:VBox<CR>", { noremap = true })
|
||||
-- draw a box by pressing "f" with visual selection,
|
||||
vim.keymap.set("v", "f", ":VBox<CR>", { noremap = true })
|
||||
end, {})
|
||||
end,
|
||||
}
|
||||
47
lua/plugins/formatter.lua
Normal file
47
lua/plugins/formatter.lua
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
---@module "utils.plugins"
|
||||
---@type Plugin
|
||||
return {
|
||||
after = "mason-bridge",
|
||||
configure = function(load)
|
||||
load("stevearc/conform.nvim")
|
||||
|
||||
require("conform").setup({
|
||||
formatters_by_ft = require("mason-bridge").get_formatters(),
|
||||
|
||||
format_on_save = function(bufnr)
|
||||
require("conform").formatters_by_ft = require("mason-bridge").get_formatters()
|
||||
|
||||
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
|
||||
return
|
||||
else
|
||||
return { timeout_ms = 500, lsp_format = "fallback" }
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_user_command("FormatDisable", function(args)
|
||||
if args.bang then
|
||||
-- FormatDisable! will disable formatting globally
|
||||
vim.g.disable_autoformat = true
|
||||
else
|
||||
vim.b.disable_autoformat = true
|
||||
end
|
||||
end, {
|
||||
desc = "Disable autoformat-on-save",
|
||||
bang = true,
|
||||
})
|
||||
vim.api.nvim_create_user_command("FormatEnable", function(args)
|
||||
if args.bang then
|
||||
-- FormatDisable! will disable formatting globally
|
||||
vim.g.disable_autoformat = false
|
||||
else
|
||||
vim.b.disable_autoformat = false
|
||||
end
|
||||
end, {
|
||||
desc = "Enable autoformat-on-save",
|
||||
bang = true,
|
||||
})
|
||||
|
||||
vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
|
||||
end,
|
||||
}
|
||||
|
|
@ -1,11 +1,14 @@
|
|||
---@module "utils.plugins"
|
||||
---@type Plugin
|
||||
return {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
|
||||
keys = {
|
||||
{ "<leader>ff", require("telescope.builtin").find_files, desc = "Telescope find files" },
|
||||
{ "<leader>fg", require("telescope.builtin").live_grep, desc = "Telescope live grep" },
|
||||
{ "<leader>fb", require("telescope.builtin").buffers, desc = "Telescope buffers" },
|
||||
{ "<leader>fh", require("telescope.builtin").help_tags, desc = "Telescope help tags" },
|
||||
},
|
||||
after = "plenary",
|
||||
configures = "telescope",
|
||||
configure = function(load)
|
||||
load("nvim-telescope/telescope.nvim")
|
||||
require("telescope").setup()
|
||||
vim.keymap.set("n", "<leader>ff", require("telescope.builtin").find_files, { desc = "Telescope find files" })
|
||||
vim.keymap.set("n", "<leader>fg", require("telescope.builtin").live_grep, { desc = "Telescope live grep" })
|
||||
vim.keymap.set("n", "<leader>fb", require("telescope.builtin").buffers, { desc = "Telescope buffers" })
|
||||
vim.keymap.set("n", "<leader>fh", require("telescope.builtin").help_tags, { desc = "Telescope help tags" })
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
return {
|
||||
"3rd/image.nvim",
|
||||
opts = {
|
||||
integrations = {
|
||||
markdown = {
|
||||
enabled = true,
|
||||
clear_in_insert_mode = false,
|
||||
download_remote_images = true,
|
||||
only_render_image_at_cursor = false,
|
||||
only_render_image_at_cursor_mode = "popup", -- or "inline"
|
||||
floating_windows = true, -- if true, images will be rendered in floating markdown windows
|
||||
filetypes = { "markdown", "vimwiki", "latex" }, -- markdown extensions (ie. quarto) can go here
|
||||
},
|
||||
},
|
||||
},
|
||||
config = true,
|
||||
}
|
||||
22
lua/plugins/images.lua
Normal file
22
lua/plugins/images.lua
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
---@module "utils.plugins"
|
||||
---@type Plugin
|
||||
return {
|
||||
configures = "images",
|
||||
configure = function(load)
|
||||
load("3rd/image.nvim")
|
||||
|
||||
require("image").setup({
|
||||
integrations = {
|
||||
markdown = {
|
||||
enabled = true,
|
||||
clear_in_insert_mode = false,
|
||||
download_remote_images = true,
|
||||
only_render_image_at_cursor = false,
|
||||
only_render_image_at_cursor_mode = "popup", -- or "inline"
|
||||
floating_windows = true, -- if true, images will be rendered in floating markdown windows
|
||||
filetypes = { "markdown", "vimwiki", "latex" }, -- markdown extensions (ie. quarto) can go here
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
return {
|
||||
"kmonad/kmonad-vim",
|
||||
}
|
||||
11
lua/plugins/latex.lua
Normal file
11
lua/plugins/latex.lua
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
---@module "utils.plugins"
|
||||
---@type Plugin
|
||||
return {
|
||||
configure = function(load)
|
||||
load("lervag/vimtex")
|
||||
|
||||
vim.g.vimtex_view_method = "mupdf"
|
||||
vim.g.vimtex_compiler_method = "latexmk"
|
||||
vim.g.vimtex_compiler_latexmk = { options = { "-shell-escape" } }
|
||||
end,
|
||||
}
|
||||
99
lua/plugins/lsp.lua
Normal file
99
lua/plugins/lsp.lua
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
---@module "utils.plugins"
|
||||
---@type Plugin
|
||||
return {
|
||||
after = "mason",
|
||||
configure = function(load)
|
||||
load("neovim/nvim-lspconfig")
|
||||
|
||||
load("folke/lazydev.nvim")
|
||||
require("lazydev").setup({})
|
||||
|
||||
--[[
|
||||
---@type vim.lsp.Config
|
||||
local config = {
|
||||
---@type lspconfig.settings.lua_ls
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
version = "LuaJIT",
|
||||
},
|
||||
workspace = {
|
||||
preloadFileSize = 10000,
|
||||
library = {
|
||||
vim.env.VIMRUNTIME,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
vim.lsp.config("lua_ls", config)
|
||||
]]
|
||||
--
|
||||
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
callback = function(args)
|
||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||
if client and client:supports_method("textDocument/completion") then
|
||||
vim.lsp.completion.enable(true, client.id, args.buf, { autotrigger = true })
|
||||
end
|
||||
end,
|
||||
})
|
||||
vim.opt.completeopt = { "menuone", "noinsert", "popup" }
|
||||
vim.keymap.set("i", "<Tab>", function()
|
||||
if vim.fn.pumvisible() == 1 then
|
||||
return "<C-y>"
|
||||
end
|
||||
return "<Tab>"
|
||||
end, { expr = true })
|
||||
|
||||
-- Reserve a space in the gutter
|
||||
-- This will avoid an annoying layout shift in the screen
|
||||
vim.opt.signcolumn = "yes"
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
desc = "LSP actions",
|
||||
callback = function(event)
|
||||
local opts = { buffer = event.buf }
|
||||
|
||||
vim.keymap.set("n", "K", function()
|
||||
vim.lsp.buf.hover()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gd", function()
|
||||
vim.lsp.buf.definition()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gD", function()
|
||||
vim.lsp.buf.declaration()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gi", function()
|
||||
vim.lsp.buf.implementation()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "go", function()
|
||||
vim.lsp.buf.type_definition()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gr", function()
|
||||
vim.lsp.buf.references()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gs", function()
|
||||
vim.lsp.buf.signature_help()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "<F2>", function()
|
||||
vim.lsp.buf.rename()
|
||||
end, opts)
|
||||
vim.keymap.set({ "n", "x" }, "<F3>", function()
|
||||
vim.lsp.buf.format({ async = true })
|
||||
end, opts)
|
||||
vim.keymap.set("n", "<leader>f", function()
|
||||
vim.lsp.buf.code_action()
|
||||
end, opts)
|
||||
end,
|
||||
})
|
||||
|
||||
load("mason-org/mason-lspconfig.nvim")
|
||||
|
||||
require("mason-lspconfig").setup({
|
||||
automatic_enable = true,
|
||||
})
|
||||
|
||||
load("LukasPietzschmann/boo.nvim")
|
||||
end,
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
{ "hrsh7th/cmp-nvim-lsp" },
|
||||
{ "hrsh7th/nvim-cmp" },
|
||||
},
|
||||
config = function()
|
||||
-- Reserve a space in the gutter
|
||||
-- This will avoid an annoying layout shift in the screen
|
||||
vim.opt.signcolumn = "yes"
|
||||
|
||||
-- Add cmp_nvim_lsp capabilities settings to lspconfig
|
||||
-- This should be executed before you configure any language server
|
||||
local lspconfig_defaults = require("lspconfig").util.default_config
|
||||
lspconfig_defaults.capabilities = vim.tbl_deep_extend(
|
||||
"force",
|
||||
lspconfig_defaults.capabilities,
|
||||
require("cmp_nvim_lsp").default_capabilities()
|
||||
)
|
||||
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
desc = "LSP actions",
|
||||
callback = function(event)
|
||||
local opts = { buffer = event.buf }
|
||||
|
||||
vim.keymap.set("n", "K", function()
|
||||
vim.lsp.buf.hover()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gd", function()
|
||||
vim.lsp.buf.definition()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gD", function()
|
||||
vim.lsp.buf.declaration()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gi", function()
|
||||
vim.lsp.buf.implementation()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "go", function()
|
||||
vim.lsp.buf.type_definition()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gr", function()
|
||||
vim.lsp.buf.references()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "gs", function()
|
||||
vim.lsp.buf.signature_help()
|
||||
end, opts)
|
||||
vim.keymap.set("n", "<F2>", function()
|
||||
vim.lsp.buf.rename()
|
||||
end, opts)
|
||||
vim.keymap.set({ "n", "x" }, "<F3>", function()
|
||||
vim.lsp.buf.format({ async = true })
|
||||
end, opts)
|
||||
vim.keymap.set("n", "<leader>f", function()
|
||||
vim.lsp.buf.code_action()
|
||||
end, opts)
|
||||
end,
|
||||
})
|
||||
end,
|
||||
}
|
||||
10
lua/plugins/mason-bridge.lua
Normal file
10
lua/plugins/mason-bridge.lua
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
---@module "utils.plugins"
|
||||
---@type Plugin
|
||||
return {
|
||||
after = "mason",
|
||||
configures = "mason-bridge",
|
||||
configure = function(load)
|
||||
load("frostplexx/mason-bridge.nvim")
|
||||
require("mason-bridge").setup({})
|
||||
end,
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue