mirror of
https://mzte.de/git/LordMZTE/dotfiles.git
synced 2025-01-05 17:53:41 +01:00
update nvim config
This commit is contained in:
parent
438a79330f
commit
c4eeb91e62
12 changed files with 436 additions and 441 deletions
|
@ -51,5 +51,6 @@
|
|||
}
|
||||
},
|
||||
"java.format.enabled": true,
|
||||
"java.format.onType.enabled": true
|
||||
"java.format.onType.enabled": true,
|
||||
"sumneko-lua.enableNvimLuaDev": true
|
||||
}
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
require("plugins")
|
||||
require("settings")
|
||||
require("maps")
|
||||
|
||||
|
|
|
@ -1,32 +1,32 @@
|
|||
map = vim.api.nvim_set_keymap
|
||||
|
||||
function escape_keycode(keycode)
|
||||
return vim.api.nvim_replace_termcodes(keycode, true, true, true)
|
||||
return vim.api.nvim_replace_termcodes(keycode, true, true, true)
|
||||
end
|
||||
|
||||
local function check_back_space()
|
||||
local col = vim.fn.col(".") - 1
|
||||
return col <= 0 or vim.fn.getline("."):sub(col, col):match("%s")
|
||||
local col = vim.fn.col(".") - 1
|
||||
return col <= 0 or vim.fn.getline("."):sub(col, col):match("%s")
|
||||
end
|
||||
|
||||
function tab_completion()
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return escape_keycode("<C-n>")
|
||||
end
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return escape_keycode("<C-n>")
|
||||
end
|
||||
|
||||
if check_back_space() then
|
||||
return escape_keycode("<TAB>")
|
||||
end
|
||||
if check_back_space() then
|
||||
return escape_keycode("<TAB>")
|
||||
end
|
||||
|
||||
return vim.fn["coc#refresh"]()
|
||||
return vim.fn["coc#refresh"]()
|
||||
end
|
||||
|
||||
function shift_tab_completion()
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return escape_keycode("<C-p>")
|
||||
else
|
||||
return escape_keycode("<C-h>")
|
||||
end
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return escape_keycode("<C-p>")
|
||||
else
|
||||
return escape_keycode("<C-h>")
|
||||
end
|
||||
end
|
||||
|
||||
-- Getting stuck in ~~vim~~ terminal
|
||||
|
@ -41,13 +41,13 @@ map("n", "<C-Down>", "5j", { noremap = true })
|
|||
map("n", "<C-Up>", "5k", { noremap = true })
|
||||
|
||||
-- Quick pasting/yoinking to system register
|
||||
map("n", "+y", "\"+y", { noremap = true })
|
||||
map("n", "+p", "\"+p", { noremap = true })
|
||||
map("n", "+d", "\"+d", { noremap = true })
|
||||
map("n", "+y", '"+y', { noremap = true })
|
||||
map("n", "+p", '"+p', { noremap = true })
|
||||
map("n", "+d", '"+d', { noremap = true })
|
||||
|
||||
map("n", "*y", "\"*y", { noremap = true })
|
||||
map("n", "*p", "\"*p", { noremap = true })
|
||||
map("n", "*d", "\"*d", { noremap = true })
|
||||
map("n", "*y", '"*y', { noremap = true })
|
||||
map("n", "*p", '"*p', { noremap = true })
|
||||
map("n", "*d", '"*d', { noremap = true })
|
||||
|
||||
map("i", "<TAB>", "v:lua.tab_completion()", { expr = true })
|
||||
map("i", "<S-TAB>", "v:lua.shift_tab_completion()", { expr = true })
|
||||
|
@ -66,13 +66,13 @@ map("n", "gi", "<Plug>(coc-implementation)", { silent = true })
|
|||
map("n", "gr", "<Plug>(coc-references)", { silent = true })
|
||||
|
||||
-- Use K to show documentation in preview window.
|
||||
map("n", "K", ":call CocActionAsync(\'doHover\')<CR>", { silent = true })
|
||||
map("n", "K", ":call CocActionAsync('doHover')<CR>", { silent = true })
|
||||
|
||||
-- use space o to show symbols
|
||||
map("n", "<space>o", ":CocList -I symbols<CR>", { silent = true })
|
||||
|
||||
-- format code
|
||||
map("n", "-r", ":call CocActionAsync(\'format\')<CR>", { silent = true })
|
||||
map("n", "-r", ":call CocActionAsync('format')<CR>", { silent = true })
|
||||
|
||||
-- Use <c-space> to trigger completion.
|
||||
map("i", "<c-space>", "coc#refresh()", { silent = true, expr = true })
|
||||
|
|
|
@ -1,48 +1,48 @@
|
|||
coc = {}
|
||||
|
||||
vim.g.coc_global_extensions = {
|
||||
"coc-clangd",
|
||||
"coc-fish",
|
||||
"coc-go",
|
||||
"coc-haxe",
|
||||
"coc-java",
|
||||
"coc-json",
|
||||
"coc-kotlin",
|
||||
"coc-sumneko-lua",
|
||||
"coc-rust-analyzer",
|
||||
"coc-snippets",
|
||||
"coc-toml",
|
||||
"coc-clangd",
|
||||
"coc-fish",
|
||||
"coc-go",
|
||||
"coc-haxe",
|
||||
"coc-java",
|
||||
"coc-json",
|
||||
"coc-kotlin",
|
||||
"coc-rust-analyzer",
|
||||
"coc-snippets",
|
||||
"coc-sumneko-lua",
|
||||
"coc-toml",
|
||||
}
|
||||
|
||||
local function check_back_space()
|
||||
local col = vim.fn.col(".") - 1
|
||||
return col <= 0 or vim.fn.getline("."):sub(col, col):match("%s")
|
||||
local col = vim.fn.col(".") - 1
|
||||
return col <= 0 or vim.fn.getline("."):sub(col, col):match("%s")
|
||||
end
|
||||
|
||||
function coc.tab_completion()
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return escape_keycode("<C-n>")
|
||||
end
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return escape_keycode("<C-n>")
|
||||
end
|
||||
|
||||
if check_back_space() then
|
||||
return escape_keycode("<TAB>")
|
||||
end
|
||||
if check_back_space() then
|
||||
return escape_keycode("<TAB>")
|
||||
end
|
||||
|
||||
return vim.fn["coc#refresh"]()
|
||||
return vim.fn["coc#refresh"]()
|
||||
end
|
||||
|
||||
function coc.shift_tab_completion()
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return escape_keycode("<C-p>")
|
||||
else
|
||||
return escape_keycode("<C-h>")
|
||||
end
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return escape_keycode("<C-p>")
|
||||
else
|
||||
return escape_keycode("<C-h>")
|
||||
end
|
||||
end
|
||||
|
||||
function coc.cr_completion()
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return vim.fn["coc#_select_confirm"]()
|
||||
else
|
||||
return escape_keycode([[\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>]])
|
||||
end
|
||||
if vim.fn.pumvisible() > 0 then
|
||||
return vim.fn["coc#_select_confirm"]()
|
||||
else
|
||||
return escape_keycode([[\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>]])
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,15 +1,14 @@
|
|||
local blacklistedSites = {".*twitch\\.tv.*", ".*twitter\\.com.*"}
|
||||
local blacklistedSites = { ".*twitch\\.tv.*", ".*twitter\\.com.*" }
|
||||
|
||||
local localSettings = {
|
||||
[".*"] = {
|
||||
cmdline = "neovim"
|
||||
}
|
||||
[".*"] = {
|
||||
cmdline = "neovim",
|
||||
},
|
||||
}
|
||||
for _, site in pairs(blacklistedSites) do
|
||||
localSettings[site] = { takeover = "never" }
|
||||
localSettings[site] = { takeover = "never" }
|
||||
end
|
||||
|
||||
vim.g.firenvim_config = {
|
||||
localSettings = localSettings
|
||||
localSettings = localSettings,
|
||||
}
|
||||
|
||||
|
|
|
@ -5,112 +5,112 @@ local gls = gl.section
|
|||
local extension = require("galaxyline.provider_extensions")
|
||||
|
||||
gl.short_line_list = {
|
||||
"LuaTree",
|
||||
"vista",
|
||||
"dbui",
|
||||
"startify",
|
||||
"term",
|
||||
"nerdtree",
|
||||
"fugitive",
|
||||
"fugitiveblame",
|
||||
"plug"
|
||||
"LuaTree",
|
||||
"vista",
|
||||
"dbui",
|
||||
"startify",
|
||||
"term",
|
||||
"nerdtree",
|
||||
"fugitive",
|
||||
"fugitiveblame",
|
||||
"plug",
|
||||
}
|
||||
|
||||
-- VistaPlugin = extension.vista_nearest
|
||||
|
||||
local colors = {
|
||||
bg = "#44475a",
|
||||
line_bg = "#282c34",
|
||||
fg = "#f8f8f2",
|
||||
fg_green = "#65a380",
|
||||
yellow = "#f1fa8c",
|
||||
cyan = "#8be9fd",
|
||||
darkblue = "#081633",
|
||||
green = "#50fa7b",
|
||||
orange = "#ffb86c",
|
||||
purple = "#bd93f9",
|
||||
magenta = "#ff79c6",
|
||||
blue = "#51afef",
|
||||
red = "#ff5555"
|
||||
bg = "#44475a",
|
||||
line_bg = "#282c34",
|
||||
fg = "#f8f8f2",
|
||||
fg_green = "#65a380",
|
||||
yellow = "#f1fa8c",
|
||||
cyan = "#8be9fd",
|
||||
darkblue = "#081633",
|
||||
green = "#50fa7b",
|
||||
orange = "#ffb86c",
|
||||
purple = "#bd93f9",
|
||||
magenta = "#ff79c6",
|
||||
blue = "#51afef",
|
||||
red = "#ff5555",
|
||||
}
|
||||
|
||||
local mode_color = {
|
||||
n = colors.green,
|
||||
i = colors.blue,
|
||||
v = colors.magenta,
|
||||
[""] = colors.blue,
|
||||
V = colors.blue,
|
||||
c = colors.red,
|
||||
no = colors.magenta,
|
||||
s = colors.orange,
|
||||
S = colors.orange,
|
||||
[""] = colors.orange,
|
||||
ic = colors.yellow,
|
||||
R = colors.purple,
|
||||
Rv = colors.purple,
|
||||
cv = colors.red,
|
||||
ce = colors.red,
|
||||
r = colors.cyan,
|
||||
rm = colors.cyan,
|
||||
["r?"] = colors.cyan,
|
||||
["!"] = colors.green,
|
||||
t = colors.green,
|
||||
c = colors.purple,
|
||||
["r?"] = colors.red,
|
||||
["r"] = colors.red,
|
||||
rm = colors.red,
|
||||
R = colors.yellow,
|
||||
Rv = colors.magenta
|
||||
n = colors.green,
|
||||
i = colors.blue,
|
||||
v = colors.magenta,
|
||||
[""] = colors.blue,
|
||||
V = colors.blue,
|
||||
c = colors.red,
|
||||
no = colors.magenta,
|
||||
s = colors.orange,
|
||||
S = colors.orange,
|
||||
[""] = colors.orange,
|
||||
ic = colors.yellow,
|
||||
R = colors.purple,
|
||||
Rv = colors.purple,
|
||||
cv = colors.red,
|
||||
ce = colors.red,
|
||||
r = colors.cyan,
|
||||
rm = colors.cyan,
|
||||
["r?"] = colors.cyan,
|
||||
["!"] = colors.green,
|
||||
t = colors.green,
|
||||
c = colors.purple,
|
||||
["r?"] = colors.red,
|
||||
["r"] = colors.red,
|
||||
rm = colors.red,
|
||||
R = colors.yellow,
|
||||
Rv = colors.magenta,
|
||||
}
|
||||
|
||||
local function lsp_status(status)
|
||||
shorter_stat = ""
|
||||
for match in string.gmatch(status, "[^%s]+") do
|
||||
err_warn = string.find(match, "^[WE]%d+", 0)
|
||||
if not err_warn then
|
||||
shorter_stat = shorter_stat .. " " .. match
|
||||
end
|
||||
end
|
||||
return shorter_stat
|
||||
shorter_stat = ""
|
||||
for match in string.gmatch(status, "[^%s]+") do
|
||||
err_warn = string.find(match, "^[WE]%d+", 0)
|
||||
if not err_warn then
|
||||
shorter_stat = shorter_stat .. " " .. match
|
||||
end
|
||||
end
|
||||
return shorter_stat
|
||||
end
|
||||
|
||||
local function get_coc_lsp()
|
||||
local status = vim.fn["coc#status"]()
|
||||
if not status or status == "" then
|
||||
return ""
|
||||
end
|
||||
return lsp_status(status)
|
||||
local status = vim.fn["coc#status"]()
|
||||
if not status or status == "" then
|
||||
return ""
|
||||
end
|
||||
return lsp_status(status)
|
||||
end
|
||||
|
||||
function get_diagnostic_info()
|
||||
if vim.fn.exists("*coc#rpc#start_server") == 1 then
|
||||
return get_coc_lsp()
|
||||
end
|
||||
return ""
|
||||
if vim.fn.exists("*coc#rpc#start_server") == 1 then
|
||||
return get_coc_lsp()
|
||||
end
|
||||
return ""
|
||||
end
|
||||
|
||||
local function get_current_func()
|
||||
local has_func, func_name = pcall(vim.fn.nvim_buf_get_var, 0, "coc_current_function")
|
||||
if not has_func then
|
||||
return
|
||||
end
|
||||
return func_name
|
||||
local has_func, func_name = pcall(vim.fn.nvim_buf_get_var, 0, "coc_current_function")
|
||||
if not has_func then
|
||||
return
|
||||
end
|
||||
return func_name
|
||||
end
|
||||
|
||||
function get_function_info()
|
||||
if vim.fn.exists("*coc#rpc#start_server") == 1 then
|
||||
return get_current_func()
|
||||
end
|
||||
return ""
|
||||
if vim.fn.exists("*coc#rpc#start_server") == 1 then
|
||||
return get_current_func()
|
||||
end
|
||||
return ""
|
||||
end
|
||||
|
||||
local function trailing_whitespace()
|
||||
local trail = vim.fn.search("\\s$", "nw")
|
||||
if trail ~= 0 then
|
||||
return " "
|
||||
else
|
||||
return nil
|
||||
end
|
||||
local trail = vim.fn.search("\\s$", "nw")
|
||||
if trail ~= 0 then
|
||||
return " "
|
||||
else
|
||||
return nil
|
||||
end
|
||||
end
|
||||
|
||||
CocStatus = get_diagnostic_info
|
||||
|
@ -118,256 +118,255 @@ CocFunc = get_current_func
|
|||
TrailingWhiteSpace = trailing_whitespace
|
||||
|
||||
function has_file_type()
|
||||
local f_type = vim.bo.filetype
|
||||
if not f_type or f_type == "" then
|
||||
return false
|
||||
end
|
||||
return true
|
||||
local f_type = vim.bo.filetype
|
||||
if not f_type or f_type == "" then
|
||||
return false
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
local buffer_not_empty = function()
|
||||
if vim.fn.empty(vim.fn.expand("%:t")) ~= 1 then
|
||||
return true
|
||||
end
|
||||
return false
|
||||
if vim.fn.empty(vim.fn.expand("%:t")) ~= 1 then
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
gls.left[1] = {
|
||||
FirstElement = {
|
||||
provider = function()
|
||||
return " "
|
||||
end,
|
||||
highlight = {colors.blue, colors.line_bg}
|
||||
}
|
||||
FirstElement = {
|
||||
provider = function()
|
||||
return " "
|
||||
end,
|
||||
highlight = { colors.blue, colors.line_bg },
|
||||
},
|
||||
}
|
||||
gls.left[2] = {
|
||||
ViMode = {
|
||||
provider = function()
|
||||
-- auto change color according the vim mode
|
||||
local alias = {
|
||||
n = "NORMAL",
|
||||
i = "INSERT",
|
||||
c = "COMMAND",
|
||||
V = "VISUAL",
|
||||
[""] = "VISUAL",
|
||||
v = "VISUAL",
|
||||
c = "COMMAND-LINE",
|
||||
["r?"] = ":CONFIRM",
|
||||
rm = "--MORE",
|
||||
R = "REPLACE",
|
||||
Rv = "VIRTUAL",
|
||||
s = "SELECT",
|
||||
S = "SELECT",
|
||||
["r"] = "HIT-ENTER",
|
||||
[""] = "SELECT",
|
||||
t = "TERMINAL",
|
||||
["!"] = "SHELL"
|
||||
}
|
||||
local vim_mode = vim.fn.mode()
|
||||
vim.api.nvim_command("hi GalaxyViMode guibg=" .. mode_color[vim_mode])
|
||||
return alias[vim_mode] .. " "
|
||||
end,
|
||||
highlight = {colors.line_bg, colors.line_bg, "bold"}
|
||||
}
|
||||
ViMode = {
|
||||
provider = function()
|
||||
-- auto change color according the vim mode
|
||||
local alias = {
|
||||
n = "NORMAL",
|
||||
i = "INSERT",
|
||||
c = "COMMAND",
|
||||
V = "VISUAL",
|
||||
[""] = "VISUAL",
|
||||
v = "VISUAL",
|
||||
c = "COMMAND-LINE",
|
||||
["r?"] = ":CONFIRM",
|
||||
rm = "--MORE",
|
||||
R = "REPLACE",
|
||||
Rv = "VIRTUAL",
|
||||
s = "SELECT",
|
||||
S = "SELECT",
|
||||
["r"] = "HIT-ENTER",
|
||||
[""] = "SELECT",
|
||||
t = "TERMINAL",
|
||||
["!"] = "SHELL",
|
||||
}
|
||||
local vim_mode = vim.fn.mode()
|
||||
vim.api.nvim_command("hi GalaxyViMode guibg=" .. mode_color[vim_mode])
|
||||
return alias[vim_mode] .. " "
|
||||
end,
|
||||
highlight = { colors.line_bg, colors.line_bg, "bold" },
|
||||
},
|
||||
}
|
||||
gls.left[3] = {
|
||||
ModeSep = {
|
||||
provider = function()
|
||||
vim.api.nvim_command("hi GalaxyModeSep guifg=" .. mode_color[vim.fn.mode()] .. " guibg=" .. colors.bg)
|
||||
return ""
|
||||
end,
|
||||
highlight = {colors.line_bg, colors.line_bg},
|
||||
separator = " ",
|
||||
separator_highlight = {colors.bg, colors.line_bg}
|
||||
}
|
||||
ModeSep = {
|
||||
provider = function()
|
||||
vim.api.nvim_command("hi GalaxyModeSep guifg=" .. mode_color[vim.fn.mode()] .. " guibg=" .. colors.bg)
|
||||
return ""
|
||||
end,
|
||||
highlight = { colors.line_bg, colors.line_bg },
|
||||
separator = " ",
|
||||
separator_highlight = { colors.bg, colors.line_bg },
|
||||
},
|
||||
}
|
||||
gls.left[4] = {
|
||||
FileIcon = {
|
||||
provider = "FileIcon",
|
||||
condition = buffer_not_empty,
|
||||
highlight = {require("galaxyline.provider_fileinfo").get_file_icon_color, colors.line_bg}
|
||||
}
|
||||
FileIcon = {
|
||||
provider = "FileIcon",
|
||||
condition = buffer_not_empty,
|
||||
highlight = { require("galaxyline.provider_fileinfo").get_file_icon_color, colors.line_bg },
|
||||
},
|
||||
}
|
||||
gls.left[5] = {
|
||||
FileName = {
|
||||
provider = {"FileName", "FileSize"},
|
||||
condition = buffer_not_empty,
|
||||
highlight = {colors.fg, colors.line_bg, "bold"}
|
||||
}
|
||||
FileName = {
|
||||
provider = { "FileName", "FileSize" },
|
||||
condition = buffer_not_empty,
|
||||
highlight = { colors.fg, colors.line_bg, "bold" },
|
||||
},
|
||||
}
|
||||
|
||||
gls.left[6] = {
|
||||
GitIcon = {
|
||||
provider = function()
|
||||
return " "
|
||||
end,
|
||||
condition = require("galaxyline.provider_vcs").check_git_workspace,
|
||||
highlight = {colors.orange, colors.line_bg}
|
||||
}
|
||||
GitIcon = {
|
||||
provider = function()
|
||||
return " "
|
||||
end,
|
||||
condition = require("galaxyline.provider_vcs").check_git_workspace,
|
||||
highlight = { colors.orange, colors.line_bg },
|
||||
},
|
||||
}
|
||||
gls.left[7] = {
|
||||
GitBranch = {
|
||||
provider = "GitBranch",
|
||||
condition = require("galaxyline.provider_vcs").check_git_workspace,
|
||||
highlight = {"#8FBCBB", colors.line_bg, "bold"}
|
||||
}
|
||||
GitBranch = {
|
||||
provider = "GitBranch",
|
||||
condition = require("galaxyline.provider_vcs").check_git_workspace,
|
||||
highlight = { "#8FBCBB", colors.line_bg, "bold" },
|
||||
},
|
||||
}
|
||||
|
||||
local checkwidth = function()
|
||||
local squeeze_width = vim.fn.winwidth(0) / 2
|
||||
if squeeze_width > 40 then
|
||||
return true
|
||||
end
|
||||
return false
|
||||
local squeeze_width = vim.fn.winwidth(0) / 2
|
||||
if squeeze_width > 40 then
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
gls.left[8] = {
|
||||
DiffAdd = {
|
||||
provider = "DiffAdd",
|
||||
condition = checkwidth,
|
||||
icon = " ",
|
||||
highlight = {colors.green, colors.line_bg}
|
||||
}
|
||||
DiffAdd = {
|
||||
provider = "DiffAdd",
|
||||
condition = checkwidth,
|
||||
icon = " ",
|
||||
highlight = { colors.green, colors.line_bg },
|
||||
},
|
||||
}
|
||||
gls.left[9] = {
|
||||
DiffModified = {
|
||||
provider = "DiffModified",
|
||||
condition = checkwidth,
|
||||
icon = " ",
|
||||
highlight = {colors.orange, colors.line_bg}
|
||||
}
|
||||
DiffModified = {
|
||||
provider = "DiffModified",
|
||||
condition = checkwidth,
|
||||
icon = " ",
|
||||
highlight = { colors.orange, colors.line_bg },
|
||||
},
|
||||
}
|
||||
gls.left[10] = {
|
||||
DiffRemove = {
|
||||
provider = "DiffRemove",
|
||||
condition = checkwidth,
|
||||
icon = " ",
|
||||
highlight = {colors.red, colors.line_bg}
|
||||
}
|
||||
DiffRemove = {
|
||||
provider = "DiffRemove",
|
||||
condition = checkwidth,
|
||||
icon = " ",
|
||||
highlight = { colors.red, colors.line_bg },
|
||||
},
|
||||
}
|
||||
gls.left[11] = {
|
||||
LeftEnd = {
|
||||
provider = function()
|
||||
return ""
|
||||
end,
|
||||
highlight = {colors.line_bg, colors.bg},
|
||||
}
|
||||
LeftEnd = {
|
||||
provider = function()
|
||||
return ""
|
||||
end,
|
||||
highlight = { colors.line_bg, colors.bg },
|
||||
},
|
||||
}
|
||||
|
||||
gls.left[12] = {
|
||||
TrailingWhiteSpace = {
|
||||
provider = TrailingWhiteSpace,
|
||||
icon = " ",
|
||||
highlight = {colors.yellow, colors.bg}
|
||||
}
|
||||
TrailingWhiteSpace = {
|
||||
provider = TrailingWhiteSpace,
|
||||
icon = " ",
|
||||
highlight = { colors.yellow, colors.bg },
|
||||
},
|
||||
}
|
||||
|
||||
gls.left[13] = {
|
||||
DiagnosticError = {
|
||||
provider = "DiagnosticError",
|
||||
icon = " ",
|
||||
highlight = {colors.red, colors.bg}
|
||||
}
|
||||
DiagnosticError = {
|
||||
provider = "DiagnosticError",
|
||||
icon = " ",
|
||||
highlight = { colors.red, colors.bg },
|
||||
},
|
||||
}
|
||||
gls.left[14] = {
|
||||
Space = {
|
||||
provider = function()
|
||||
return " "
|
||||
end,
|
||||
highlight = {colors.bg, colors.bg}
|
||||
}
|
||||
Space = {
|
||||
provider = function()
|
||||
return " "
|
||||
end,
|
||||
highlight = { colors.bg, colors.bg },
|
||||
},
|
||||
}
|
||||
gls.left[15] = {
|
||||
DiagnosticWarn = {
|
||||
provider = "DiagnosticWarn",
|
||||
icon = " ",
|
||||
highlight = {colors.yellow, colors.bg}
|
||||
}
|
||||
DiagnosticWarn = {
|
||||
provider = "DiagnosticWarn",
|
||||
icon = " ",
|
||||
highlight = { colors.yellow, colors.bg },
|
||||
},
|
||||
}
|
||||
|
||||
gls.left[16] = {
|
||||
CocStatus = {
|
||||
provider = CocStatus,
|
||||
highlight = {colors.green, colors.bg},
|
||||
icon = " 🗱"
|
||||
}
|
||||
CocStatus = {
|
||||
provider = CocStatus,
|
||||
highlight = { colors.green, colors.bg },
|
||||
icon = " 🗱",
|
||||
},
|
||||
}
|
||||
|
||||
gls.left[17] = {
|
||||
CocFunc = {
|
||||
provider = CocFunc,
|
||||
icon = " λ ",
|
||||
highlight = {colors.yellow, colors.bg}
|
||||
}
|
||||
CocFunc = {
|
||||
provider = CocFunc,
|
||||
icon = " λ ",
|
||||
highlight = { colors.yellow, colors.bg },
|
||||
},
|
||||
}
|
||||
|
||||
gls.right[1] = {
|
||||
BufferType = {
|
||||
provider = "FileTypeName",
|
||||
separator = "",
|
||||
condition = has_file_type,
|
||||
separator_highlight = {colors.line_bg, colors.bg},
|
||||
highlight = {colors.fg, colors.line_bg}
|
||||
}
|
||||
BufferType = {
|
||||
provider = "FileTypeName",
|
||||
separator = "",
|
||||
condition = has_file_type,
|
||||
separator_highlight = { colors.line_bg, colors.bg },
|
||||
highlight = { colors.fg, colors.line_bg },
|
||||
},
|
||||
}
|
||||
|
||||
gls.right[2] = {
|
||||
TypeSep = {
|
||||
provider = function()
|
||||
return ""
|
||||
end,
|
||||
highlight = {colors.bg, colors.line_bg}
|
||||
}
|
||||
TypeSep = {
|
||||
provider = function()
|
||||
return ""
|
||||
end,
|
||||
highlight = { colors.bg, colors.line_bg },
|
||||
},
|
||||
}
|
||||
|
||||
gls.right[3] = {
|
||||
FileFormat = {
|
||||
provider = "FileFormat",
|
||||
separator = "",
|
||||
separator_highlight = {colors.line_bg, colors.bg},
|
||||
highlight = {colors.fg, colors.line_bg, "bold"}
|
||||
}
|
||||
FileFormat = {
|
||||
provider = "FileFormat",
|
||||
separator = "",
|
||||
separator_highlight = { colors.line_bg, colors.bg },
|
||||
highlight = { colors.fg, colors.line_bg, "bold" },
|
||||
},
|
||||
}
|
||||
|
||||
gls.right[4] = {
|
||||
LineInfo = {
|
||||
provider = "LineColumn",
|
||||
separator = " |",
|
||||
separator_highlight = {colors.blue, colors.line_bg},
|
||||
highlight = {colors.fg, colors.line_bg}
|
||||
}
|
||||
LineInfo = {
|
||||
provider = "LineColumn",
|
||||
separator = " |",
|
||||
separator_highlight = { colors.blue, colors.line_bg },
|
||||
highlight = { colors.fg, colors.line_bg },
|
||||
},
|
||||
}
|
||||
gls.right[5] = {
|
||||
PerCent = {
|
||||
provider = "LinePercent",
|
||||
highlight = {colors.cyan, colors.darkblue, "bold"}
|
||||
}
|
||||
PerCent = {
|
||||
provider = "LinePercent",
|
||||
highlight = { colors.cyan, colors.darkblue, "bold" },
|
||||
},
|
||||
}
|
||||
|
||||
gls.right[6] = {
|
||||
ScrollBar = {
|
||||
provider = 'ScrollBar',
|
||||
highlight = {colors.blue,colors.purple},
|
||||
}
|
||||
ScrollBar = {
|
||||
provider = "ScrollBar",
|
||||
highlight = { colors.blue, colors.purple },
|
||||
},
|
||||
}
|
||||
|
||||
gls.short_line_left[1] = {
|
||||
BufferType = {
|
||||
provider = "FileTypeName",
|
||||
separator = "",
|
||||
condition = has_file_type,
|
||||
separator_highlight = {colors.purple, colors.bg},
|
||||
highlight = {colors.fg, colors.purple}
|
||||
}
|
||||
BufferType = {
|
||||
provider = "FileTypeName",
|
||||
separator = "",
|
||||
condition = has_file_type,
|
||||
separator_highlight = { colors.purple, colors.bg },
|
||||
highlight = { colors.fg, colors.purple },
|
||||
},
|
||||
}
|
||||
|
||||
gls.short_line_right[1] = {
|
||||
BufferIcon = {
|
||||
provider = "BufferIcon",
|
||||
separator = "",
|
||||
condition = has_file_type,
|
||||
separator_highlight = {colors.purple, colors.bg},
|
||||
highlight = {colors.fg, colors.purple}
|
||||
}
|
||||
BufferIcon = {
|
||||
provider = "BufferIcon",
|
||||
separator = "",
|
||||
condition = has_file_type,
|
||||
separator_highlight = { colors.purple, colors.bg },
|
||||
highlight = { colors.fg, colors.purple },
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
local pears = require "pears"
|
||||
local pears = require("pears")
|
||||
|
||||
pears.setup(function(conf)
|
||||
conf.preset "tag_matching"
|
||||
conf.preset("tag_matching")
|
||||
|
||||
conf.on_enter(function(pears_handle)
|
||||
if vim.fn.pumvisible() == 1 then
|
||||
return vim.fn["coc#_select_confirm"]()
|
||||
else
|
||||
pears_handle()
|
||||
end
|
||||
end)
|
||||
conf.on_enter(function(pears_handle)
|
||||
if vim.fn.pumvisible() == 1 then
|
||||
return vim.fn["coc#_select_confirm"]()
|
||||
else
|
||||
pears_handle()
|
||||
end
|
||||
end)
|
||||
end)
|
||||
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
require 'nvim-tree'.setup {
|
||||
-- don't open tree when using firenvim
|
||||
open_on_setup = not vim.g.started_by_firenvim,
|
||||
auto_close = true,
|
||||
diagnostics = {
|
||||
enable = true,
|
||||
},
|
||||
view = {
|
||||
auto_resize = true,
|
||||
},
|
||||
}
|
||||
|
||||
require("nvim-tree").setup({
|
||||
-- don't open tree when using firenvim
|
||||
open_on_setup = not vim.g.started_by_firenvim,
|
||||
auto_close = true,
|
||||
diagnostics = {
|
||||
enable = true,
|
||||
},
|
||||
view = {
|
||||
auto_resize = true,
|
||||
},
|
||||
})
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
require("telescope").setup {
|
||||
defaults = {
|
||||
vimgrep_arguments = {
|
||||
'rg',
|
||||
'--color=never',
|
||||
'--no-heading',
|
||||
'--with-filename',
|
||||
'--line-number',
|
||||
'--column',
|
||||
'--smart-case'
|
||||
}
|
||||
}
|
||||
}
|
||||
require("telescope").setup({
|
||||
defaults = {
|
||||
vimgrep_arguments = {
|
||||
"rg",
|
||||
"--color=never",
|
||||
"--no-heading",
|
||||
"--with-filename",
|
||||
"--line-number",
|
||||
"--column",
|
||||
"--smart-case",
|
||||
},
|
||||
},
|
||||
})
|
||||
|
|
|
@ -1,21 +1,20 @@
|
|||
local configs = require "nvim-treesitter.configs"
|
||||
local parsers = require "nvim-treesitter.parsers"
|
||||
local configs = require("nvim-treesitter.configs")
|
||||
local parsers = require("nvim-treesitter.parsers")
|
||||
|
||||
local parser_config = parsers.get_parser_configs()
|
||||
|
||||
parser_config.haxe = {
|
||||
install_info = {
|
||||
url = "https://github.com/vantreeseba/tree-sitter-haxe",
|
||||
files = {"src/parser.c"},
|
||||
branch = "main"
|
||||
},
|
||||
filetype = "haxe"
|
||||
}
|
||||
|
||||
configs.setup {
|
||||
ensure_installed = { "haxe" },
|
||||
highlight = {
|
||||
enable = true
|
||||
}
|
||||
install_info = {
|
||||
url = "https://github.com/vantreeseba/tree-sitter-haxe",
|
||||
files = { "src/parser.c" },
|
||||
branch = "main",
|
||||
},
|
||||
filetype = "haxe",
|
||||
}
|
||||
|
||||
configs.setup({
|
||||
ensure_installed = { "haxe" },
|
||||
highlight = {
|
||||
enable = true,
|
||||
},
|
||||
})
|
||||
|
|
|
@ -1,79 +1,80 @@
|
|||
vim.cmd [[packadd packer.nvim]]
|
||||
vim.cmd([[packadd packer.nvim]])
|
||||
|
||||
local function pconf(plugin)
|
||||
return "require(\"pluginconf." .. plugin .. "\")"
|
||||
return 'require("pluginconf.' .. plugin .. '")'
|
||||
end
|
||||
|
||||
return require("packer").startup(function(use)
|
||||
use "wbthomason/packer.nvim"
|
||||
use("wbthomason/packer.nvim")
|
||||
|
||||
use {
|
||||
"neoclide/coc.nvim",
|
||||
branch = "release",
|
||||
config = pconf("coc")
|
||||
}
|
||||
use "ryanoasis/vim-devicons"
|
||||
use {
|
||||
"cespare/vim-toml",
|
||||
branch = "main"
|
||||
}
|
||||
use {
|
||||
"dracula/vim",
|
||||
as = "dracula"
|
||||
}
|
||||
use "vimwiki/vimwiki"
|
||||
use {
|
||||
"glacambre/firenvim",
|
||||
run = function() vim.fn["firenvim#install"](0) end,
|
||||
config = pconf("firenvim")
|
||||
}
|
||||
use "airblade/vim-gitgutter"
|
||||
use "dag/vim-fish"
|
||||
use "uiiaoo/java-syntax.vim"
|
||||
use "honza/vim-snippets"
|
||||
use "sheerun/vim-polyglot"
|
||||
use {
|
||||
"glepnir/galaxyline.nvim",
|
||||
branch = "main",
|
||||
config = pconf("galaxyline")
|
||||
}
|
||||
use {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
run = ":TSUpdate",
|
||||
config = pconf("treesitter")
|
||||
}
|
||||
use {
|
||||
"euclio/vim-markdown-composer",
|
||||
run = "cargo build --release",
|
||||
config = pconf("markdowncomposer")
|
||||
}
|
||||
use({
|
||||
"neoclide/coc.nvim",
|
||||
branch = "release",
|
||||
config = pconf("coc"),
|
||||
})
|
||||
use("ryanoasis/vim-devicons")
|
||||
use({
|
||||
"cespare/vim-toml",
|
||||
branch = "main",
|
||||
})
|
||||
use({
|
||||
"dracula/vim",
|
||||
as = "dracula",
|
||||
})
|
||||
use("vimwiki/vimwiki")
|
||||
use({
|
||||
"glacambre/firenvim",
|
||||
run = function()
|
||||
vim.fn["firenvim#install"](0)
|
||||
end,
|
||||
config = pconf("firenvim"),
|
||||
})
|
||||
use("airblade/vim-gitgutter")
|
||||
use("dag/vim-fish")
|
||||
use("uiiaoo/java-syntax.vim")
|
||||
use("honza/vim-snippets")
|
||||
use("sheerun/vim-polyglot")
|
||||
use({
|
||||
"glepnir/galaxyline.nvim",
|
||||
branch = "main",
|
||||
config = pconf("galaxyline"),
|
||||
})
|
||||
use({
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
run = ":TSUpdate",
|
||||
config = pconf("treesitter"),
|
||||
})
|
||||
use({
|
||||
"euclio/vim-markdown-composer",
|
||||
run = "cargo build --release",
|
||||
config = pconf("markdowncomposer"),
|
||||
})
|
||||
|
||||
use "kassio/neoterm"
|
||||
use("kassio/neoterm")
|
||||
|
||||
use "kyazdani42/nvim-web-devicons"
|
||||
use("kyazdani42/nvim-web-devicons")
|
||||
|
||||
use {
|
||||
'kyazdani42/nvim-tree.lua',
|
||||
requires = 'kyazdani42/nvim-web-devicons',
|
||||
config = pconf("nvimtree")
|
||||
}
|
||||
use({
|
||||
"kyazdani42/nvim-tree.lua",
|
||||
requires = "kyazdani42/nvim-web-devicons",
|
||||
config = pconf("nvimtree"),
|
||||
})
|
||||
|
||||
use {
|
||||
"TimUntersberger/neogit",
|
||||
requires = "nvim-lua/plenary.nvim"
|
||||
}
|
||||
use({
|
||||
"TimUntersberger/neogit",
|
||||
requires = "nvim-lua/plenary.nvim",
|
||||
})
|
||||
|
||||
use "ron-rs/ron.vim"
|
||||
use("ron-rs/ron.vim")
|
||||
|
||||
use {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
requires = "nvim-lua/plenary.nvim",
|
||||
config = pconf("telescope")
|
||||
}
|
||||
use "gluon-lang/vim-gluon"
|
||||
use {
|
||||
"steelsojka/pears.nvim",
|
||||
config = pconf("nvim_pears")
|
||||
}
|
||||
use({
|
||||
"nvim-telescope/telescope.nvim",
|
||||
requires = "nvim-lua/plenary.nvim",
|
||||
config = pconf("telescope"),
|
||||
})
|
||||
use("gluon-lang/vim-gluon")
|
||||
use({
|
||||
"steelsojka/pears.nvim",
|
||||
config = pconf("nvim_pears"),
|
||||
})
|
||||
end)
|
||||
|
||||
|
|
|
@ -27,4 +27,3 @@ cmd("autocmd CursorHold * silent call CocActionAsync('highlight')")
|
|||
cmd("autocmd StdinReadPre * let s:std_in=1")
|
||||
|
||||
cmd("filetype plugin on")
|
||||
|
||||
|
|
Loading…
Reference in a new issue