diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 41c85ea..18cf813 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,6 +1,5 @@ { "action-hints.nvim": { "branch": "main", "commit": "ab10fef255dd4bc933c92d8f9969828f2f856e71" }, - "aerial.nvim": { "branch": "master", "commit": "31fbd369bbbeb53080c4b1ead9e76be322725ef5" }, "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, @@ -47,6 +46,7 @@ "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" }, diff --git a/.config/nvim/lua/keymap.lua b/.config/nvim/lua/keymap.lua index 58580f6..76fed7d 100644 --- a/.config/nvim/lua/keymap.lua +++ b/.config/nvim/lua/keymap.lua @@ -59,8 +59,8 @@ m.cnoremap("w!!", 'execute "silent! write !sudo tee % >/dev/null" edit!', m.nnoremap("sa", ':%S//g', 'Substitute: free form') m.nnoremap("ss", ':%S/\\<\\>//g', 'Substitute: word under cursor') --- stevearc/aerial.nvim -m.nmap('', ':AerialToggle!', 'CTags: toggle') +-- simrat39/symbols-outline.nvim +m.nmap('', ':SymbolsOutline', 'CTags: toggle') -- nvim-tree/nvim-tree.lua m.nmap("", ':NvimTreeToggle toggle', 'File tree: toggle') diff --git a/.config/nvim/lua/plugins/aerial.lua b/.config/nvim/lua/plugins/aerial.lua deleted file mode 100644 index 354e8c0..0000000 --- a/.config/nvim/lua/plugins/aerial.lua +++ /dev/null @@ -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" - }, - } -} diff --git a/.config/nvim/lua/plugins/symbols-outline.lua b/.config/nvim/lua/plugins/symbols-outline.lua new file mode 100644 index 0000000..54e1fe7 --- /dev/null +++ b/.config/nvim/lua/plugins/symbols-outline.lua @@ -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" }, + }, + }, + }, +} diff --git a/.config/nvim/lua/style.lua b/.config/nvim/lua/style.lua index bdc880d..3464435 100644 --- a/.config/nvim/lua/style.lua +++ b/.config/nvim/lua/style.lua @@ -1,65 +1,75 @@ -- set signs for various uses -Space_sign = "·" Return_sign = "" +Space_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 +77,16 @@ Lazy_signs = { config = " ", event = " ", ft = " ", - init = " ", import = " ", + init = " ", keys = " ", lazy = "󰒲 ", + list = { + "●", + "➜", + "", + "", + }, loaded = " ", not_loaded = " ", plugin = " ", @@ -78,19 +94,13 @@ Lazy_signs = { source = " ", start = " ", task = " ", - list = { - "●", - "➜", - "", - "", - } } Lualine_signs = { - modified = '', - readonly = '', - unnamed = '', - newfile = '' + modified = "", + newfile = "", + readonly = "", + unnamed = "", } vim.fn.sign_define( @@ -112,7 +122,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"