diff options
| -rw-r--r-- | colors/meltdown_ng.vim | 11 | ||||
| -rw-r--r-- | init.vim | 9 | ||||
| -rw-r--r-- | lua/lsp.lua | 1 | ||||
| -rw-r--r-- | lua/treesitter-textobjects-setup.lua | 4 | ||||
| -rw-r--r-- | lua/treesitter.lua | 8 |
5 files changed, 23 insertions, 10 deletions
diff --git a/colors/meltdown_ng.vim b/colors/meltdown_ng.vim index be6296b..386a37c 100644 --- a/colors/meltdown_ng.vim +++ b/colors/meltdown_ng.vim @@ -9,6 +9,7 @@ let g:colors_name='meltdown_gen' hi Magenta guifg=#ff83ff hi DarkGrey guifg=#7b7b7b +hi LighterGrey guifg=#9a9a9a hi Salmon guifg=#ff7779 hi IncSearch guifg=#ff5d34 ctermfg=202 guibg=#000000 ctermbg=000 gui=reverse cterm=reverse hi TabLineSel guifg=#1f1d2a guibg=#ff5d34 ctermfg=202 ctermbg=233 gui=none @@ -43,6 +44,7 @@ hi Blue3 guifg=#80ffdf ctermfg=122 hi Blue2 guifg=#af80ff ctermfg=141 hi Blue4 guifg=#c3bbff ctermfg=189 hi Teal1 guifg=#76dbd8 ctermfg=050 +hi Teal2 guifg=#71fffa hi CursorLineNr guifg=#ff5d34 ctermfg=202 guibg=#272424 ctermbg=235 hi StatusLineNC guifg=#686060 ctermfg=241 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold hi Folded guifg=#000000 ctermfg=000 guibg=#9f9a84 ctermbg=144 @@ -68,7 +70,6 @@ hi Sage3Mix guifg=#8ba3bb ctermfg=110 hi PMenu guifg=#ff7779 ctermfg=241 guibg=#14151d ctermbg=238 hi CursorColumn guibg=#313030 ctermbg=236 hi PMenuSel guifg=#ff5d34 ctermfg=202 guibg=#343030 ctermbg=236 gui=bold cterm=bold -hi Number guifg=#9a9a9a hi! link TagbarAccessProtected Yellow1 hi! link javaDocTags Orange6 @@ -97,7 +98,8 @@ hi! link RadiationCppEnum Type hi! link RadiationJavaLocalVar Sage2 hi! link TagbarAccessPublic Green1 hi! link xmlEndTag Red1 -hi! link Identifier Teal1 +hi! link Identifier LighterGrey +hi! link Number Teal1 hi! link javaOperator Operator hi! link RadiationJavaEnhancedForIterator RadiationJavaForIterator hi! link String Green1 @@ -123,7 +125,7 @@ hi! link @lsp.type.class Type hi! link @lsp.type.property Salmon hi! link @lsp.type.parameter Red1 hi! link @lsp.mod.functionScope Orange1 -hi! link @lsp.typemod.variable.functionScope.cpp Teal1 +hi! link @lsp.typemod.variable.functionScope.cpp LighterGrey hi! link @punctuation Blue1 hi! link @variable Identifier hi! link @variable.parameter Red1 @@ -134,7 +136,6 @@ hi! link @type.qualifier Blue1 hi! link @lsp.type.interface.java Red5 hi! link @lsp.type.enum.java Red4 hi! link @lsp.type.variable @variable -hi! link @lsp.type.variable.jjjjjk @variable hi! link @lsp.typemod.property.static.java Sage3 hi! link @attribute PreProc hi! link @lsp.type.property.java @variable.member @@ -221,6 +222,7 @@ hi! link CmpKind CmpDefault hi! link CmpReady CmpDefault hi! link CmpStatus CmpDefault hi! link CmpZsh CmpDefault +hi! link DiagnosticInfo Teal2 hi TabLineCloseSel guifg=#790000 guibg=#ff5d34 hi TabLineClose guifg=#0f0e0e guibg=#2d2d2d @@ -228,3 +230,4 @@ hi TabLineTail guifg=#ff8082 guibg=#0f0e0e hi DiagnosticUnderlineError gui=undercurl hi DiagnosticUnderlineWarn gui=undercurl +hi DiagnosticUnderlineInfo gui=undercurl @@ -178,6 +178,14 @@ noremap <M-©> <cmd>TSCaptureUnderCursor<cr> noremap Τ <cmd>Inspect<cr> command! Config edit $HOME/.config/nvim/init.vim +command! Configl edit $HOME/.config/nvim/local.vim + +cnoreabbrev <expr> _config expand("$HOME/.config/nvim") +cnoreabbrev <expr> _plugged expand("$HOME/.local/share/nvim/plugged") +cnoreabbrev <expr> _fm expand("$HOME/.local/share/nvim/plugged/fieldmarshal.vim") +cnoreabbrev <expr> _home expand("$HOME/.local/share/nvim") +cnoreabbrev <expr> _projects expand("$HOME/Projects") +cnoreabbrev <expr> _ escape(expand('%:h'), ' \') set textwidth=80 set colorcolumn=+1 @@ -240,6 +248,7 @@ lua << EOF layout_strategy = "center", results_title = false, sorting_strategy = "ascending", + -- path_display = "shorten", layout_config = { center = { width = 0.5, diff --git a/lua/lsp.lua b/lua/lsp.lua index 4be6287..9332795 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -10,6 +10,7 @@ nvim_lsp.rust_analyzer.setup {} nvim_lsp.vimls.setup {} nvim_lsp.zls.setup {} nvim_lsp.ocamllsp.setup {} +nvim_lsp.verible.setup {} nvim_lsp.hls.setup { settings = { haskell = { diff --git a/lua/treesitter-textobjects-setup.lua b/lua/treesitter-textobjects-setup.lua index f58e5bd..4296857 100644 --- a/lua/treesitter-textobjects-setup.lua +++ b/lua/treesitter-textobjects-setup.lua @@ -12,14 +12,14 @@ require'nvim-treesitter.configs'.setup { ["im"] = "@function.inner", ["af"] = "@function.outer", ["if"] = "@function.inner", - ["ac"] = "@class.outer", + ["aC"] = "@class.outer", ["aa"] = "@parameter.outer", ["ia"] = "@parameter.inner", ["iq"] = "@block.inner", ["aq"] = "@block.outer", -- You can optionally set descriptions to the mappings (used in the desc parameter of -- nvim_buf_set_keymap) which plugins like which-key display - ["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" }, + ["iC"] = { query = "@class.inner", desc = "Select inner part of a class region" }, }, -- You can choose the select mode (default is charwise 'v') -- diff --git a/lua/treesitter.lua b/lua/treesitter.lua index 0a44cc7..e10e7c6 100644 --- a/lua/treesitter.lua +++ b/lua/treesitter.lua @@ -1,6 +1,6 @@ require'nvim-treesitter.configs'.setup { -- A list of parser names, or "all" (the four listed parsers should always be installed) - ensure_installed = { "all" }, + -- ensure_installed = { "all" }, -- Install parsers synchronously (only applied to `ensure_installed`) sync_install = false, @@ -26,9 +26,9 @@ require'nvim-treesitter.configs'.setup { -- disable = { "c", "rust" }, -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files disable = function(lang, buf) - if lang == "vim" or lang == "lua" then - return true - end + -- if lang == "vim" or lang == "lua" then + -- return true + -- end local max_filesize = 100 * 1024 -- 100 KB local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) if ok and stats and stats.size > max_filesize then |