From fa561b403a9feddb80873581c116aab18644bc67 Mon Sep 17 00:00:00 2001 From: Andrew Conlin Date: Fri, 17 May 2024 09:33:56 +0100 Subject: [PATCH] [2024-05-17] Neovim config updates, adding coq.nvim --- nvim/init.vim | 17 +++++++++++++- nvim/lua/init.lua | 13 ++--------- nvim/lua/plugins/feline.lua | 23 ++++++++++++++---- nvim/lua/plugins/matlab_ls.lua | 14 +++++++++++ nvim/lua/plugins/treesitter.lua | 41 +++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 17 deletions(-) create mode 100644 nvim/lua/plugins/matlab_ls.lua create mode 100644 nvim/lua/plugins/treesitter.lua diff --git a/nvim/init.vim b/nvim/init.vim index 5f14738..3a29419 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -9,7 +9,7 @@ Plug 'ellisonleao/gruvbox.nvim' "Plug 'vim-airline/vim-airline-themes' Plug 'ghifarit53/tokyonight-vim' "Plug 'airblade/vim-gitgutter' -Plug 'folke/tokyonight.nvim' +"Plug 'folke/tokyonight.nvim' Plug 'nvim-lua/plenary.nvim' Plug 'nvim-tree/nvim-web-devicons' Plug 'MunifTanjim/nui.nvim' @@ -21,6 +21,21 @@ Plug 'freddiehaddad/feline.nvim' "Plug 'epwalsh/obsidian.nvim' "Plug 'hrsh7th/nvim-cmp' Plug 'neovim/nvim-lspconfig' +"Plug 'hrsh7th/cmp-nvim-lsp' +"Plug 'hrsh7th/cmp-buffer' +"Plug 'hrsh7th/cmp-path' +"Plug 'hrsh7th/cmp-cmdline' +"Plug 'hrsh7th/nvim-cmp' +" For vsnip users. +"Plug 'hrsh7th/cmp-vsnip' +"Plug 'hrsh7th/vim-vsnip' +"Plug 'rafamadriz/friendly-snippets' +Plug 'mathworks/MATLAB-extension-for-vscode' +" main one +Plug 'ms-jpq/coq_nvim', {'branch': 'coq'} +" 9000+ Snippets +Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'} +Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} call plug#end() set bg=dark diff --git a/nvim/lua/init.lua b/nvim/lua/init.lua index 1ee729a..1e1b029 100644 --- a/nvim/lua/init.lua +++ b/nvim/lua/init.lua @@ -1,14 +1,5 @@ require('plugins.gruvbox') require('plugins.feline') require('gitsigns').setup() ---require('lspconfig').matlab_ls.setup{ --- cmd = { "node", "/mathworks/home/aconlin/MATLAB-language-server/out/index.js", "--stdio" }, --- settings = { --- MATLAB = { --- indexWorkspace = false, --- installPath = "/usr/local/MATLAB/R2024a", --- matlabConnectionTiming = "onStart", --- telemetry = false --- } --- } ---} +require('plugins.matlab_ls') +require('plugins.treesitter') diff --git a/nvim/lua/plugins/feline.lua b/nvim/lua/plugins/feline.lua index b25aa77..783d67f 100644 --- a/nvim/lua/plugins/feline.lua +++ b/nvim/lua/plugins/feline.lua @@ -103,8 +103,8 @@ win_components.active[1][1] = { provider = { name = 'file_info', opts = { - type = 'relative' - } + type = 'relative', + } }, hl = { fg = 'bg', bg = 'fg' }, left_sep = { @@ -117,7 +117,18 @@ win_components.active[1][1] = { { str = 'right_filled' } - } + }, + icon = function() + local icon_str, icon_color = require('nvim-web-devicons').get_icon_color( + vim.fn.expand('%:t'), + nil, -- extension is already computed by nvim-web-devicons + { default = true } + ) + if vim.api.nvim_buf_get_option(0, 'filetype') == 'markdown' then + icon_color = 'bg' + end + return { str = icon_str, hl = { fg = icon_color } } + end } win_components.active[1][2] = { provider = 'file_size', @@ -171,10 +182,12 @@ win_components.active[3][5] = { provider = 'time', left_sep = { str = 'block' - } + }, + right_sep = { + str = 'block' + } } win_config.components = win_components require('feline').winbar.setup(win_config) local theme = require('themes.gruvbox') require('feline').use_theme(theme) - diff --git a/nvim/lua/plugins/matlab_ls.lua b/nvim/lua/plugins/matlab_ls.lua new file mode 100644 index 0000000..4bf09a2 --- /dev/null +++ b/nvim/lua/plugins/matlab_ls.lua @@ -0,0 +1,14 @@ +local coq = require("coq") +require('lspconfig').matlab_ls.setup( + coq.lsp_ensure_capabilities({ + cmd = { "node", "/mathworks/home/aconlin/MATLAB-language-server/out/index.js", "--stdio" }, + settings = { + MATLAB = { + indexWorkspace = false, + installPath = "/usr/local/MATLAB/R2024a", + matlabConnectionTiming = "onStart", + telemetry = false + } + } + }) +) diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..53651a8 --- /dev/null +++ b/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,41 @@ +require('nvim-treesitter.configs').setup { + -- A list of parser names, or "all" (the five listed parsers should always be installed) + ensure_installed = { "matlab", "lua", "vim", "vimdoc" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = true, + + -- List of parsers to ignore installing (or "all") + --ignore_install = { "javascript" }, + + ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + + highlight = { + enable = true, + + -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to + -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is + -- the name of the parser) + -- list of language that will be disabled + --disable = { "c", "rust" }, + -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files + --disable = function(lang, buf) + -- 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 + -- return true + -- end + --end, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + }, +}