diff --git a/vim/.vim/ftplugin/julia.vim b/vim/.vim/ftplugin/julia.vim index 7d27a19..0e05d69 100644 --- a/vim/.vim/ftplugin/julia.vim +++ b/vim/.vim/ftplugin/julia.vim @@ -2,22 +2,4 @@ iabbrev #! #!/usr/bin/env julia iabbrev initmodeline # vim: set ft=julia ff=unix: -" IPython cell =========================================== -" Enables iPython Cell to copy commands into a julia REPL via tmux -let g:ipython_cell_delimit_cells_by = 'tags' -let g:ipython_cell_tag = ['##', '# %%', '#%%', '# '] -let g:ipython_cell_highlight_cells = 1 - -let g:ipython_cell_run_command = 'Base.run(`clear`); include("{filepath}")' -let g:ipython_cell_cell_command = 'include_string(Main, clipboard())' - -" REPL hotkeys. Overwrites default slime studio stuff - " Run entire file from top to bottom -nnoremap f :IPythonCellRun - " Run current cell -nnoremap r :IPythonCellExecuteCell -nnoremap e :IPythonCellExecuteCellJump - " Insert block seperator above -nnoremap b OS## Blockvb - " vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/python.vim b/vim/.vim/ftplugin/python.vim index 1ee146d..8c51069 100644 --- a/vim/.vim/ftplugin/python.vim +++ b/vim/.vim/ftplugin/python.vim @@ -24,28 +24,4 @@ highlight Error NONE " Python: function and class names onoremap ih :execute ":normal! ?def [A-z]\\+(\\\|class [A-z]*\\(:\\\|(\\)\r:noh\rwve" -" IPython cell =========================================== - " For true REPL-supporting languages -let g:ipython_cell_delimit_cells_by = 'tags' -let g:ipython_cell_tag = ['##', '# %%', '#%%', '# '] -let g:ipython_cell_highlight_cells = 1 - - " Use Makefile for REPL-like experience for most languages -let g:ipython_cell_cell_command = '%paste -q' -let g:ipython_cell_run_command = '%run {options} "{filepath}"' - - -hi! link IPythonCell Todo - -" Command hotkeys - " Connect to running Jupyter kernel -nnoremap q :JupyterConnect - " Run entire file from top to bottom -nnoremap f :JupyterRunFile - " Run current cell -nnoremap r :JupyterSendCell -nnoremap e :JupyterSendCell - " Insert block seperator above -nnoremap b OS## Blockvb - " vim: set ff=unix ft=vim: diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim index f1e1a5d..5864a7d 100644 --- a/vim/.vim/ftplugin/tex.vim +++ b/vim/.vim/ftplugin/tex.vim @@ -1,5 +1,5 @@ " Compile pdf -nnoremap r :VimtexCompileSS +nnoremap e :VimtexCompileSS nnoremap f :VimtexCompileSS " Fix unreadable highlight for matching environments diff --git a/vim/.vim/init_scripts/external_plugins.vim b/vim/.vim/init_scripts/external_plugins.vim index be4b58b..92141e5 100644 --- a/vim/.vim/init_scripts/external_plugins.vim +++ b/vim/.vim/init_scripts/external_plugins.vim @@ -22,9 +22,6 @@ Plug 'junegunn/fzf.vim' Plug 'romainl/vim-cool' " File system bindings Plug 'tpope/vim-eunuch' - " Movement extension -"Plug 'justinmk/vim-sneak' -"Plug 'easymotion/vim-easymotion' Plug 'wakatime/vim-wakatime' " Vim windows ==== @@ -171,20 +168,15 @@ let g:slime_studio_command1 = 'echo "make"' let g:slime_studio_command2 = 'echo "make run"' let g:slime_studio_command3 = 'echo "make submit"' -nnoremap r :exe "SlimeSend1 " . g:slime_studio_command1 -nnoremap r +nnoremap e :exe "SlimeSend1 " . g:slime_studio_command1 +nnoremap e \ :let g:slime_studio_command1 = \ input("Slime Studio (1): ", g:slime_studio_command1) -nnoremap e :exe "SlimeSend1 " . g:slime_studio_command2 -nnoremap e +nnoremap f :exe "SlimeSend1 " . g:slime_studio_command2 +nnoremap f \ :let g:slime_studio_command2 = \ input("Slime Studio (2): ", g:slime_studio_command2) - -nnoremap f :exe "SlimeSend1 " . g:slime_studio_command3 -nnoremap f - \ :let g:slime_studio_command3 = - \ input("Slime Studio (3): ", g:slime_studio_command3) endfunction call SlimeStudio() @@ -208,6 +200,7 @@ let g:ale_fixers = { let g:ale_sign_error = '❌' let g:ale_sign_warning = '⚠️' let g:ale_fix_on_save = 0 +let g:ale_enabled = 0 lua << EOF @@ -228,7 +221,7 @@ local on_attach = function(client, bufnr) end -- TypeScript -nvim_lsp.tsserver.setup { +nvim_lsp.ts_ls.setup { on_attach = on_attach, filetypes = { "typescript", "typescriptreact", "typescript.tsx" }, cmd = { "typescript-language-server", "--stdio" } @@ -241,6 +234,9 @@ let g:tabby_trigger_mode = 'auto' nnoremap :let g:tabby_trigger_mode = (g:tabby_trigger_mode == 'auto' ? 'manual' : 'auto') +" Psyncup integration (from bin) ========================= +nnoremap r :!~/.configs_pointer/psyncup.py --recurse-up --up + " FZF setup ============================================== " Open hotkeys for fzf nnoremap :Files