This commit is contained in:
h
2026-06-14 02:49:06 -04:00
parent f44e1cdc22
commit 4cd1806682
9 changed files with 998 additions and 20 deletions
+18 -4
View File
@@ -61,7 +61,13 @@ local lsp_confs = {
},
},
},
ccls = {},
ccls = {
init_options = {
clang = {
fallbackStyle = "{BasedOnStyle: LLVM, IndentWidth: 4, TabWidth: 4, UseTab: Never}",
},
},
},
jedi_language_server = {
filetypes = { "python", "sage.python" },
},
@@ -138,7 +144,7 @@ for server, conf in pairs(lsp_confs) do
if special_setup then
special_setup(final_config)
else
-- lspconfig[server].setup(final_config)
-- lspconfig[server].setup(final_config)
vim.lsp.config[server] = final_config
vim.lsp.enable(server)
-- lspconfig(server, final_config)
@@ -240,11 +246,11 @@ map('n', '<Leader>pc', 'za', { noremap = true })
-- folds and treesitter
vim.api.nvim_create_autocmd('FileType', {
pattern = { '*' },
pattern = { '*' },
callback = function()
if vim.bo.filetype ~= "plaintex" and vim.bo.filetype ~= "tex" and vim.bo.filetype ~= "latex" and
vim.bo.filetype ~= "qf" and vim.bo.filetype ~= "bib" and vim.bo.filetype ~= "" and vim.bo.filetype ~= "pdf"
and vim.bo.filetype ~= "conf" and vim.bo.filetype ~= "TelescopePrompt" and vim.bo.filetype ~= "lazy" and vim.bo.filetype ~= "lazy_backdrop" and vim.bo.filetype ~= "TelescopeResults" then
and vim.bo.filetype ~= "conf" and vim.bo.filetype ~= "TelescopePrompt" and vim.bo.filetype ~= "lazy" and vim.bo.filetype ~= "lazy_backdrop" and vim.bo.filetype ~= "TelescopeResults" and vim.bo.filetype ~= "netrw" and vim.bo.filetype ~= "html.mustache" then
vim.treesitter.start()
vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
vim.wo[0][0].foldmethod = 'expr'
@@ -252,6 +258,14 @@ vim.api.nvim_create_autocmd('FileType', {
vim.wo[0][0].foldlevel = 99
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
end
if vim.bo.filetype == "c" or vim.bo.filetype == "cpp" or vim.bo.filetype == "cuda" or vim.bo.filetype == "objc" or vim.bo.filetype == "objcpp" then
vim.opt_local.shiftwidth = 2
vim.opt_local.tabstop = 2
vim.opt_local.softtabstop = 2
vim.opt_local.expandtab = true
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
end
end
})
+7 -3
View File
@@ -4,6 +4,8 @@ local map = vim.api.nvim_set_keymap
o.expandtab = true
o.tabstop = 4
o.shiftwidth = 0
o.modeline = true
o.modelines = 5
o.viminfo = ''
vim.g.base16colorspace = 256
vim.g.vimtex_view_method = "zathura"
@@ -26,16 +28,18 @@ vim.cmd [[
o.spelllang = "en_us"
map('i', '<C-L>', '<c-g>u<Esc>[s1z=`]a<c-g>u', { noremap = true })
-- vim.cmd('colorscheme theme')
-- vim.cmd('colorscheme tinted-theme')
vim.cmd('colorscheme theme-nvim')
-- vim.cmd('colorscheme theme-mininvim')
vim.g.airline_theme = 'theme'
vim.cmd("AirlineTheme theme")
-- stupid fix for stupid problems i guess
vim.g["airline#extensions#whitespace#enabled"] = false
local color = require('base16-colorscheme').colors.base02
vim.api.nvim_set_hl(0, 'LineNr', { fg = color, bg = "none" })
map('n', '<Leader>s', ':%s//g<Left><Left>', {})
map('n', '<Leader>e', ':make!<CR>', { noremap = true })
+9 -8
View File
@@ -5,6 +5,10 @@ local function import(name)
end
return {
{
'nvim-mini/mini.nvim',
version = false
},
{
"RRethy/base16-nvim",
@@ -265,20 +269,17 @@ return {
{ src = 'nvimlua', short_name = 'NLUA', conf_only = true },
{ src = 'bc', short_name = 'CALC', precision = 8 },
}
end,
build = function()
require("coq")
vim.cmd(":COQdeps")
end,
config = function()
require('coq_3p') {
{ src = 'vimtex', short_name = 'TEX' },
{ src = 'nvimlua', short_name = 'NLUA', conf_only = true },
{ src = 'bc', short_name = 'CALC', precision = 8 },
}
end
},
@@ -321,11 +322,11 @@ return {
lazy = false,
dependencies = {
{
"ms-jpq/coq.artifacts",
branch = "artifacts",
lazy = false,
},
{
"ms-jpq/coq.artifacts",
branch = "artifacts",
lazy = false,
},
},
},
},