new config using vim.pack
This commit is contained in:
parent
e685165044
commit
17fda33a90
52 changed files with 629 additions and 659 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
lazy-lock.json
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
local conf = vim.lsp.config.hls
|
||||
vim.lsp.config("hls", conf)
|
||||
vim.lsp.enable("hls")
|
||||
|
||||
vim.o.tabstop = 2
|
||||
vim.o.softtabstop = 0
|
||||
vim.o.shiftwidth = 0
|
||||
vim.o.expandtab = true
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
local port = tonumber(os.getenv("GDScript_Port")) or 6005
|
||||
local cmd = vim.lsp.rpc.connect("127.0.0.1", port)
|
||||
local pipe = "/tmp/godot.pipe" -- I use /tmp/godot.pipe
|
||||
|
||||
vim.lsp.start({
|
||||
name = "Godot",
|
||||
cmd = cmd,
|
||||
root_dir = vim.fs.dirname(vim.fs.find({ "project.godot", ".git" }, { upward = true })[1]),
|
||||
on_attach = function(client, bufnr)
|
||||
vim.api.nvim_command('echo serverstart("' .. pipe .. '")')
|
||||
end,
|
||||
})
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
local conf = vim.lsp.config.hls
|
||||
vim.lsp.config("hls", conf)
|
||||
vim.lsp.enable("hls")
|
||||
|
||||
vim.o.tabstop = 2
|
||||
vim.o.softtabstop = 0
|
||||
vim.o.shiftwidth = 0
|
||||
vim.o.expandtab = true
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
local conf = vim.lsp.config.hls
|
||||
vim.lsp.config("hls", conf)
|
||||
vim.lsp.enable("hls")
|
||||
|
||||
vim.o.tabstop = 2
|
||||
vim.o.softtabstop = 0
|
||||
vim.o.shiftwidth = 0
|
||||
vim.o.expandtab = true
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
vim.opt.conceallevel = 2
|
||||
vim.opt.concealcursor = "nc"
|
||||
vim.opt.foldlevel = 99
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
local conf = vim.lsp.config.qmlls
|
||||
conf.root_markers = { ".qmlls.ini" }
|
||||
vim.lsp.config("qmlls", conf)
|
||||
vim.lsp.enable("qmlls")
|
||||
36
init.lua
36
init.lua
|
|
@ -1,4 +1,36 @@
|
|||
require("config.lazy")
|
||||
require("config.general")
|
||||
require("config.autocmd")
|
||||
require("config.lsp")
|
||||
|
||||
local plugins = {
|
||||
"lsp",
|
||||
"mason-bridge",
|
||||
"mason",
|
||||
"formatter",
|
||||
"treesitter",
|
||||
"nvim-lint",
|
||||
|
||||
-- "neorg",
|
||||
|
||||
"nightfox",
|
||||
|
||||
"statusline",
|
||||
|
||||
"ansi",
|
||||
"rpc",
|
||||
"utils",
|
||||
|
||||
"images",
|
||||
"diagrams",
|
||||
"table-mode",
|
||||
|
||||
"plenary",
|
||||
"fuzzyfind",
|
||||
|
||||
"latex",
|
||||
}
|
||||
|
||||
local putils = require("utils.plugins")
|
||||
|
||||
for _, plugin in pairs(plugins) do
|
||||
putils.parse(putils.get(plugin))
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
return {
|
||||
cmd = { "ocamllsp" },
|
||||
filetypes = {
|
||||
"ocaml",
|
||||
"ocaml.interface",
|
||||
"ocaml.menhir",
|
||||
"ocaml.ocamllex",
|
||||
"dune",
|
||||
"reason",
|
||||
},
|
||||
root_markers = {
|
||||
{ "dune-project", "dune-workspace" },
|
||||
{ "*.opam", "esy.json", "package.json" },
|
||||
".git",
|
||||
},
|
||||
settings = {},
|
||||
}
|
||||
|
|
@ -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" } | ...
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue