Compare commits

...

5 Commits

@ -43,7 +43,7 @@ vim.o.relativenumber = true
-- speedup vim with long lines
vim.o.ttyfast = true
vim.o.lazyredraw = true
-- vim.o.lazyredraw = true
-- decrease update time
vim.o.updatetime = 250

@ -1,5 +1,5 @@
{
"aerial.nvim": { "branch": "master", "commit": "3748e87a316a68754341cdffcef44fee61dee51c" },
"action-hints.nvim": { "branch": "main", "commit": "ab10fef255dd4bc933c92d8f9969828f2f856e71" },
"barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
@ -7,55 +7,58 @@
"cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
"conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" },
"conform.nvim": { "branch": "master", "commit": "5a15cc46e75cad804fd51ec5af9227aeb1d1bdaa" },
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
"fterm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
"fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" },
"git-blame.nvim": { "branch": "master", "commit": "196602b570b1d754b7b8f9a9f75fa7bd88f12ef8" },
"git-blame.nvim": { "branch": "master", "commit": "a0282d05adbee80aaf4e2ff35b81b52940b67bed" },
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
"indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
"knap": { "branch": "main", "commit": "503010f541696e99ed5c62f658620e546cebf8b0" },
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
"lsp_signature.nvim": { "branch": "master", "commit": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0" },
"goto-preview": { "branch": "main", "commit": "527fd81a827234e26ca47891abe90497215db2a6" },
"indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
"knap": { "branch": "main", "commit": "d4ea571d2d4e139d288b758c5bab31788d30eea3" },
"lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
"lsp_signature.nvim": { "branch": "master", "commit": "e92b4e7073345b2a30a56b20db3d541a9aa2771e" },
"lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
"luasnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
"lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" },
"luasnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
"mapx.nvim": { "branch": "main", "commit": "c3dd43474a5fc2f266309bc04a69b74eb2524671" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
"mason-null-ls.nvim": { "branch": "main", "commit": "a1e19bf9baa86e8a43dd86cf9689ca9f71b4d1da" },
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
"none-ls.nvim": { "branch": "main", "commit": "c10b7be7751aee820a02f2d1fafe76bc316fe223" },
"nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
"mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" },
"mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
"none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" },
"nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" },
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
"nvim-colorizer.lua": { "branch": "master", "commit": "0b3950aed7bc35b78200bc292156aa77d2a4d342" },
"nvim-hlslens": { "branch": "main", "commit": "8ffc64bb6b624612cf762982b92633f283f7a715" },
"nvim-lspconfig": { "branch": "master", "commit": "f12f1b9e877b1e6e2ef7eae1a524d8253af4243d" },
"nvim-docs-view": { "branch": "master", "commit": "78d88bca16f32a430572758677f9246f6d7f7b94" },
"nvim-hlslens": { "branch": "main", "commit": "e4c811a401b06f86a7bb042b1d64a5cba21729a9" },
"nvim-lspconfig": { "branch": "master", "commit": "e172dd599cff2ae5267871b5e33fb42934c4df43" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
"nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
"nvim-tree.lua": { "branch": "master", "commit": "8cbb1db8e90b62fc56f379992e622e9f919792ce" },
"nvim-treesitter": { "branch": "master", "commit": "841dde702ce2e58ffc3724808f3dbea2edee57d5" },
"nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" },
"nvim-tree.lua": { "branch": "master", "commit": "efafd73efa9bc8c26282aed563ba0f01c7465b06" },
"nvim-treesitter": { "branch": "master", "commit": "9775d5d7c724f81acdd441e7e9edefc4514e990b" },
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
"nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
"nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" },
"nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" },
"nvim-ufo": { "branch": "main", "commit": "239ae620d818ffa1319ca3056546df71906d4bfb" },
"nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" },
"nvim-yarp": { "branch": "master", "commit": "bb5f5e038bfe119d3b777845a76b0b919b35ebc8" },
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
"plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
"popup-menu.nvim": { "branch": "master", "commit": "b618bd0c824a20417d845fa0022327228e6988a2" },
"promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" },
"renamer.nvim": { "branch": "develop", "commit": "1614d466df53899f11dd5395eaac3c09a275c384" },
"promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
"renamer.nvim": { "branch": "master", "commit": "1614d466df53899f11dd5395eaac3c09a275c384" },
"spelunker.vim": { "branch": "master", "commit": "a0bc530f62798bbe053905555a4aa9ed713485eb" },
"symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" },
"tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
"tccs.nvim": { "branch": "master", "commit": "b0e36734b8e4c8e1e56533218076fe574c7a9d75" },
"telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
"tidy.nvim": { "branch": "triggerable-tidy", "commit": "1cbed7676273057c8af22438deaae73cd5cb96b5" },
"todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
"trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
"undotree": { "branch": "master", "commit": "7df3be7a261ea31b528aa442b494fcb458f3d968" },
"undotree": { "branch": "master", "commit": "9dbbf3b7d19dda0d22ceca461818e4739ad8154d" },
"vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
"vim-hug-neovim-rpc": { "branch": "master", "commit": "93ae38792bc197c3bdffa2716ae493c67a5e7957" },
"vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" },
"vim-markdown": { "branch": "master", "commit": "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a" },
"vim-markdown": { "branch": "master", "commit": "a657e697376909c41475a686eeef7fc7a4972d94" },
"vim-renamer": { "branch": "master", "commit": "9c6346eb4556cf2d8ca55de6969247ab14fe2383" },
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
"wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }

@ -12,6 +12,7 @@ local m = require 'mapx'.setup { global = true, whichkey = true }
-- setup keymap groups
m.nname("g", "LSP: goto")
m.nname("gp", "LSP: preview")
m.cname("w", "Write")
m.cname("w!", "Write: overwrite")
m.nname("<leader>g", "Git")
@ -58,8 +59,8 @@ m.cnoremap("w!!", 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!',
m.nnoremap("<leader>sa", ':%S//g<Left><Left>', 'Substitute: free form')
m.nnoremap("<leader>ss", ':%S/\\<<C-r><C-w>\\>//g<Left><Left>', 'Substitute: word under cursor')
-- stevearc/aerial.nvim
m.nmap('<F3>', ':AerialToggle!<CR>', 'CTags: toggle')
-- simrat39/symbols-outline.nvim
m.nmap('<F3>', ':SymbolsOutline<CR>', 'CTags: toggle')
-- nvim-tree/nvim-tree.lua
m.nmap("<F2>", ':NvimTreeToggle toggle<CR>', 'File tree: toggle')
@ -67,6 +68,9 @@ m.nmap("<F2>", ':NvimTreeToggle toggle<CR>', 'File tree: toggle')
-- mbbill/undotree
m.nmap("<F1>", ':UndotreeToggle<CR>', 'Undo tree: toggle')
-- amrbashir/nvim-docs-view
m.nnoremap("go", ':DocsViewToggle<CR>', 'LSP: toggle documentation window')
-- numtostr/fterm.nvim
m.nnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: open')
m.tnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: open')
@ -89,13 +93,21 @@ m.nmap("<leader>x", ":TroubleToggle<CR>", "LSP: toggle error list")
m.nnoremap("gd", vim.lsp.buf.definition(), "LSP: goto definition")
m.nnoremap("gD", vim.lsp.buf.declaration(), "LSP: goto declaration")
m.nnoremap("gi", vim.lsp.buf.implementation(), "LSP: list implementation")
m.nnoremap("gr", vim.lsp.buf.references(), "LSP: list references")
m.nnoremap("gr", function() vim.lsp.buf.references() end, "LSP: list references")
m.nnoremap("gy", vim.lsp.buf.type_definition(), "LSP: goto type definition")
m.nnoremap("K", vim.lsp.buf.hover(), "LSP: show documentation")
m.nnoremap("<F8>", function() require("conform").format({ async = true, lsp_fallback = true }) end, "LSP: format")
-- rmagatti/goto-preview
m.nnoremap("gpd", function() require('goto-preview').goto_preview_definition() end, "LSP: preview definition")
m.nnoremap("gpy", function() require('goto-preview').goto_preview_type_definition() end, "LSP: preview type definition")
m.nnoremap("gpi", function() require('goto-preview').goto_preview_implementation() end, "LSP: list preview implementation")
m.nnoremap("gpD", function() require('goto-preview').goto_preview_declaration() end, "LSP: preview declaration")
m.nnoremap("gpr", function() require('goto-preview').goto_preview_references() end, "LSP: list preview references")
m.nnoremap("gpc", function() require('goto-preview').close_all_win() end, "LSP: close all preview windows")
-- filipdutescu/renamer.nvim
m.nnoremap("<F5>", require("renamer").rename, "LSP: rename")
m.nnoremap("<F5>", function() require("renamer").rename() end, "LSP: rename")
-- nvim-telescope/telescope.nvim
m.nnoremap("<F4>", ':Telescope find_files<CR>', "Telescope: find files")

@ -1,17 +0,0 @@
return {
-- ctags like menu
{
'stevearc/aerial.nvim',
opts = {
layout = {
max_width = { 50, 0.2 },
min_width = 25,
resize_to_content = false,
},
},
dependencies = {
"nvim-treesitter/nvim-treesitter",
"nvim-tree/nvim-web-devicons"
},
}
}

@ -9,9 +9,6 @@ return {
},
opts = {
theme = {
-- this highlight is used to override other highlights
-- you can take advantage of its `bg` and set a background throughout your winbar
-- (e.g. basename will look like this: { fg = "#c0caf5", bold = true })
normal = { bg = "#272727" },
}
},

@ -9,6 +9,7 @@ return {
markdown = { "mdformat" },
tex = { "latexindent" },
lua = { "stylua" },
yaml = { "yamlfmt" },
},
})
require("conform").formatters.latexindent = {

@ -0,0 +1,6 @@
return {
"rmagatti/goto-preview",
config = function()
require("goto-preview").setup({})
end,
}

@ -1,53 +1,67 @@
return {
-- statusline
{
'nvim-lualine/lualine.nvim',
"nvim-lualine/lualine.nvim",
dependencies = {
{
'nvim-tree/nvim-web-devicons',
lazy = true
"nvim-tree/nvim-web-devicons",
lazy = true,
},
{
'f-person/git-blame.nvim',
"f-person/git-blame.nvim",
config = function()
vim.g.gitblame_display_virtual_text = 0
end
end,
},
{ "tiyn/tccs.nvim" },
{
"roobert/action-hints.nvim",
config = function()
require("action-hints").setup({
template = {
-- definition = { text = "D", color = "#add8e6" },
-- references = { text = "R%s", color = "#ff6666" },
definition = { text = Definition_sign, color = "#add8e6" },
references = { text = Reference_sign, color = "#ff6666" },
},
})
end,
},
{ 'tiyn/tccs.nvim' },
},
config = function()
require('lualine').setup({
require("lualine").setup({
options = {
globalstatus = true,
symbols = {
error = Error_sign,
warn = Warn_sign,
hint = Hint_sign,
info = Info_sign
info = Info_sign,
},
theme = 'tccs',
component_separators = { left = '', right = '' },
section_separators = { left = '', right = '' }
theme = "tccs",
component_separators = { left = "", right = "" },
section_separators = { left = "", right = "" },
},
sections = {
lualine_b = {
{
require('gitblame').get_current_blame_text,
cond = require('gitblame').is_blame_text_available
}
require("gitblame").get_current_blame_text,
cond = require("gitblame").is_blame_text_available,
},
},
lualine_c = {},
lualine_x = {
'encoding',
'fileformat',
require("action-hints").statusline,
"encoding",
"fileformat",
{
'filetype',
icon_only = true
}
"filetype",
icon_only = true,
},
},
lualine_y = {
{
'filename',
"filename",
file_status = true,
newfile_status = true,
path = 1,
@ -57,12 +71,12 @@ return {
readonly = Lualine_signs["readonly"],
unnamed = Lualine_signs["unnamed"],
newfile = Lualine_signs["newfile"],
}
}
},
},
},
lualine_z = { 'progress', 'location' },
}
lualine_z = { "progress", "location" },
},
})
end
}
end,
},
}

