From 2ab329a872c5fb949d99180d3d5ba0283f69c8ae Mon Sep 17 00:00:00 2001 From: Andrew Conlin Date: Fri, 4 Apr 2025 11:31:11 +0100 Subject: [PATCH 1/3] [2025-04-04] Remove unused plugins --- nvim/init.vim | 22 +++++++++++----------- nvim/lua/init.lua | 11 ++++++----- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 2d218c8..6c2428c 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -5,24 +5,24 @@ source ~/.vimrc call plug#begin() " Plug 'ellisonleao/gruvbox.nvim' " Plug 'folke/tokyonight.nvim' -Plug 'nvim-lua/plenary.nvim' -Plug 'nvim-tree/nvim-web-devicons' -Plug 'MunifTanjim/nui.nvim' -"Plug 'nvim-neo-tree/neo-tree.nvim', { 'branch': 'v3.x' } +" Plug 'nvim-lua/plenary.nvim' +" Plug 'nvim-tree/nvim-web-devicons' +" Plug 'MunifTanjim/nui.nvim' +" Plug 'nvim-neo-tree/neo-tree.nvim', { 'branch': 'v3.x' } Plug 'lewis6991/gitsigns.nvim' " OPTIONAL: for git status " Plug 'nvim-tree/nvim-web-devicons' " OPTIONAL: for file icons " Plug 'freddiehaddad/feline.nvim' -Plug 'neovim/nvim-lspconfig' +" Plug 'neovim/nvim-lspconfig' " main one -Plug 'ms-jpq/coq_nvim', {'branch': 'coq'} +" Plug 'ms-jpq/coq_nvim', {'branch': 'coq'} " 9000+ Snippets -Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'} +" Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'} Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} Plug 'xiyaowong/transparent.nvim' -Plug 'justinhj/battery.nvim' -Plug 'MunifTanjim/nui.nvim' +" Plug 'justinhj/battery.nvim' +" Plug 'MunifTanjim/nui.nvim' " Plug 'rcarriga/nvim-notify' -Plug 'folke/noice.nvim' +" Plug 'folke/noice.nvim' Plug 'luukvbaal/statuscol.nvim' call plug#end() @@ -30,7 +30,7 @@ if exists("g:neovide") set guifont=JetBrains_Mono:h13:cANSI:qDRAFT endif -colo mine +colo gruv set noshowmode set laststatus=2 set cmdheight=0 diff --git a/nvim/lua/init.lua b/nvim/lua/init.lua index 6b90aad..cd1175d 100644 --- a/nvim/lua/init.lua +++ b/nvim/lua/init.lua @@ -2,13 +2,13 @@ --require('plugins.gruvbox') --require('plugins.feline') require('gitsigns').setup({numhl = true}) -require('plugins.matlab_ls') +--require('plugins.matlab_ls') require('plugins.lua_ls') require('plugins.treesitter') -require('battery').setup({ - show_status_when_no_battery = false, - show_percent = true -}) +--require('battery').setup({ +-- show_status_when_no_battery = false, +-- show_percent = true +--}) --require('plugins.noice') require('plugins.statuscol') vim.diagnostic.config({ @@ -24,6 +24,7 @@ vim.diagnostic.config({ } }) --vim.api.nvim_set_hl(0,"DiagnosticUnderlineWarn",{undercurl=true,sp='DiagnosticWarn'}) +--For Alacritty: vim.api.nvim_create_autocmd("ExitPre", { group = vim.api.nvim_create_augroup("Exit", { clear = true }), command = "set guicursor=a:ver90-blinkwait250-blinkoff250-blinkon250", From 9eff9122fcee7b8e881b80eaa0cf1cdf9d8ef563 Mon Sep 17 00:00:00 2001 From: Andrew Conlin Date: Fri, 4 Apr 2025 11:32:00 +0100 Subject: [PATCH 2/3] [2025-04-04] Change `mine` statusline colour to be same as background --- nvim/colors/mine.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/colors/mine.vim b/nvim/colors/mine.vim index bad0b6c..72d98c5 100644 --- a/nvim/colors/mine.vim +++ b/nvim/colors/mine.vim @@ -20,4 +20,4 @@ highlight Comment gui=italic highlight Constant guifg=#999999 highlight NormalFloat guibg=#666666 highlight CursorLineNr guibg=NONE gui=bold -" highlight StatusLine guibg=Normal guifg=Normal +highlight StatusLine guibg=Normal guifg=Normal From 7603f0de8eae22908cfbe141934b28f4c2478b80 Mon Sep 17 00:00:00 2001 From: Andrew Conlin Date: Fri, 4 Apr 2025 11:32:58 +0100 Subject: [PATCH 3/3] [2025-04-04] Update to neovim v0.11 https://gpanders.com/blog/whats-new-in-neovim-0-11/ --- nvim/lua/init.lua | 2 +- nvim/lua/plugins/lua_ls.lua | 14 +++++++------- nvim/lua/plugins/matlab_ls.lua | 5 ++--- nvim/lua/plugins/statusline.lua | 2 +- zsh/custom.zsh | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/nvim/lua/init.lua b/nvim/lua/init.lua index cd1175d..2b58cb5 100644 --- a/nvim/lua/init.lua +++ b/nvim/lua/init.lua @@ -12,7 +12,7 @@ require('plugins.treesitter') --require('plugins.noice') require('plugins.statuscol') vim.diagnostic.config({ - virtual_text = false, + virtual_lines = { current_line = true, }, underline = true, signs = { text = { diff --git a/nvim/lua/plugins/lua_ls.lua b/nvim/lua/plugins/lua_ls.lua index fd36b83..9d844cd 100644 --- a/nvim/lua/plugins/lua_ls.lua +++ b/nvim/lua/plugins/lua_ls.lua @@ -1,8 +1,8 @@ -local coq = require("coq") -local util = require("lspconfig.util") -require('lspconfig').lua_ls.setup( - coq.lsp_ensure_capabilities({ +vim.lsp.config.lua_ls = + { cmd = { os.getenv("HOME") .. "/lua-language-server/bin/lua-language-server" }, - root_dir = util.root_pattern('init.lua'), - }) -) + root_markers = { 'init.lua' }, + filetypes = { 'lua' }, + } + +vim.lsp.enable({'lua_ls'}) diff --git a/nvim/lua/plugins/matlab_ls.lua b/nvim/lua/plugins/matlab_ls.lua index f3b1071..af6a2fa 100644 --- a/nvim/lua/plugins/matlab_ls.lua +++ b/nvim/lua/plugins/matlab_ls.lua @@ -1,7 +1,6 @@ -local coq = require("coq") local util = require("lspconfig.util") require('lspconfig').matlab_ls.setup( - coq.lsp_ensure_capabilities({ + { cmd = { "node", os.getenv("HOME") .. "/MATLAB-language-server/out/index.js", "--stdio" }, root_dir = util.root_pattern('mw_anchor'), single_file_support = true, @@ -13,5 +12,5 @@ require('lspconfig').matlab_ls.setup( telemetry = false } } - }) + } ) diff --git a/nvim/lua/plugins/statusline.lua b/nvim/lua/plugins/statusline.lua index 9f6d9d2..faf57c9 100644 --- a/nvim/lua/plugins/statusline.lua +++ b/nvim/lua/plugins/statusline.lua @@ -24,7 +24,7 @@ GetTime = function() end GetLSP = function() - local clients = vim.lsp.buf_get_clients() + local clients = vim.lsp.get_clients() if next(clients) ~= nil then local name = string.format('%s',clients[1].name) local root = clients[1].root_dir diff --git a/zsh/custom.zsh b/zsh/custom.zsh index ef1ad5e..b3cd52e 100644 --- a/zsh/custom.zsh +++ b/zsh/custom.zsh @@ -10,7 +10,7 @@ export PATH=$PATH:~/go/bin # export PATH=$PATH:~/.zig # neovim -export PATH=$PATH:/usr/bin/nvim-linux64/bin +export PATH="$PATH:/opt/nvim-linux-x86_64/bin" # picotool export PATH=$PATH:~/picotool/build