guy176251/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes, idk

Browse Source
This commit is contained in:
long
2022-05-18 06:15:59 -05:00
parent 2420aee32b
commit 39cd83f557
21 changed files with 680 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
after/plugin/folding.lua
-3
View File
@@ -1,3 +0,0 @@
--vim.o.foldlevelstart = 4
--vim.o.foldmethod = "expr"
--vim.o.foldexpr = "nvim_treesitter#foldexpr()"
after/plugin/folding.lua.disable
+3
View File
@@ -0,0 +1,3 @@
vim.o.foldlevelstart = 10
vim.o.foldmethod = "expr"
vim.o.foldexpr = "nvim_treesitter#foldexpr()"
ftplugin/htmldjango.lua
+2
View File
@@ -0,0 +1,2 @@
vim.bo.shiftwidth = 2
vim.bo.tabstop = 2
ftplugin/javascript.lua
+1 -1
View File
@@ -1,3 +1,3 @@
local len = 4
local len = 2
vim.bo.shiftwidth = len
vim.bo.tabstop = len
ftplugin/javascriptreact.lua
+3
View File
@@ -0,0 +1,3 @@
local len = 2
vim.bo.shiftwidth = len
vim.bo.tabstop = len
ftplugin/json.lua
+3
View File
@@ -0,0 +1,3 @@
local len = 2
vim.bo.shiftwidth = len
vim.bo.tabstop = len
ftplugin/svelte.lua
+3
View File
@@ -0,0 +1,3 @@
local len = 2
vim.bo.shiftwidth = len
vim.bo.tabstop = len
ftplugin/text.lua
+2 -2
View File
@@ -1,5 +1,5 @@
local function local_map(mode, lhs, rhs, opts)
local options = {noremap = true}
local options = { noremap = true }
if opts then
options = vim.tbl_extend("force", options, opts)
end
@@ -7,7 +7,7 @@ local function local_map(mode, lhs, rhs, opts)
end
local function silent_map(mode, lhs, rhs)
local_map(mode, lhs, rhs, {silent = true})
local_map(mode, lhs, rhs, { silent = true })
end
silent_map("n", "<Up>", "gk")
ftplugin/typescript.lua
+3
View File
@@ -0,0 +1,3 @@
local len = 2
vim.bo.shiftwidth = len
vim.bo.tabstop = len
ftplugin/typescriptreact.lua
+3
View File
@@ -0,0 +1,3 @@
local len = 2
vim.bo.shiftwidth = len
vim.bo.tabstop = len
ftplugin/vue.lua
+3
View File
@@ -0,0 +1,3 @@
local len = 2
vim.bo.shiftwidth = len
vim.bo.tabstop = len
ftplugin/yaml.lua → ftplugin/yaml.lua.nothanks
View File
init.lua
+7 -7
View File
@@ -1,10 +1,10 @@
require "ale"
require "packer_check"
require "plugins"
require "config"
require "keybinds"
require "save_buffer_position"
require "lsp"
--require("ale")
require("packer_check")
require("plugins")
require("config")
require("keybinds")
require("save_buffer_position")
require("lsp")
--local theme = vim.env.LIGHTMODE == "1" and "onehalflight" or "onedark"
--vim.cmd("colorscheme " .. theme)
lua/ale.lua
+14 -13
View File
@@ -7,22 +7,23 @@ g.ale_linters_explicit = true
g.ale_fix_on_save = false
g.ale_fixers = {
--c = {"clang-format"},
cpp = {"clang-format"},
sh = {"shfmt"},
python = {"isort", "black"},
lua = {"luafmt"},
json = {"prettier"},
css = {"prettier"},
scss = {"prettier"},
html = {"prettier"},
javascript = {"prettier"},
typescript = {"prettier"},
javascriptreact = {"prettier"},
typescriptreact = {"prettier"}
cpp = { "clang-format" },
sh = { "shfmt" },
python = { "isort", "black" },
lua = { "luafmt" },
json = { "prettier" },
css = { "prettier" },
scss = { "prettier" },
html = { "prettier" },
javascript = { "prettier" },
typescript = { "prettier" },
javascriptreact = { "prettier" },
typescriptreact = { "prettier" },
htmldjango = { "prettier" },
}
g.ale_linters = {
sh = {"bashate"}
sh = { "bashate" },
--python = {"flake8"},
--cpp = {"g++"},
--html = {"tidy"},
lua/config.lua
+59 -47
View File
@@ -1,7 +1,10 @@
-- env file highlighting
vim.cmd [[au BufRead,BufNewFile .env.* set filetype=sh]]
vim.cmd([[au BufRead,BufNewFile .env.* set filetype=sh]])
-- Dockerfile file highlighting
vim.cmd [[au BufRead,BufNewFile Dockerfile.* set filetype=dockerfile]]
vim.cmd([[au BufRead,BufNewFile Dockerfile.* set filetype=dockerfile]])
vim.cmd([[au BufWrite * normal zx]])
-- jinja highlighting
vim.cmd([[au BufRead,BufNewFile *.jinja set filetype=html]])
local opt = vim.opt -- to set options
local fn = vim.fn
@@ -56,7 +59,7 @@ opt.foldmethod = "indent"
-----------------------------------------------------
-- DISABLE HIGHLIGHT OUTSIDE OF SEARCH AND REPLACE --
-----------------------------------------------------
vim.cmd [[
vim.cmd([[
" Enable highlighting all the matches in incsearch mode
" But don't enable hlsearch always
augroup vimrc-incsearch-highlight
@@ -64,12 +67,17 @@ augroup vimrc-incsearch-highlight
autocmd CmdlineEnter [/\?:] :set hlsearch
autocmd CmdlineLeave [/\?:] :set nohlsearch
augroup END
]]
]])
---------------
-- PROVIDERS --
---------------
g.python3_host_prog = "/usr/bin/python3"
local pyenv_root = vim.env.PYENV_ROOT
if pyenv_root ~= nil then
g.python3_host_prog = pyenv_root .. '/shims/python3'
else
g.python3_host_prog = "/usr/bin/python3"
end
------------------
-- ONEDARK.NVIM --
@@ -80,10 +88,10 @@ g.python3_host_prog = "/usr/bin/python3"
--g.onedark_darker_diagnostics = false
-- Lua
require("onedark").setup {
require("onedark").setup({
style = "darker",
toggle_style_key = "<nop>"
}
toggle_style_key = "<nop>",
})
require("onedark").load()
----------------
@@ -100,13 +108,13 @@ g.bracey_refresh_on_save = true
-----------------------
-- TREESITTER CONFIG --
-----------------------
require("nvim-treesitter.configs").setup {
ensure_installed = "maintained",
require("nvim-treesitter.configs").setup({
ensure_installed = "all",
highlight = {
enable = true,
disable = {"typescript", "tsx", "html", "javascript"}
}
}
disable = { "typescript", "tsx", "html", "javascript" },
},
})
-----------------------
-- GITHUB NVIM THEME --
@@ -123,14 +131,14 @@ g.github_hide_inactive_statusline = false
-- LUALINE --
-------------
require("lualine").setup {
options = {theme = "onedark", icons_enabled = true},
require("lualine").setup({
options = { theme = "onedark", icons_enabled = true },
sections = {
lualine_a = {"mode"},
lualine_a = { "mode" },
lualine_b = {
"FugitiveHead"
"FugitiveHead",
},
lualine_c = {"filename"},
lualine_c = { "filename" },
lualine_x = {
"encoding",
"fileformat",
@@ -138,21 +146,21 @@ require("lualine").setup {
[[string.format("%d Lines", vim.fn.line('$'))]],
{
"diagnostics",
sources = {"nvim_diagnostic", "ale"}
}
sources = { "nvim_diagnostic", "ale" },
},
},
lualine_y = {
"progress"
"progress",
},
lualine_z = {"location"}
lualine_z = { "location" },
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = {"filename"},
lualine_x = {"location"},
lualine_c = { "filename" },
lualine_x = { "location" },
lualine_y = {},
lualine_z = {}
lualine_z = {},
},
tabline = {
lualine_a = {
@@ -160,20 +168,22 @@ require("lualine").setup {
"buffers",
show_filename_only = false, -- shows shortened relative path when false
show_modified_status = true, -- shows indicator then bufder is modified
max_length = vim.o.columns * 5 / 7, -- maximum width of buffers component
max_length = function ()
return vim.o.columns * 5 / 6
end, -- maximum width of buffers component
filetype_names = {
TelescopePrompt = "Telescope",
dashboard = "Dashboard",
packer = "Packer",
fzf = "FZF",
alpha = "Alpha",
["lsp-installer"] = "LSP Installer"
["lsp-installer"] = "LSP Installer",
}, -- shows specific buffer name for that filetype ( { `filetype` = `buffer_name`, ... } )
buffers_color = {
active = nil, -- color for active buffer
inactive = nil -- color for inactive buffer
}
}
inactive = nil, -- color for inactive buffer
},
},
},
lualine_b = {},
lualine_c = {},
@@ -184,18 +194,18 @@ require("lualine").setup {
[[string.format("Tab %d/%d", vim.fn.tabpagenr(), vim.fn.tabpagenr('$'))]],
cond = function()
return fn.tabpagenr("$") > 1
end
end,
},
{
[[harpoon_status()]],
cond = function()
return require("harpoon.mark").get_length() > 0
end
}
}
end,
},
extensions = {}
}
},
},
extensions = {},
})
-------------
-- HARPOON --
@@ -203,23 +213,21 @@ require("lualine").setup {
--Here is the set of global settings and their default values.
require("harpoon").setup(
{
require("harpoon").setup({
global_settings = {
save_on_toggle = false,
save_on_change = true,
enter_on_sendcmd = false,
tmux_autoclose_windows = false,
excluded_filetypes = {"harpoon"}
}
}
)
excluded_filetypes = { "harpoon" },
},
})
--------------
-- NVIM FZF --
--------------
require("fzf").default_options = {
fzf_cli_args = " --height 100% --preview='bat --color=always --style=header,grid --line-range :300 {}' "
fzf_cli_args = " --height 100% --preview='bat --color=always --style=header,grid --line-range :300 {}' ",
}
----------------------
@@ -250,10 +258,14 @@ require("fzf").default_options = {
--}
--vim.opt.listchars:append("eol:↴")
--vim.opt.listchars:append("space:⋅")
vim.opt.list = true
opt.list = true
require("indent_blankline").setup {
require("indent_blankline").setup({
space_char_blankline = " ",
show_current_context = true,
show_current_context_start = true
}
show_current_context_start = true,
})
-- PETOBENS/POET-V --
g.poetv_executables = { "poetry" }
g.poetv_auto_activate = 1
lua/functions.lua
+6 -7
View File
@@ -1,5 +1,4 @@
local bug =
[[
local bug = [[
Weird bug:
@@ -80,7 +79,7 @@ local fzf_call = function(args)
end
end
local results = fzf_run_with_opts({fn = fn, multi = args.multi})
local results = fzf_run_with_opts({ fn = fn, multi = args.multi })
local stripped_results = {}
for _, filepath in ipairs(results) do
stripped_results[#stripped_results + 1] = strip_dot_slash(filepath)
@@ -93,7 +92,7 @@ end
-- Does not include buffers without a file path.
local get_buffer_paths = function()
local buffers = {}
for b = 1, vim.fn.bufnr "$" do
for b = 1, vim.fn.bufnr("$") do
if vim.fn.buflisted(b) ~= 0 and vim.api.nvim_buf_get_option(b, "buftype") == "" then
local buf_path = vim.fn.expand("#" .. b)
if buf_path ~= "" then
@@ -172,7 +171,7 @@ end
-- Marks buffers for harpoon
local buffer_to_harpoon = function()
local buf_paths = get_buffer_paths()
local results = fzf_call({items = buf_paths, multi = true})
local results = fzf_call({ items = buf_paths, multi = true })
if results then
local sorted_results = {}
@@ -195,7 +194,7 @@ end
-- Opens files from fzf, then marks them with harpoon.
local files_to_harpoon = function()
local results = fzf_call({multi = true})
local results = fzf_call({ multi = true })
if results then
-- opens all results into buffer
@@ -233,7 +232,7 @@ local get_marked_file_names = function()
end
local select_harpoon_mark = function()
local results = fzf_call({items = get_marked_file_names()})
local results = fzf_call({ items = get_marked_file_names() })
if results then
vim.api.nvim_win_set_buf(0, vim.fn.bufnr(results[1]))
lua/keybinds.lua
+9 -8
View File
@@ -3,7 +3,7 @@ require("functions")
--local fn = vim.fn -- to call Vim functions e.g. fn.bufnr()
local function map(mode, lhs, rhs, opts)
local options = {noremap = true}
local options = { noremap = true }
if opts then
options = vim.tbl_extend("force", options, opts)
end
@@ -17,7 +17,7 @@ map("v", "<C-C>", '"+y')
--map("n", "<S-Tab>", ":bprevious<CR>")
map("n", "<Tab>", ":lua harpoon_bnext()<CR>")
map("n", "<S-Tab>", ":lua harpoon_bprevious()<CR>")
map("n", "<esc>", ":noh<cr><esc>", {silent = true}) --After searching, pressing escape stops the highlight
--map("n", "<esc>", ":noh<cr><esc>", { silent = true }) --After searching, pressing escape stops the highlight
--map("n", "<Leader>w", [[:%s/\s\+$//e<CR>]])
--map("n", "<Leader>x", ":Bclose <CR>")
@@ -84,10 +84,10 @@ local hopline = [[<cmd>lua require'hop'.hint_lines_skip_whitespace(]] .. hop_opt
--map("n", "<m-w>", hopword, {silent = true})
--map("v", "<m-w>", hopword, {silent = true})
map("n", "W", hopline, {silent = true})
map("v", "W", hopline, {silent = true})
map("n", "w", hopword, {silent = true})
map("v", "w", hopword, {silent = true})
map("n", "W", hopline, { silent = true })
map("v", "W", hopline, { silent = true })
map("n", "w", hopword, { silent = true })
map("v", "w", hopword, { silent = true })
-- args: direction: bool, inclusive: bool
-- inclusive is broken in hop as of this comment
@@ -152,7 +152,8 @@ map("n", "<Leader>p", ":Buffers<CR>")
map("n", "<Leader>h", ":Helptags<CR>")
map("n", "<Leader>;", ":History:<CR>")
map("n", "<Leader>c", ":Commands<CR>")
map("n", "<Leader>r", ":Rg<CR>")
map("n", "<Leader>r", ":Rg <C-R><C-W><CR>")
map("n", "<Leader>R", ":Rg<CR>")
map("n", "<Leader>s", ":Lines<CR>")
--map("n", "<Leader>[", ":Windows <CR>")
@@ -170,7 +171,7 @@ map("n", "<Leader>gb", ":GBranches<CR>")
---------
--map("n", "<c-k>", ":ALEPreviousWrap <CR>", {silent = true})
--map("n", "<c-j>", ":ALENextWrap <CR>", {silent = true})
map("n", "<space>f", ":ALEFix<CR>", {silent = true})
--map("n", "<space>f", ":ALEFix<CR>", {silent = true})
-------------
-- HARPOON --
lua/lsp.lua
+199 -213
View File
@@ -1,86 +1,112 @@
local opt = vim.opt -- to set options
--
--------------------
-- NVIM-AUTOPAIRS --
--------------------
require("nvim-autopairs").setup {check_ts = true}
-- ooooo ooooo .o8
-- `888' `888' "888
-- 888 888 .ooooo. .oooo. .oooo888 .ooooo. oooo d8b
-- 888ooooo888 d88' `88b `P )88b d88' `888 d88' `88b `888""8P
-- 888 888 888ooo888 .oP"888 888 888 888ooo888 888
-- 888 888 888 .o d8( 888 888 888 888 .o 888
-- o888o o888o `Y8bod8P' `Y888""8o `Y8bod88P" `Y8bod8P' d888b
--------------
-- NVIM-CMP --
--------------
-- https://patorjk.com/software/taag/#p=display&f=Roman&t=WORD_TO_MAKE_HEADER
-- .oooooo. oooo .o8 oooo
-- d8P' `Y8b `888 "888 `888
-- 888 888 .ooooo. 888oooo. .oooo. 888
-- 888 888 d88' `88b d88' `88b `P )88b 888
-- 888 ooooo 888 888 888 888 888 .oP"888 888
-- `88. .88' 888 888 888 888 888 d8( 888 888
-- `Y8bood8P' o888o `Y8bod8P' `Y8bod8P' `Y888""8o o888o
local opt = vim.opt -- to set options
vim.diagnostic.config({
virtual_text = true,
signs = true,
update_in_insert = false,
})
local config = {
root_dir = require("lspconfig.util").root_pattern(
"manage.py",
"pyproject.toml",
"package.json",
".null-ls-root",
"Makefile",
".git"
),
on_attach = function(client, bufnr)
local function buf_set_keymap(...)
vim.api.nvim_buf_set_keymap(bufnr, ...)
end
local function buf_set_option(...)
vim.api.nvim_buf_set_option(bufnr, ...)
end
---- Disables document formatting by lsp
--client.resolved_capabilities.document_formatting = false
--client.resolved_capabilities.document_range_formatting = false
-- Enable completion triggered by <c-x><c-o>
buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
-- Mappings.
local opts = { noremap = true, silent = true }
-- See `:help vim.lsp.*` for documentation on any of the below functions
buf_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
buf_set_keymap("n", "<space>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
buf_set_keymap("n", "<space>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
buf_set_keymap("n", "<space>e", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
buf_set_keymap("n", "<space>q", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts)
buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
buf_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
buf_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
buf_set_keymap("n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
buf_set_keymap("n", "[d", "<cmd>lua vim.diagnostic.goto_prev({wrap = true})<CR>", opts)
buf_set_keymap("n", "]d", "<cmd>lua vim.diagnostic.goto_next({wrap = true})<CR>", opts)
buf_set_keymap("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
buf_set_keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
buf_set_keymap("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
end,
}
-- .oooooo. ooo ooooo ooooooooo.
-- d8P' `Y8b `88. .888' `888 `Y88.
-- 888 888b d'888 888 .d88'
-- 888 8 Y88. .P 888 888ooo88P'
-- 888 8 `888' 888 888
-- `88b ooo 8 Y 888 888
-- `Y8bood8P' o8o o888o o888o
require("nvim-autopairs").setup({ check_ts = true })
-- Set completeopt to have a better completion experience
opt.completeopt = "menuone,noselect"
local has_words_before = function()
local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
end
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
local cmp = require("cmp")
-- LUASNIP CMP THINGS
--local luasnip = require("luasnip")
--
--local luasnip_expand = function(args)
-- luasnip.lsp_expand(args.body)
--end
--
--local luasnip_tab = cmp.mapping(
-- function(fallback)
-- if cmp.visible() then
-- cmp.select_next_item()
-- elseif luasnip.expand_or_jumpable() then
-- luasnip.expand_or_jump()
-- elseif has_words_before() then
-- cmp.complete()
-- else
-- fallback()
-- end
-- end,
-- {"i", "s"}
--)
--
--local luasnip_shift_tab = cmp.mapping(
-- function(fallback)
-- if cmp.visible() then
-- cmp.select_prev_item()
-- elseif luasnip.jumpable(-1) then
-- luasnip.jump(-1)
-- else
-- fallback()
-- end
-- end,
-- {"i", "s"}
--)
-- CMP NVIM ULTISNIP
local cmp_ultisnips_mappings = require("cmp_nvim_ultisnips.mappings")
local ultisnip = {
expand = function(args)
vim.fn["UltiSnips#Anon"](args.body)
end,
tab = cmp.mapping(
function(fallback)
--cmp_ultisnips_mappings.jump_forwards(fallback)
--cmp_ultisnips_mappings.compose({"jump_forwards", "select_next_item"})(fallback)
cmp_ultisnips_mappings.compose({"select_next_item"})(fallback)
end,
{"i", "s"}
),
shift_tab = cmp.mapping(
function(fallback)
--cmp_ultisnips_mappings.jump_backwards(fallback)
cmp_ultisnips_mappings.compose({"select_prev_item"})(fallback)
end,
{"i", "s"}
)
tab = cmp.mapping(function(fallback)
cmp_ultisnips_mappings.compose({ "select_next_item" })(fallback)
end, { "i", "s" }),
shift_tab = cmp.mapping(function(fallback)
cmp_ultisnips_mappings.compose({ "select_prev_item" })(fallback)
end, { "i", "s" }),
}
cmp.setup {
cmp.setup({
snippet = {
expand = ultisnip.expand
expand = ultisnip.expand,
},
mapping = {
["<C-p>"] = cmp.mapping.select_prev_item(),
@@ -89,199 +115,156 @@ cmp.setup {
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.close(),
["<CR>"] = cmp.mapping.confirm {
--behavior = cmp.ConfirmBehavior.Replace,
select = true
},
["<CR>"] = cmp.mapping.confirm({
select = true,
}),
["<Tab>"] = ultisnip.tab,
["<S-Tab>"] = ultisnip.shift_tab
["<S-Tab>"] = ultisnip.shift_tab,
},
sources = {
{name = "nvim_lsp"},
--{name = "luasnip"},
{name = "ultisnips"}
}
{ name = "nvim_lsp" },
{ name = "ultisnips" },
},
})
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
-- ooooo ooo oooo oooo ooooo .oooooo..o
-- `888b. `8' `888 `888 `888' d8P' `Y8
-- 8 `88b. 8 oooo oooo 888 888 888 Y88bo.
-- 8 `88b. 8 `888 `888 888 888 888 `"Y8888o.
-- 8 `88b.8 888 888 888 888 888 `"Y88b
-- 8 `888 888 888 888 888 888 o oo .d8P
-- o8o `8 `V88V"V8P' o888o o888o o888ooooood8 8""88888P'
local null_ls = require("null-ls")
-- ORDER IN TABLE DETERMINES EXECUTION ORDER
local sources = {
-- python
null_ls.builtins.diagnostics.flake8,
null_ls.builtins.diagnostics.mypy,
null_ls.builtins.formatting.black,
null_ls.builtins.formatting.isort,
-- js
null_ls.builtins.diagnostics.eslint,
null_ls.builtins.code_actions.eslint,
null_ls.builtins.formatting.prettier.with({
extra_filetypes = { "svelte" },
}),
-- lua
null_ls.builtins.formatting.stylua,
-- bash
null_ls.builtins.formatting.shfmt,
null_ls.builtins.diagnostics.shellcheck,
null_ls.builtins.code_actions.shellcheck,
-- cpp
null_ls.builtins.formatting.clang_format,
-- latex
null_ls.builtins.formatting.latexindent,
null_ls.builtins.diagnostics.chktex,
-- golang
null_ls.builtins.diagnostics.golangci_lint,
-- sql
--null_ls.builtins.diagnostics.sqlfluff.with({
-- --filetypes = { "sql", "html" },
-- args = { "lint", "--dialect", "ansi", "-f", "github-annotation", "-n", "--disable_progress_bar", "-" },
--}),
--null_ls.builtins.formatting.sqlfluff.with({
-- --filetypes = { "sql", "html" },
-- args = { "fix", "--dialect", "ansi", "--disable_progress_bar", "-f", "-n", "-" },
--}),
}
null_ls.setup({
sources = sources,
on_attach = config.on_attach,
root_dir = config.root_dir,
})
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({map_char = {tex = ""}}))
-- ooooo .oooooo..o ooooooooo. ooooo . oooo oooo
-- `888' d8P' `Y8 `888 `Y88. `888' .o8 `888 `888
-- 888 Y88bo. 888 .d88' 888 ooo. .oo. .oooo.o .o888oo .oooo. 888 888 .ooooo. oooo d8b
-- 888 `"Y8888o. 888ooo88P' 888 `888P"Y88b d88( "8 888 `P )88b 888 888 d88' `88b `888""8P
-- 888 `"Y88b 888 888 888 888 `"Y88b. 888 .oP"888 888 888 888ooo888 888
-- 888 o oo .d8P 888 888 888 888 o. )88b 888 . d8( 888 888 888 888 .o 888
-- o888ooooood8 8""88888P' o888o o888o o888o o888o 8""888P' "888" `Y888""8o o888o o888o `Y8bod8P' d888b
--------------------
-- NVIM-AUTOPAIRS --
--------------------
--require("nvim-autopairs").setup {}
--
---- you need setup cmp first put this after cmp.setup()
--require("nvim-autopairs.completion.cmp").setup(
-- {
-- map_cr = true, -- map <CR> on insert mode
-- map_complete = true, -- it will auto insert `(` (map_char) after select function or method item
-- auto_select = true, -- automatically select the first item
-- insert = false, -- use insert confirm behavior instead of replace
-- map_char = {
-- -- modifies the function or method delimiter by filetypes
-- all = "(",
-- tex = "{"
-- }
-- }
--)
------------------------
-- NVIM-LSP-INSTALLER --
------------------------
-- Use an on_attach function to only map the following keys
-- after the language server attaches to the current buffer
local common_on_attach = function(client, bufnr)
local function buf_set_keymap(...)
vim.api.nvim_buf_set_keymap(bufnr, ...)
end
local function buf_set_option(...)
vim.api.nvim_buf_set_option(bufnr, ...)
end
--client.resolved_capabilities.document_formatting = false
--client.resolved_capabilities.document_range_formatting = false
-- Enable completion triggered by <c-x><c-o>
buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
-- Mappings.
local opts = {noremap = true, silent = true}
-- See `:help vim.lsp.*` for documentation on any of the below functions
--buf_set_keymap("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
buf_set_keymap("n", "<space>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
buf_set_keymap("n", "<space>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
buf_set_keymap("n", "<space>e", "<cmd>lua vim.diagnostic.show_line_diagnostics()<CR>", opts)
buf_set_keymap("n", "<space>F", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
buf_set_keymap("n", "<space>q", "<cmd>lua vim.diagnostic.set_loclist()<CR>", opts)
buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
buf_set_keymap("n", "<space>wa", "<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>", opts)
buf_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
buf_set_keymap("n", "<space>wr", "<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>", opts)
buf_set_keymap("n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
buf_set_keymap("n", "<C-[>", "<cmd>lua vim.diagnostic.goto_prev({wrap = true})<CR>", opts)
buf_set_keymap("n", "<C-]>", "<cmd>lua vim.diagnostic.goto_next({wrap = true})<CR>", opts)
buf_set_keymap("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
buf_set_keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
buf_set_keymap("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
end
-- enable null-ls integration (optional)
-- lspconfig integration is deprecated; pass options to setup instead
--require("null-ls").config {}
require("null-ls").setup {
on_attach = common_on_attach,
--}
--require("lspconfig")["null-ls"].setup {
handlers = {
["textDocument/publishDiagnostics"] = vim.lsp.with(
vim.lsp.diagnostic.on_publish_diagnostics,
{
virtual_text = false
}
)
}
}
local tsserver_on_attach = function(client, bufnr)
local on_attach_tsserver = function(client, bufnr)
local ts_utils = require("nvim-lsp-ts-utils")
ts_utils.setup {
ts_utils.setup({
eslint_bin = "eslint_d",
eslint_enable_diagnostics = true,
eslint_enable_code_actions = true,
enable_import_on_completion = true,
filter_out_diagnostics_by_severity = {
"information",
"hint"
"hint",
--"warning",
--"error",
}
}
},
})
ts_utils.setup_client(client)
-- no default maps, so you may want to define some here
local o = {silent = true}
local o = { silent = true }
vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize<CR>", o)
vim.api.nvim_buf_set_keymap(bufnr, "n", "rN", ":TSLspRenameFile<CR>", o)
vim.api.nvim_buf_set_keymap(bufnr, "n", "gI", ":TSLspImportAll<CR>", o)
common_on_attach(client, bufnr)
end
require("nvim-lsp-installer").on_server_ready(
function(server)
require("nvim-lsp-installer").on_server_ready(function(server)
--Enable (broadcasting) snippet capability for completion
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
local disable_diag = {
["textDocument/publishDiagnostics"] = function() end,
}
local on_attach_generic = function(client, bufnr)
-- Disables document formatting by lsp
client.resolved_capabilities.document_formatting = false
client.resolved_capabilities.document_range_formatting = false
config.on_attach(client, bufnr)
end
local opts = {
on_attach = common_on_attach,
on_attach = on_attach_generic,
capabilities = capabilities,
flags = {
debounce_text_changes = 150
debounce_text_changes = 150,
},
settings = {
format = {enable = true}
format = { enable = true },
},
handlers = {
["textDocument/publishDiagnostics"] = vim.lsp.with(
vim.lsp.diagnostic.on_publish_diagnostics,
{
virtual_text = false
root_dir = config.root_dir,
}
)
}
}
--local vscode_servers = {html = "html", jsonls = "json", cssls = "css"}
--local lang = vscode_servers[server.name]
--if lang ~= nil then
-- opts.cmd = {("vscode-" .. lang .. "-language-server"), "--stdio"}
--end
if server.name == "tsserver" then
opts.on_attach = tsserver_on_attach
opts.on_attach = function(...)
on_attach_tsserver(...)
on_attach_generic(...)
end
elseif server.name == "sumneko_lua" then
opts.settings.Lua = {
diagnostics = {
globals = {
-- neovim
"vim",
-- awesome
"awesome",
"client"
}
}
}
elseif server.name == "diagnosticls" then
opts = {
filetypes = {"python"},
init_options = {
formatters = {
black = {
command = "black",
args = {"--quiet", "-"},
rootPatterns = {"pyproject.toml", "setup.cfg"}
"client",
},
},
formatFiletypes = {
python = {"black"}
}
}
}
}
end
server:setup(opts)
vim.cmd [[do User LspAttachBuffers]]
end
)
vim.cmd([[do User LspAttachBuffers]])
end)
local lsp_installer_servers = require("nvim-lsp-installer.servers")
local auto_servers = {
"pylsp",
--"pylsp",
--"pyright",
"sumneko_lua",
"tsserver",
@@ -291,10 +274,13 @@ local auto_servers = {
"html",
"cssls",
"jsonls",
"omnisharp",
"eslint"
--"diagnosticls"
--"eslintls"
--"omnisharp",
"ltex",
"jedi_language_server",
"vuels",
"svelte",
"gopls",
"golangci_lint_ls",
}
for _, s in ipairs(auto_servers) do
lua/packer_check.lua
+3 -3
View File
@@ -2,7 +2,7 @@ local fn = vim.fn
local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
if fn.empty(fn.glob(install_path)) > 0 then
fn.system({"git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path})
vim.cmd "packadd packer.nvim"
vim.cmd ":PackerSync"
fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
vim.cmd("packadd packer.nvim")
vim.cmd(":PackerSync")
end
lua/plugins.lua
+48 -49
View File
@@ -1,21 +1,20 @@
local use = require("packer").use
require("packer").startup(
function()
use "wbthomason/packer.nvim"
require("packer").startup(function()
use("wbthomason/packer.nvim")
-- OPENAI CODEX
--use "tom-doerr/vim_codex"
-- NAVIGATION
use {
use({
"phaazon/hop.nvim",
--branch = "v1.2", -- optional but strongly recommended
config = function()
-- you can configure Hop the way you like here; see :h hop-config
require "hop".setup {keys = "etovxqpdygfblzhckisuran"}
end
}
require("hop").setup({ keys = "etovxqpdygfblzhckisuran" })
end,
})
--use {
-- "phaazon/hop.nvim",
-- as = "hop",
@@ -31,74 +30,74 @@ require("packer").startup(
-- VIM THEMING
--use "rafi/awesome-vim-colorschemes" -- vim themes
use "navarasu/onedark.nvim"
use "projekt0n/github-nvim-theme"
use "wojciechkepka/vim-github-dark"
use "folke/tokyonight.nvim"
use("navarasu/onedark.nvim")
use("projekt0n/github-nvim-theme")
use("wojciechkepka/vim-github-dark")
use("folke/tokyonight.nvim")
-- FILE MANAGEMENT
use "junegunn/fzf"
use "junegunn/fzf.vim"
use "rbgrouleff/bclose.vim"
use "francoiscabrol/ranger.vim"
use "vijaymarupudi/nvim-fzf"
use "vijaymarupudi/nvim-fzf-commands"
use {"tpope/vim-obsession"}
use("junegunn/fzf")
use("junegunn/fzf.vim")
use("rbgrouleff/bclose.vim")
use("francoiscabrol/ranger.vim")
use("vijaymarupudi/nvim-fzf")
use("vijaymarupudi/nvim-fzf-commands")
use({ "tpope/vim-obsession" })
-- GIT
use "tpope/vim-fugitive"
use "stsewd/fzf-checkout.vim"
use("tpope/vim-fugitive")
use("stsewd/fzf-checkout.vim")
-- AIRLINE
use {
use({
"nvim-lualine/lualine.nvim",
requires = {"kyazdani42/nvim-web-devicons", opt = true}
}
requires = { "kyazdani42/nvim-web-devicons", opt = true },
})
-- EDITOR
use "windwp/nvim-autopairs"
use("windwp/nvim-autopairs")
--use "jiangmiao/auto-pairs"
use "dense-analysis/ale"
--use "dense-analysis/ale"
--use "nathanmsmith/nvim-ale-diagnostic"
use "turbio/bracey.vim"
use "lukas-reineke/indent-blankline.nvim"
use("turbio/bracey.vim")
use("lukas-reineke/indent-blankline.nvim")
--use "sheerun/vim-polyglot"
-- SNIPPETS
use "SirVer/ultisnips"
use "honza/vim-snippets"
use("SirVer/ultisnips")
use("honza/vim-snippets")
-- LSP
use "hrsh7th/nvim-cmp" -- Autocompletion plugin
use("hrsh7th/nvim-cmp") -- Autocompletion plugin
--use "saadparwaiz1/cmp_luasnip" -- Snippets source for nvim-cmp
use {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}
use "neovim/nvim-lspconfig" -- Collection of configurations for built-in LSP client
use "williamboman/nvim-lsp-installer"
use {
use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" })
use("neovim/nvim-lspconfig") -- Collection of configurations for built-in LSP client
use("williamboman/nvim-lsp-installer")
use({
"hrsh7th/cmp-nvim-lsp",
requires = "quangnguyen30192/cmp-nvim-ultisnips"
} -- LSP source for nvim-cmp
requires = "quangnguyen30192/cmp-nvim-ultisnips",
}) -- LSP source for nvim-cmp
use "nvim-lua/plenary.nvim"
use "jose-elias-alvarez/nvim-lsp-ts-utils"
use "jose-elias-alvarez/null-ls.nvim"
use("nvim-lua/plenary.nvim")
use("jose-elias-alvarez/nvim-lsp-ts-utils")
use("jose-elias-alvarez/null-ls.nvim")
use "ThePrimeagen/harpoon"
use("ThePrimeagen/harpoon")
use "L3MON4D3/LuaSnip" -- Snippets plugin
use("L3MON4D3/LuaSnip") -- Snippets plugin
-- JS
use "HerringtonDarkholme/yats.vim"
use "chemzqm/vim-jsx-improve"
use "yuezk/vim-js" -- js
use "maxmellon/vim-jsx-pretty" -- react/tsx syntax highlight & indent
use("HerringtonDarkholme/yats.vim")
use("chemzqm/vim-jsx-improve")
use("yuezk/vim-js") -- js
use("maxmellon/vim-jsx-pretty") -- react/tsx syntax highlight & indent
--use "leafOfTree/vim-vue-plugin" -- vue syntax highlight & indent
-- PYTHON
--use {"numirias/semshi", run = ":UpdateRemotePlugins"} -- python
use "Vimjas/vim-python-pep8-indent"
use("Vimjas/vim-python-pep8-indent")
--use("petobens/poet-v")
-- HTML/CSS
use "mattn/emmet-vim"
end
)
use("mattn/emmet-vim")
end)
lua/save_buffer_position.lua
+2 -2
View File
@@ -1,4 +1,4 @@
vim.cmd [[
vim.cmd([[
" https://vim.fandom.com/wiki/Avoid_scrolling_when_switch_buffers
" Save current view settings on a per-window, per-buffer basis.
@@ -27,4 +27,4 @@ vim.cmd [[
autocmd BufLeave * call AutoSaveWinView()
autocmd BufEnter * call AutoRestoreWinView()
]]
]])