@ -17,6 +17,8 @@ return {
-- python
require("null-ls").builtins.formatting.isort,
require("null-ls").builtins.formatting.yapf,
-- yaml
require("null-ls").builtins.formatting.yamlfmt,
}
})
end
@ -35,6 +37,8 @@ return {
-- python
"isort",
"yapf",
-- yaml
"yamlfmt",
}
}
}

@ -0,0 +1,8 @@
return {
"amrbashir/nvim-docs-view",
lazy = true,
cmd = "DocsViewToggle",
opts = {
position = "bottom",
},
}

@ -1,8 +1,9 @@
return {
-- improved gui for renaming
{
'filipdutescu/renamer.nvim',
dependencies = { 'nvim-lua/plenary.nvim' },
opts = {}
}
"filipdutescu/renamer.nvim",
branch = "master",
dependencies = { "nvim-lua/plenary.nvim" },
opts = {},
},
}

@ -0,0 +1,39 @@
return {
-- ctags like menu
{
"simrat39/symbols-outline.nvim",
opts = {
width = 25,
symbols = {
File = { icon = Lsp_signs.File, hl = "@text.uri" },
Module = { icon = Lsp_signs.Module, hl = "@namespace" },
Class = { icon = Lsp_signs.Class, hl = "@type" },
Method = { icon = Lsp_signs.Method, hl = "@method" },
Property = { icon = Lsp_signs.Property, hl = "@method" },
Field = { icon = Lsp_signs.Field, hl = "@field" },
Constructor = { icon = Lsp_signs.Constructor, hl = "@constructor" },
Enum = { icon = Lsp_signs.Enum, hl = "@type" },
Interface = { icon = Lsp_signs.Interface, hl = "@type" },
Function = { icon = Lsp_signs.Function, hl = "@function" },
Variable = { icon = Lsp_signs.Variable, hl = "@constant" },
Constant = { icon = Lsp_signs.Constant, hl = "@constant" },
Key = { icon = Lsp_signs.Keyword, hl = "@type" },
EnumMember = { icon = Lsp_signs.EnumMember, hl = "@field" },
Struct = { icon = Lsp_signs.Struct, hl = "@type" },
Event = { icon = Lsp_signs.Event, hl = "@type" },
Operator = { icon = Lsp_signs.Operator, hl = "@operator" },
TypeParameter = { icon = Lsp_signs.TypeParameter, hl = "@parameter" },
Boolean = { icon = Lsp_signs.Boolean, hl = "@boolean" },
Null = { icon = Lsp_signs.Null, hl = "@type" },
Component = { icon = Lsp_signs.Component, hl = "@function" },
Fragment = { icon = Lsp_signs.Fragment, hl = "@constant" },
Object = { icon = Lsp_signs.Object, hl = "@type" },
Array = { icon = Lsp_signs.Array, hl = "@constant" },
Number = { icon = Lsp_signs.Number, hl = "@number" },
String = { icon = Lsp_signs.String, hl = "@string" },
Namespace = { icon = Lsp_signs.Namespace, hl = "@namespace" },
Package = { icon = Lsp_signs.Package, hl = "@namespace" },
},
},
},
}

