From d459e52d246c2be6c56a2c2d0785a02e7682839d Mon Sep 17 00:00:00 2001 From: Vladan Popovic Date: Thu, 17 Jun 2021 10:17:47 +0200 Subject: [PATCH] Remove neovim config, it's in its own repo now --- .config/nvim/ftplugin/python.vim | 23 ----- .config/nvim/ftplugin/rust.vim | 10 --- .config/nvim/init.vim | 140 ------------------------------- .gitignore | 1 + 4 files changed, 1 insertion(+), 173 deletions(-) delete mode 100644 .config/nvim/ftplugin/python.vim delete mode 100644 .config/nvim/ftplugin/rust.vim delete mode 100644 .config/nvim/init.vim diff --git a/.config/nvim/ftplugin/python.vim b/.config/nvim/ftplugin/python.vim deleted file mode 100644 index efd4ab2..0000000 --- a/.config/nvim/ftplugin/python.vim +++ /dev/null @@ -1,23 +0,0 @@ -set textwidth=79 -colorscheme monotone - -let b:ale_linters=['mypy', 'pyls', 'pylint'] -" Fix syntax with autopep8. -let b:ale_fixers=['autopep8'] -let g:ale_fix_on_save=1 -" Use .venv as a global default -let g:ale_virtualenv_dir_names=['.venv'] - -" disable autocompletion, cause we use deoplete for completion -let g:jedi#completions_enabled=0 -" open the go-to function in split, not another buffer -let g:jedi#use_splits_not_buffers="right" - -let g:deoplete#enable_at_startup=1 -autocmd InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif -inoremap pumvisible() ? "\" : "\" - -" Doesn't read this from init.vim, so add it here again -highlight MatchParen cterm=bold ctermbg=DarkCyan ctermfg=none -highlight ALEWarning ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black cterm=Underline -highlight ALEError ctermbg=Red ctermfg=Black guibg=Red guifg=Black cterm=Underline diff --git a/.config/nvim/ftplugin/rust.vim b/.config/nvim/ftplugin/rust.vim deleted file mode 100644 index 9dea00d..0000000 --- a/.config/nvim/ftplugin/rust.vim +++ /dev/null @@ -1,10 +0,0 @@ -colorscheme monotone - -let b:ale_linters=['analyzer'] -" Fix syntax with rustfmt. -let b:ale_fixers=['rustfmt'] -let g:ale_fix_on_save=1 -let g:ale_rust_cargo_use_clippy = 1 - -" 'colorscheme' overrides highlights, so add it here again -highlight MatchParen cterm=bold ctermbg=DarkCyan ctermfg=none diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim deleted file mode 100644 index d0959aa..0000000 --- a/.config/nvim/init.vim +++ /dev/null @@ -1,140 +0,0 @@ -call plug#begin('~/.local/share/nvim/plugged') - -Plug 'davidhalter/jedi-vim' -Plug 'ncm2/float-preview.nvim' -Plug 'dense-analysis/ale' -Plug 'jacoborus/tender.vim' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' -Plug 'airblade/vim-gitgutter' -Plug 'scrooloose/nerdtree' -Plug 'gleam-lang/gleam.vim' -Plug 'cespare/vim-toml' -Plug 'rust-lang/rust.vim' -Plug 'vim-scripts/DrawIt' - -call plug#end() - -let g:airline_theme='papercolor' -let g:airline#extensions#ale#enabled=1 - -inoremap pumvisible() ? "\" : "\" -inoremap pumvisible() ? "\" : "\" - -let g:jedi#completions_enabled=0 -let g:jedi#use_splits_not_buffers="right" - -" Preview window is floating -let g:float_preview#docked=0 -let g:float_preview#max_width=100 -let g:float_preview#max_height=150 -let g:float_preview#auto_close=0 - -set tabstop=4 -set softtabstop=4 -set shiftwidth=4 -set expandtab -set autoindent -set fileformat=unix -set number -" Hide top preview window, use float_preview instead -set completeopt-=preview -set omnifunc=ale#completion#OmniFunc - -" Lint and check types -let b:ale_linters={ -\ 'python': ['mypy', 'pyls', 'pylint'], -\ 'ocaml': ['merlin'], -\ 'rust': ['analyzer', 'cargo'] -\ } -let b:ale_fixers = { -\ 'rust': 'rustfmt', -\ 'python': 'autopep8', -\ 'ocaml': 'ocamlformat' -\} - -let g:ale_rust_rustfmt_options='--edition 2018' - -let g:ale_fix_on_save=0 -let g:ale_lint_on_save=1 -let g:ale_lint_on_enter=0 -let g:ale_list_window_size=20 -" Use .venv as a global default -let g:ale_virtualenv_dir_names=['.venv'] -let g:ale_completion_enabled=1 -let g:ale_sign_error="✗" -let g:ale_sign_warning="⚠" -let g:ale_echo_msg_error_str = 'E' -let g:ale_echo_msg_warning_str = 'W' -let g:ale_echo_msg_format = '[%linter%] %s [%severity%]' - -" Enable warnings about trailing whitespace for all files. -let b:ale_warn_about_trailing_whitespace=1 - -nmap e :ALEDetail -noremap d :ALEGoToDefinition -noremap r :ALEFindReferences -noremap g] :ALEGoToDefinition -noremap h :ALEHover - -" ALE colors -highlight ALEError ctermbg=DarkRed ctermfg=Black -highlight ALEWarning ctermbg=Yellow ctermfg=White - -" Use TAB to switch between buffers -noremap :bn -noremap :bp - -" Highlight trailing whitespace (darker red) and remove all with Ctrl+k -highlight WhitespaceEOL ctermbg=red guibg=#ab0d0d -match WhitespaceEOL /\s\+\%#\@ :let _s=@/:%s/\s\+$//e:let @/=_s - -" Much better with Tomorrow Night Bright color theme set in alacritty -" set background=dark -highlight Search ctermfg=Black -highlight Comment ctermfg=Grey -highlight SignColumn ctermbg=0 -highlight LineNr ctermbg=0 ctermfg=248 -highlight Folded ctermbg=Green ctermfg=Black -highlight Pmenu ctermbg=gray guibg=gray - -highlight GitGutterAdd ctermfg=Green -highlight GitGutterChange ctermfg=Red -highlight GitGutterDelete ctermfg=DarkRed -highlight GitGutterAddLine ctermbg=LightGreen -highlight GitGutterChangeLine ctermbg=Yellow -highlight GitGutterDeleteLine ctermbg=LightRed -highlight GitGutterChangeDeleteLine ctermbg=LightRed - -nmap ]h (GitGutterNextHunk) -nmap [h (GitGutterPrevHunk) - -let g:gitgutter_sign_added='+' -let g:gitgutter_sign_modified='±' -let g:gitgutter_sign_removed='-' -let g:gitgutter_sign_removed_first_line='^' -let g:gitgutter_sign_modified_removed='-' -let g:gitgutter_map_keys=0 -let g:gitgutter_set_sign_backgrounds=1 - -" Toggles on different plugins/modes -nmap :ToggleMouse -set pastetoggle= -nmap :set nonumber! -nmap :GitGutterBufferToggle -nmap :NERDTreeToggle -nmap :GitGutterLineHighlightsToggle - -autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab - -" Maintain undo history between sessions -if !isdirectory("/tmp/.vim-undo-dir-vladan") - call mkdir("/tmp/.vim-undo-dir-vladan", "", 0700) -endif -set undodir=/tmp/.vim-undo-dir-vladan -set undofile -" Enable vimrc files per project -set exrc -" Disable unsafe commands in project vimrc -set secure diff --git a/.gitignore b/.gitignore index 5d0f284..088e176 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ pavucontrol.ini .config/waybar/keyboard-layout.py .config/wireshark/ .config/htop/ +.config/nvim/ # has it's own repo now .gnupg/openpgp-revocs.d/ .gnupg/private-keys-v1.d/