From daa6a4c284593aef31a980b58862085258d41b4c Mon Sep 17 00:00:00 2001
From: "Bradley M. Small" <bradley_small@hotmail.com>
Date: Wed, 13 Nov 2019 22:44:15 -0500
Subject: [PATCH] cleaning up plugins
---
.vim/ftplugin/python.vim | 51 +++++++++++++++++++++++++++-------------
.vimrc | 36 +++++++++++++---------------
2 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/.vim/ftplugin/python.vim b/.vim/ftplugin/python.vim
index 281a8f6..5c9fd25 100644
--- a/.vim/ftplugin/python.vim
+++ b/.vim/ftplugin/python.vim
@@ -1,16 +1,11 @@
" Python specific settings.
-setlocal autoindent
+setlocal colorcolumn=80
setlocal encoding=utf-8
-setlocal expandtab
setlocal fileformat=unix
setlocal foldlevel=99
setlocal foldmethod=indent
setlocal formatoptions=croql
-setlocal shiftwidth=4
-setlocal softtabstop=4
-setlocal tabstop=4
setlocal textwidth=79
-setlocal colorcolumn=80
let g:slime_target = "vimterminal"
let g:slime_vimterminal_config = {"term_name":"REPL" , "vertical" : "1"}
@@ -32,27 +27,51 @@ imap <s-f5> <c-o>:%SlimeSend<CR>
" nmap <F5> :w<cr>:term python3 %<cr>
" imap <F5> <esc>:w<CR>:!clear;python3 %<CR>
" nmap <F5> :w<CR>:!clear;python3 %<CR>
-nmap <F6> :w<CR>:!python3 %
-nmap <F7> :w<CR>:SyntasticCheck<CR>
+" nmap <F6> :w<CR>:!python3 %
nnoremap <space> za
vnoremap <buffer> <localleader>cc :s/^/#<cr>
vnoremap <buffer> <localleader>cu :s/^#//<cr>
-let ropevim_vim_completion=1
-let ropevim_extended_complete=1
-let g:ropevim_autoimport_modules = ["os", "shutil"]
-setlocal omnifunc=RopeCompleteFunc
-let g:ropevim_prefer_py3=1
-let b:ropevim_prefer_py3=1
+" let ropevim_vim_completion=1
+" let ropevim_extended_complete=1
+" let g:ropevim_autoimport_modules = ["os", "shutil"]
+" setlocal omnifunc=RopeCompleteFunc
+" let g:ropevim_prefer_py3=1
+" let b:ropevim_prefer_py3=1
+
+if executable('pyls')
+ au User lsp_setup call lsp#register_server({
+ \ 'name': 'pyls',
+ \ 'cmd': {server_info->['pyls']},
+ \ 'whitelist': ['python'],
+ \ })
+endif
+" lsc let g:lsc_server_commands = {
+" lsc \ 'python': {
+" lsc \ 'command': 'pyls',
+" lsc \ 'log_level': -1,
+" lsc \ 'suppress_stderr': v:true,
+" lsc \ }
+" lsc \}
+" lsc let g:lsc_auto_map = {
+" lsc \ 'GoToDefinition': 'gd',
+" lsc \ 'FindReferences': 'gr',
+" lsc \ 'Rename': 'gR',
+" lsc \ 'ShowHover': 'K',
+" lsc \ 'Completion': 'omnifunc',
+" lsc \}
+" lsc let g:lsc_enable_autocomplete = v:true
+" lsc let g:lsc_enable_diagnostics = v:false
+" lsc let g:lsc_reference_highlights = v:false
+" lsc let g:lsc_trace_level = 'off'
" set foldmethod=indent
let python_highlight_all=1
"
" Check Python files with flake8 and pylint.
-let b:ale_linters = ['pyls']
-" , 'flake8', 'pylint', 'bandit', 'mypy', 'prospector', 'pycodestyle', 'pydocstyle', 'pyflakes', 'pylama', 'pyre', 'vulture']
+let b:ale_linters = ['pyls', 'flake8', 'pylint', 'pycodestyle', 'pydocstyle', 'bandit', 'mypy', 'prospector', 'pyflakes', 'pylama', 'pyre', 'vulture']
" Fix Python files black.
let b:ale_fixers = ['black', 'isort', 'remove_trailing_lines', 'reorder-python-imports', 'trim_whitespace', 'add_blank_lines_for_python_control_statements']
diff --git a/.vimrc b/.vimrc
index 8b9725b..995488d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -4,33 +4,29 @@
call plug#begin('~/.vim/plugged')
"
Plug 'dense-analysis/ale'
+Plug 'prabirshrestha/async.vim'
+Plug 'prabirshrestha/vim-lsp'
+
+Plug 'jpalardy/vim-slime'
+
Plug 'tpope/vim-fugitive'
Plug 'shumphrey/fugitive-gitlab.vim'
-Plug 'davidhalter/jedi-vim'
-Plug 'vim-scripts/loremipsum'
-Plug 'python-rope/ropemode'
-Plug 'python-rope/ropevim'
-Plug 'tmhedberg/SimpylFold'
-Plug 'jacoborus/tender.vim'
Plug 'tpope/vim-rhubarb'
-Plug 'jpalardy/vim-slime'
+
+Plug 'vim-scripts/loremipsum'
Plug 'tpope/vim-surround'
-Plug 'tpope/vim-vividchalk'
-Plug 'vimwiki/vimwiki'
-Plug 'prabirshrestha/async.vim'
-Plug 'prabirshrestha/vim-lsp'
+
+" Plug 'tmhedberg/SimpylFold'
+" Plug 'vimwiki/vimwiki'
+" Plug 'python-rope/ropemode'
+" Plug 'python-rope/ropevim'
+" Plug 'davidhalter/jedi-vim'
+" Plug 'jacoborus/tender.vim'
+" Plug 'tpope/vim-vividchalk'
+" Plug 'natebosch/vim-lsc'
"
call plug#end()
-if executable('pyls')
- au User lsp_setup call lsp#register_server({
- \ 'name': 'pyls',
- \ 'cmd': {server_info->['pyls']},
- \ 'whitelist': ['python'],
- \ })
-endif
-
-
" }}}
" Configuration settings ------------------{{{
--
GitLab