From 48090846e2a899c884988290a3b4c5933eec24fc Mon Sep 17 00:00:00 2001
From: Gregory Leeman <gl6@sanger.ac.uk>
Date: Wed, 24 Apr 2024 15:25:31 +0100
Subject: [PATCH] update

---
 after/ftplugin/python.vim |  3 ++-
 vimrc                     | 27 ++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/after/ftplugin/python.vim b/after/ftplugin/python.vim
index 5be73a9..6f3924d 100644
--- a/after/ftplugin/python.vim
+++ b/after/ftplugin/python.vim
@@ -1,3 +1,4 @@
 set expandtab
+let g:ale_python_flake8_options = '--ignore=E501,E402'
 let b:ale_linters = ['flake8']
-let b:ale_fixers = ['black', 'remove_trailing_lines', 'trim_whitespace',]
+let b:ale_fixers = ['black', 'remove_trailing_lines', 'trim_whitespace']
diff --git a/vimrc b/vimrc
index bbc48ae..2f56e1d 100644
--- a/vimrc
+++ b/vimrc
@@ -17,11 +17,11 @@ Plug 'airblade/vim-gitgutter'
 Plug 'dense-analysis/ale'
 Plug 'godlygeek/tabular'
 Plug 'itchyny/lightline.vim'
-Plug 'jpalardy/vim-slime', { 'branch': 'main' }
+" Plug 'jpalardy/vim-slime', { 'branch': 'main' }
+Plug 'jgdavey/tslime.vim'
 Plug 'justinmk/vim-dirvish'
 Plug 'ncm2/ncm2'
 Plug 'ncm2/ncm2-bufword'
-Plug 'ncm2/ncm2-cssomni'
 Plug 'ncm2/ncm2-jedi'
 Plug 'ncm2/ncm2-path'
 Plug 'ncm2/ncm2-tern'
@@ -30,6 +30,7 @@ Plug 'tmhedberg/SimpylFold'
 Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-surround'
+Plug 'vim-python/python-syntax'
 call plug#end()
 
 " options
@@ -75,9 +76,13 @@ function! FoldText()
 endfunction
 
 " variables
-let g:python3_host_prog="~/.env/bin/python"
-let g:slime_target = "tmux"
-let g:slime_default_config = {"socket_name": "default", "target_pane": ":.2"}
+if exists('$VIRTUAL_ENV')
+    let g:python3_host_prog = $VIRTUAL_ENV . '/bin/python'
+else
+	let g:python3_host_prog= $HOME . "/.env/bin/python"
+endif	
+" let g:slime_target = "tmux"
+" let g:slime_default_config = {"socket_name": "default", "target_pane": ":.2"}
 let g:lightline = {
 	\	'colorscheme': 'solarized',
 	\	'inactive': {
@@ -88,6 +93,9 @@ let g:lightline = {
 let g:ale_lint_on_save = 1
 let g:ale_fix_on_save = 0
 let g:ale_python_auto_virtualenv = 1
+let g:python_highlight_all = 1
+let g:tslime_always_current_session = 1
+let g:tslime_always_current_window = 1
 
 " mappings
 nnoremap <expr> x ((foldclosed('.')==-1)?('x'):('zo0x'))
@@ -104,14 +112,19 @@ nmap <C-A> <nop>
 vmap <C-A> <nop>
 nmap <C-X> <nop>
 vmap <C-X> <nop>
-nnoremap gn :GitGutterNextHunk<CR>
-nnoremap gp :GitGutterPrevHunk<CR>
+nnoremap <leader>gn :GitGutterNextHunk<CR>
+nnoremap <leader>gp :GitGutterPreviousHunk<CR>
+nnoremap <leader>an :ALENext<CR>
+nnoremap <leader>ap :ALEPrevious<CR>
 inoremap <expr> <CR> (pumvisible() ? "\<c-y>\<cr>" : "\<CR>")
 nnoremap <Tab> n
 nnoremap <S-Tab> N
 nnoremap / :execute "normal! mf"<CR>/
 nnoremap <Esc> <Esc>:noh<cr>
 nnoremap go <Esc>:noh<cr>`f
+vmap <C-c><C-c> <Plug>SendSelectionToTmux
+nmap <C-c><C-c> <Plug>NormalModeSendToTmux
+nmap <C-c>r <Plug>SetTmuxVars
 
 " autocommands
 autocmd BufEnter * call ncm2#enable_for_buffer()