@ -1,65 +1,78 @@
-- set signs for various uses
Space_sign = "·"
Return_sign = ""
Space_sign = "·"
Reference_sign = "%s"
Definition_sign = ""
Error_sign = ""
Warn_sign = ""
Info_sign = ""
Hint_sign = ""
Hack_sign = ""
Todo_sign = ""
Hint_sign = ""
Info_sign = ""
Perfect_sign = ""
Test_sign = ""
Todo_sign = ""
Warn_sign = ""
Menu_signs = {
nvim_lsp = "",
path = "",
buffer = "",
luasnip = "",
nvim_lsp = "",
path = "",
}
Lsp_signs = {
Text = "",
Method = "",
Function = "φ",
Array = "",
Boolean = "",
Class = "",
Color = "",
Component = "",
Constant = "π",
Constructor = "",
Enum = "",
EnumMember = "",
Event = "",
Field = "",
Variable = "β",
Class = "",
File = "",
Folder = "",
Fragment = "",
Function = "φ",
Interface = "",
Module = "",
Property = "",
Unit = "",
Value = "",
Enum = "",
Keyword = "",
Snippet = "",
Color = "",
File = "",
Method = "",
Module = "",
Namespace = "",
Null = "",
Number = "#",
Object = "",
Operator = "",
Package = "",
Property = "",
Reference = "",
Folder = "",
EnumMember = "",
Constant = "π",
Snippet = "",
String = "",
Struct = "",
Event = "",
Operator = "",
TypeParameter = ""
Text = "",
TypeParameter = "",
Unit = "",
Value = "",
Variable = "β",
}
Install_signs = {
package_installed = "",
package_pending = "",
package_uninstalled = ""
package_uninstalled = "",
}
Git_signs = {
unstaged = "",
deleted = "",
ignored = "",
renamed = "",
staged = "",
unmerged = "",
renamed = "",
deleted = "",
unstaged = "",
untracked = "",
ignored = "",
}
Lazy_signs = {
@ -67,10 +80,16 @@ Lazy_signs = {
config = "",
event = "",
ft = "",
init = "",
import = "",
init = "",
keys = "",
lazy = "󰒲 ",
list = {
"",
"",
"",
"",
},
loaded = "",
not_loaded = "",
plugin = "",
@ -78,19 +97,13 @@ Lazy_signs = {
source = "",
start = "",
task = "",
list = {
"",
"",
"",
"",
}
}
Lualine_signs = {
modified = '',
readonly = '',
unnamed = '',
newfile = ''
modified = "",
newfile = "",
readonly = "",
unnamed = "",
}
vim.fn.sign_define(
@ -112,7 +125,7 @@ vim.fn.sign_define(
-- enable colorcolumn when textwidth is set
vim.o.cursorline = true
vim.opt_local.colorcolumn = '+' .. vim.fn.join(vim.fn.range(0,254), ',+')
vim.opt_local.colorcolumn = "+" .. vim.fn.join(vim.fn.range(0, 254), ",+")
-- alternatively highlight only one line for colorcolumn
-- vim.o.colorcolumn = "-0"

Loading…
Cancel
Save