From f7190bc453efff994800b0186eb2922045a53df1 Mon Sep 17 00:00:00 2001 From: Johan Book <13253042+johanbook@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:52:52 +0100 Subject: [PATCH 1/4] feat: switch to neovim --- .alias | 1 + vim/filetypes.vim | 4 ++-- vim/plugins.vim | 45 ++++++++++++++++++++------------------------- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.alias b/.alias index 1afb02f..2625729 100644 --- a/.alias +++ b/.alias @@ -149,6 +149,7 @@ extract () { alias diff="diff --color=always" alias R="R --no-save --quiet" +alias vim="nvim" alias vi="vim --clean" diff --git a/vim/filetypes.vim b/vim/filetypes.vim index 432882a..ef4fdad 100644 --- a/vim/filetypes.vim +++ b/vim/filetypes.vim @@ -2,7 +2,7 @@ " File specific formatting """""""""""""""""""""""""""""""""""""""" -autocmd BufRead,BufNewFIle *.md,*.txt +autocmd BufRead,BufNewFIle *.md,*.txt \ setlocal spell | \ setlocal nonumber | @@ -53,4 +53,4 @@ augroup SpellUnderline augroup END " No line numbers in terminal -autocmd TerminalOpen * set nonumber +"autocmd TerminalOpen * set nonumber diff --git a/vim/plugins.vim b/vim/plugins.vim index e4fbea9..835ac90 100644 --- a/vim/plugins.vim +++ b/vim/plugins.vim @@ -34,7 +34,7 @@ Plug 'tpope/vim-surround' Plug 'tpope/vim-commentary' " Highlight current line -Plug 'miyakogi/conoline.vim' +"Plug 'miyakogi/conoline.vim' " Fuzzy file navigation Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } @@ -44,7 +44,6 @@ Plug 'junegunn/fzf.vim' " to work properly Plug 'airblade/vim-rooter' -Plug 'CoderCookE/vim-chatgpt' " Test runner Plug 'vim-test/vim-test' @@ -58,6 +57,19 @@ Plug 'mhinz/vim-startify' " Improved motions for navigation Plug 'easymotion/vim-easymotion' +Plug 'stevearc/dressing.nvim' +Plug 'nvim-lua/plenary.nvim' +Plug 'MunifTanjim/nui.nvim' + +" Optional deps +Plug 'hrsh7th/nvim-cmp' +Plug 'nvim-tree/nvim-web-devicons' "or Plug 'echasnovski/mini.icons' +Plug 'HakonHarnes/img-clip.nvim' +Plug 'zbirenbaum/copilot.lua' + +" Yay, pass source=true if you want to build from source +Plug 'yetone/avante.nvim', { 'branch': 'main', 'do': 'make' } + call plug#end() filetype plugin indent on @@ -390,28 +402,11 @@ let g:startify_bookmarks= [ """""""""""""""""""""""""""""""" -" nvim-r -"""""""""""""""""""""""""""""""" -let R_assign = 0 -let R_args = ['--no-save', '--quiet'] - -" Some handy shortcuts. -" NB: D stands for move Down -vmap RDSendSelection -nmap RDSendParagraph - - -"""""""""""""""""""""""""""""""" -" vim-chatgpt +" avante.nvim """""""""""""""""""""""""""""""" -" Pick which model to use -let g:chat_gpt_model='gpt-4' - -" Keep a consistent session -let g:chat_gpt_session_mode=1 - -" If split should be open in vertical or horizontally -let g:chat_gpt_split_direction = 'vertical' -" Max numbr of tokenx -let g:chat_gpt_max_tokens=2000 +autocmd! User avante.nvim +lua << EOF +require('avante_lib').load() +require('avante').setup() +EOF From 03e11f638b30eb9d163d4a8350ea29f3a2c2e8db Mon Sep 17 00:00:00 2001 From: Johan Book <13253042+johanbook@users.noreply.github.com> Date: Tue, 14 Jan 2025 07:48:33 +0100 Subject: [PATCH 2/4] feat(vim): disable airline --- vim/plugins.vim | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/vim/plugins.vim b/vim/plugins.vim index 835ac90..ecc8af9 100644 --- a/vim/plugins.vim +++ b/vim/plugins.vim @@ -114,38 +114,17 @@ let g:netrw_liststyle = 3 " Show like a tree """""""""""""""""""""""""""""""" " Airline """""""""""""""""""""""""""""""" -" let g:airline_theme='base16_gruvbox_dark_hard' +let g:airline_theme='base16_gruvbox_dark_hard' let g:airline_powerline_fonts = 1 let g:airline_skip_empty_sections = 1 -function! VenvReporter() - if &filetype != "python" - return "" - endif - - let venv = $VIRTUAL_ENV - if empty(venv) - return "" - endif - - " Name is on format a/b/c/a-t-d... - " This creates a prefix - let parts = split(venv, "/")[-1] - let prefix = split(parts, "-")[0] - return printf("%s%s", g:airline_symbols.python, prefix) -endfunction - " let g:airline#themes#base16_gruvbox_dark_hard#palette.accents.blue = [ '#ff0000' , '' , 160 , '' ] -call airline#parts#define_function('venv', 'VenvReporter') -" call airline#parts#define_accent('venv', 'red') - - " NB: Defined inside autocmd to support lazyily loading plugins function! AirlineInit() let g:airline_section_a = airline#section#create(["mode"]) - let g:airline_section_c = airline#section#create(["crypt", "spell", " ", "linenr"]) - let g:airline_section_x = airline#section#create(["filetype", " ", "venv"]) + let g:airline_section_c = airline#section#create(["crypt", "spell", " ", " "]) + let g:airline_section_x = airline#section#create(["filetype", " ", " "]) let g:airline_section_y = "" let g:airline_section_z = "" endfunction @@ -164,7 +143,10 @@ let g:airline#extensions#fzf#enabled = 1 " Skip showing number of changed lines etc let g:airline#extensions#hunks#enabled = 0 + +"""""""""""""""""""""""""""""""" " ALE Integration +"""""""""""""""""""""""""""""""" let airline#extensions#ale#error_symbol = '❌:' let airline#extensions#ale#warning_symbol = '⚠ :' let airline#extensions#ale#show_line_numbers = 0 @@ -405,7 +387,7 @@ let g:startify_bookmarks= [ " avante.nvim """""""""""""""""""""""""""""""" -autocmd! User avante.nvim +autocmd! User avante.nvim lua << EOF require('avante_lib').load() require('avante').setup() From 365e483719cfb09615ec871ab90056f557579794 Mon Sep 17 00:00:00 2001 From: Johan Book <13253042+johanbook@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:30:58 +0100 Subject: [PATCH 3/4] feat(vim): reenable line highlight --- vim/plugins.vim | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vim/plugins.vim b/vim/plugins.vim index 8a8d670..4543d58 100644 --- a/vim/plugins.vim +++ b/vim/plugins.vim @@ -34,7 +34,7 @@ Plug 'tpope/vim-surround' Plug 'tpope/vim-commentary' " Highlight current line -"Plug 'miyakogi/conoline.vim' +Plug 'miyakogi/conoline.vim' " Fuzzy file navigation Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } @@ -385,7 +385,6 @@ let g:startify_bookmarks= [ """""""""""""""""""""""""""""""" " avante.nvim """""""""""""""""""""""""""""""" - autocmd! User avante.nvim lua << EOF require('avante_lib').load() From 0ca7190b7fa31cc7eb1cc69309df403429497260 Mon Sep 17 00:00:00 2001 From: Johan Book <13253042+johanbook@users.noreply.github.com> Date: Sun, 19 Jan 2025 13:34:55 +0100 Subject: [PATCH 4/4] fix(vim): disable mouse --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 503c8e4..19aadd8 100644 --- a/.vimrc +++ b/.vimrc @@ -67,6 +67,9 @@ set nowrap " Fixes Vim freezing on Mac set re=2 +" Disable mouse in neovim +set mouse= + " Scripts source ~/.dotfiles/vim/filetypes.vim source ~/.dotfiles/vim/mapping.vim