From 7ed7de16b7c721e84fe9cb796130e61398873f7f Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Sun, 4 Jun 2023 09:41:15 +0100 Subject: Adds dark blue theme --- nvim-using-vimrc/init.vim | 73 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 38 deletions(-) (limited to 'nvim-using-vimrc/init.vim') diff --git a/nvim-using-vimrc/init.vim b/nvim-using-vimrc/init.vim index c89fd52..80f2131 100644 --- a/nvim-using-vimrc/init.vim +++ b/nvim-using-vimrc/init.vim @@ -11,7 +11,7 @@ nnoremap ev sjL:e $MYVIMRC " leader let maplocalleader = "\\" -let mapleader = " " +let mapleader = "," " Function to allow adding a line of text to taskwarrior function! TaskWarriorAddCurrentLine() @@ -142,6 +142,7 @@ noremap rs :!clear; sh % " essential plugins call plug#begin() Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } +Plug 'lambdalisue/fern.vim' Plug 'junegunn/goyo.vim' Plug 'junegunn/fzf.vim' Plug 'github/copilot.vim' @@ -156,17 +157,12 @@ Plug 'fatih/vim-go', {'do': ':GoUpdateBinaries' } Plug 'tpope/vim-dispatch' Plug 'tpope/vim-commentary' "Plug 'ycm-core/YouCompleteMe' -"Plug 'jayli/vim-easycomplete' -Plug 'rose-pine/vim' +"Plug 'davidhalter/jedi-vim' Plug 'SirVer/UltiSnips' Plug 'honza/vim-snippets' Plug 'dense-analysis/ale' -Plug 'davidhalter/jedi-vim' call plug#end() -" easycomplete -"let g:easycomplete_tab_trigger="" - " jedi-vim let g:jedi#goto_command = "d" let g:jedi#goto_assignments_command = "g" @@ -179,39 +175,40 @@ let g:jedi#rename_command = "r" let g:jedi#rename_command_keep_name = "R" " " YCM -let g:ycm_enable_inlay_hints = 1 -nnoremap h (YCMToggleInlayHints) -nnoremap gd :YcmCompleter GoToDefinition -nnoremap gr :YcmCompleter GoToReferences -nnoremap K :YcmCompleter GetDoc -" this will disable tab, allowing it to be used for ultisnips -let g:ycm_key_list_select_completion = ['', ''] -let g:ycm_key_list_previous_completion = ['', ''] -let g:ycm_python_interpreter_path = '.venv/bin/python3' -let g:ycm_auto_trigger = 1 -let g:ycm_enable_inlay_hints = 0 -let g:ycm_python_sys_path = [] -let g:ycm_show_diagnostics_ui = 0 -let g:ycm_extra_conf_vim_data = [ - \ 'g:ycm_python_interpreter_path', - \ 'g:ycm_python_sys_path' - \] -let g:ycm_global_ycm_extra_conf = '~/.global_extra_conf.py' -nnoremap jd :YcmCompleter GoTo -imap (YCMToggleSignatureHelp)'. - +" let g:ycm_enable_inlay_hints = 1 +" nnoremap h (YCMToggleInlayHints) +" nnoremap gd :YcmCompleter GoToDefinition +" nnoremap gr :YcmCompleter GoToReferences +" nnoremap K :YcmCompleter GetDoc +" " this will disable tab, allowing it to be used for ultisnips +" let g:ycm_key_list_select_completion = ['', ''] +" let g:ycm_key_list_previous_completion = ['', ''] +" let g:ycm_python_interpreter_path = '.venv/bin/python3' +" let g:ycm_auto_trigger = 1 +" let g:ycm_enable_inlay_hints = 0 +" let g:ycm_python_sys_path = [] +" let g:ycm_show_diagnostics_ui = 0 +" let g:ycm_extra_conf_vim_data = [ +" \ 'g:ycm_python_interpreter_path', +" \ 'g:ycm_python_sys_path' +" \] +" let g:ycm_global_ycm_extra_conf = '~/.global_extra_conf.py' +" nnoremap jd :YcmCompleter GoTo +" imap (YCMToggleSignatureHelp)'. " snippets " Trigger configuration. You need to change this to something other than if you use one of the following: -" - https://github.com/Valloric/YouCompleteMe -" - https://github.com/nvim-lua/completion-nvim let g:UltiSnipsExpandTrigger="" let g:UltiSnipsJumpForwardTrigger="" let g:UltiSnipsJumpBackwardTrigger="" " If you want :UltiSnipsEdit to split your window. let g:UltiSnipsEditSplit="vertical" +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" +set completefunc=UltiSnips#Complete " vim-test nmap tn :TestNearest @@ -236,8 +233,7 @@ set shell=/bin/sh set hi=500 set scrolloff=0 " set novisualbell -set relativenumber "show line numbers -set number +"set relativenumber "show line numbers set wildignore=**/__pycache*/** set wildmenu "enable a menu that shows tab completion options in the status bar set wildchar= @@ -266,6 +262,9 @@ set hidden set t_Co=256 "set t_Co=0 - switches off all colours set path+=** +set relativenumber +"set spell +set number set more set signcolumn=yes set colorcolumn=0 @@ -273,6 +272,10 @@ set equalalways set showmode set nobackup set listchars=tab:»→,trail:␣ +set shortmess+=c +set complete+=kspell +set completeopt=menuone,longest,preview +set omnifunc=syntaxcomplete#Complete if executable('ag') set grepprg=ag\ --vimgrep\ --nogroup\ --nocolor endif @@ -297,12 +300,6 @@ function! s:copy_filename_as_mdlink() endfunction autocmd BufLeave * call s:copy_filename_as_mdlink() -" Ultisnips -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="" -"set completefunc=UltiSnips#Complete -set omnifunc=syntaxcomplete#Complete " vim-test -- cgit v1.2.3