Add vim-slime and vim-ipython-cell

Added interactive python repl commands with two plugins:
Sending repl snippets over with vim-slime and interacting with python
(notebook-like) snippets in the editor with vim-ipython-cell.

Cells are simply demarcated by `## ` at the beginning of a line, though
they can have other syntaxes as well, e.g. `# %% `.

By default slime sends its commands over to the last used tmux pane so
it is easy to set up a split coding/repl-ing session.

Interaction mappings all center around <leader>c + another key.
You can send a simple cell with `<leader>cc` or `<leader>C`,
single lines or selections with `<leader>cs`.

You can switch between cells with `]c` `[c` and insert new ones
below/above existing ones with `<leader>co` `<leader>cO` respectively.

git/.config/git/config

@@ -45,6 +45,11 @@
 [url "git@gitlab.com:"]
   pushInsteadOf = "https://gitlab.com"
   pushInsteadOf = "http://gitlab.com"
+[url "git@git.martyoeh.me:"]
+  pushInsteadOf = "https://git.martyoeh.me"
+  pushInsteadOf = "http://git.martyoeh.me"
+  pushInsteadOf = "git@martyoeh.me"
+  pullInsteadOf = "git@martyoeh.me"
 [filter "lfs"]
   clean         = git-lfs clean -- %f
   smudge        = git-lfs smudge -- %f

nvim/.config/nvim/lua/maps.lua

@@ -71,16 +71,14 @@ map.n.nore[']a'] = ':next<cr>'
 map.n.nore['[b'] = ':bprevious<cr>'
 map.n.nore[']b'] = ':bnext<cr>'
 -- Quickfix list
-map.n.nore['[c'] = ':cprevious<cr>'
+map.n.nore['[q'] = ':cprevious<cr>'
-map.n.nore[']c'] = ':cnext<cr>'
+map.n.nore[']q'] = ':cnext<cr>'
 -- Location list
 map.n.nore['[l'] = ':lprevious<cr>'
 map.n.nore[']l'] = ':lnext<cr>'
 -- Hunks (from gitsigns)
-map.n.nore.expr['[h'] =
+map.n.nore.expr['[h'] = [[&diff ? ']c' : '<cmd>Gitsigns prev_hunk<CR>']]
-    [[&diff ? ']c' : '<cmd>lua require("gitsigns.actions").prev_hunk()<CR>']]
+map.n.nore.expr[']h'] = [[&diff ? '[c' : '<cmd>Gitsigns next_hunk<CR>']]
-map.n.nore.expr[']h'] =
-    [[&diff ? '[c' : '<cmd>lua require("gitsigns.actions").next_hunk()<CR>']]
 
 -- set our leader key to space since with hjkl, space is largely useless
 vim.g.mapleader = " "
@@ -257,3 +255,22 @@ map.n.nore['<leader>ww'] = [[:lua require 'zettelkasten'.open_index()<cr> ]]
 -- PLUGIN: toggleterm.nvim
 -- create a lazygit window, set up in toggleterm settings
 map.n.nore['<leader>G'] = ':Lazygit<cr>'
+
+-- PLUGIN: slime and ipython-cell
+-- send line / region, not adhering to cells
+map.n['<leader>cs'] = '<Plug>SlimeLineSend'
+map.x['<leader>cs'] = '<Plug>SlimeRegionSend'
+-- send complete script to repl / benchmark execution
+map.n.nore['<leader>cr'] = ':IPythonCellRun<cr>'
+map.n.nore['<leader>cR'] = ':IPythonCellRunTime<cr>'
+-- send current cell / send and go to next
+map.n.nore['<leader>cc'] = ':IPythonCellExecuteCellVerbose<cr>'
+map.n.nore['<leader>C'] = ':IPythonCellExecuteCellVerboseJump<cr>'
+-- clear ipython repl
+map.n.nore['<leader>cl'] = ':IPythonCellClear<cr>'
+-- jump to previous/ next cell
+map.n.nore[']c'] = ':IPythonCellNextCell<cr>'
+map.n.nore['[c'] = ':IPythonCellPrevCell<cr>'
+-- insert cell header above/below
+map.n.nore['<leader>cO'] = ':IPythonCellInsertAbove<cr>a'
+map.n.nore['<leader>co'] = ':IPythonCellInsertBelow<cr>a'

nvim/.config/nvim/lua/plug/_autopair.lua

@@ -1,8 +1,4 @@
 require('nvim-autopairs').setup({check_ts = true})
-require("nvim-autopairs.completion.compe").setup({
-    map_cr = true, --  map <CR> on insert mode
-    map_complete = true -- it will auto insert `(` after select function or method item
-})
 
 --- Auto-space rules
 local npairs = require 'nvim-autopairs'
@@ -14,3 +10,9 @@ npairs.add_rules {
         return vim.tbl_contains({'()', '[]', '{}'}, pair)
     end)
 }
+local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+local cmp = require('cmp')
+cmp.event:on('confirm_done',
+             cmp_autopairs.on_confirm_done({map_char = {tex = ''}}))
+-- add a lisp filetype (wrap my-function), FYI: Hardcoded = { "clojure", "clojurescript", "fennel", "janet" }
+cmp_autopairs.lisp[#cmp_autopairs.lisp + 1] = "racket"

nvim/.config/nvim/lua/plug/_indent-blankline.lua

@@ -1,14 +1,11 @@
 -- Settings for indentBlankline
 -- turn off for diff views since we want to compare directly
-if vim.wo.diff then
+if vim.wo.diff then vim.g["indent_blankline_enabled"] = false end
-  vim.g["indent_blankline_enabled"] = false
-end
 
 vim.g.indent_blankline_char = "▏"
 
 vim.g.indent_blankline_filetype_exclude = {
-    "help", "undotree",
+    "help", "undotree", "markdown", "text", "pandoc", "rst", "asciidoc",
-    "markdown", "text", "pandoc", "rst", "asciidoc",
     "vim-plug"
 }
 vim.g.indent_blankline_buftype_exclude = {"terminal"}

nvim/.config/nvim/lua/plug/_lsp.lua

@@ -2,7 +2,23 @@ local api = vim.api
 
 local saga = require 'lspsaga'
 local lspcfg = require 'lspconfig'
-local compe = require 'compe'
+local cmp = require 'cmp'
+local lspkind = require 'lspkind'
+
+require"lsp_signature".setup()
+
+local has_words_before = function()
+    local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+    return col ~= 0 and
+               vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col,
+                                                                          col)
+                   :match("%s") == nil
+end
+
+local feedkey = function(key, mode)
+    vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true),
+                          mode, true)
+end
 
 -- Enable the following language servers
 local servers = {
@@ -10,35 +26,77 @@ local servers = {
     -- sumneko_lua further down, needs more setup
 }
 
-vim.o.completeopt = "menuone,noselect"
+vim.o.completeopt = "menu,menuone,noselect"
--- completion sources, higher priority = closer to the top?
+
-compe.setup({
+-- completion items
-    source = {
+require('cmp').register_source('vCard', require('completion_vcard').setup_cmp(
-        nvim_lsp = {kind = ""},
+                                   '~/documents/contacts/myconts'))
-        nvim_treesitter = {kind = "⧻"},
+vim.g.vsnip_snippet_dir = (vim.env.XDG_DATA_HOME or "~/.local/share") ..
-        buffer = {kind = ""},
+                              "/nvim/snippets"
-        path = {kind = ""},
+cmp.setup({
-        calc = {kind = ""},
+    snippet = {expand = function(args) vim.fn["vsnip#anonymous"](args.body) end},
-        nvim_lua = true,
+    mapping = {
-        emoji = {
+        ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), {'i', 'c'}),
-            kind = "ﲃ",
+        ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), {'i', 'c'}),
-            filetypes = {"markdown", "text", "pandoc", "rst", "asciidoc"}
+        ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), {'i', 'c'}),
+        ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
+        ['<C-e>'] = cmp.mapping({
+            i = cmp.mapping.abort(),
+            c = cmp.mapping.close()
+        }),
+        -- Accept currently selected item. If none selected, `select` first item.
+        -- Set `select` to `false` to only confirm explicitly selected items.
+        ['<CR>'] = cmp.mapping.confirm({select = false}),
+        ["<C-n>"] = cmp.mapping(function(fallback)
+            if cmp.visible() then
+                cmp.select_next_item()
+            elseif vim.fn["vsnip#available"](1) == 1 then
+                feedkey("<Plug>(vsnip-expand-or-jump)", "")
+            elseif has_words_before() then
+                cmp.complete()
+            else
+                fallback()
+            end
+        end, {"i", "s"}),
+
+        ["<C-p>"] = cmp.mapping(function()
+            if cmp.visible() then
+                cmp.select_prev_item()
+            elseif vim.fn["vsnip#jumpable"](-1) == 1 then
+                feedkey("<Plug>(vsnip-jump-prev)", "")
+            end
+        end, {"i", "s"})
     },
-        latex_symbols = {
+    formatting = {
-            kind = "λ",
+        format = lspkind.cmp_format({
-            filetypes = {"markdown", "text", "pandoc", "rst", "asciidoc"}
+            with_text = false,
+            menu = ({
+                buffer = "B",
+                nvim_lua = "NLua",
+                tmux = "τ",
+                vCard = "VCARD"
+            })
+        })
     },
-        tmux = {kind = "τ"},
+    sources = cmp.config.sources({
-        spell = {kind = "", priority = 0},
+        {name = 'path'}, {name = 'nvim_lsp'}, {name = 'treesitter'},
-        vsnip = true
+        {name = 'tmux'}, {name = 'vsnip'}, {name = 'latex_symbols'},
-    }
+        {name = 'pandoc_references'}, {name = 'vCard'}
+    }, {{name = 'buffer'}, {name = 'spell'}})
 })
 
-local capabilities = vim.lsp.protocol.make_client_capabilities()
+-- Use buffer source for `/` search
-capabilities.textDocument.completion.completionItem.snippetSupport = true
+cmp.setup.cmdline('/', {sources = {{name = 'buffer'}}})
-capabilities.textDocument.completion.completionItem.resolveSupport = {
+
-    properties = {'documentation', 'detail', 'additionalTextEdits'}
+-- Use cmdline & path source for ':' in vim
-}
+cmp.setup.cmdline(':', {
+    sources = cmp.config.sources({{name = 'path'}}, {{name = 'cmdline'}})
+})
+
+-- Setup lspconfig.
+local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp
+                                                                     .protocol
+                                                                     .make_client_capabilities())
 
 local on_attach = function(_, _)
     -- Keybindings for LSPs
@@ -109,7 +167,9 @@ local on_attach = function(_, _)
 end
 
 -- set up simple servers
-for _, lsp in ipairs(servers) do lspcfg[lsp].setup {on_attach = on_attach} end
+for _, lsp in ipairs(servers) do
+    lspcfg[lsp].setup {on_attach = on_attach, capabilities = capabilities}
+end
 
 lspcfg.efm.setup {
     on_attach = on_attach,

nvim/.config/nvim/lua/plugins.lua

@@ -26,16 +26,22 @@ require("packer").startup(function()
     use 'jeffkreeftmeijer/vim-numbertoggle' -- toggles numbers to absolute for all buffers but the current which is relative
     use 'RRethy/vim-illuminate' -- highlight other occurences of the word under cursor
     use 'ggandor/lightspeed.nvim' -- jump between letters with improved fFtT quicksearch, mimics sneak
-    use 'lukas-reineke/indent-blankline.nvim' -- show a vertical line for each indentation
+    -- use { -- weird errors currently
-    require('plug._indent-blankline')
+    --     'lukas-reineke/indent-blankline.nvim', -- show a vertical line for each indentation
-
+    --     config = function() require('plug._indent-blankline') end
+    -- }
     -- files
     use 'vifm/vifm.vim' -- integrate file manager
     use {
         'lewis6991/gitsigns.nvim', -- show vcs changes on left-hand gutter
         requires = {'nvim-lua/plenary.nvim'},
         tag = 'release',
-        config = function() require('gitsigns').setup() end,
+        config = function() require('gitsigns').setup{
+            keymaps = {
+                ['n ]c'] = nil,
+                ['n [c'] = nil,
+            }
+        } end,
         event = "BufRead"
     }
     use {
@@ -123,9 +129,27 @@ require("packer").startup(function()
     -- languages
     use {'euclidianAce/BetterLua.vim', ft = 'lua'} -- better syntax highlighting for lua
 
+    -- REPL work
+    use {
+        'jpalardy/vim-slime', -- send arbitrary code chunks to REPLs
+        ft = "python",
+        config = function()
+            vim.g.slime_target = 'tmux'
+            vim.g.slime_default_config = {socket_name = "default", target_pane = "{last}"}
+            vim.g.slime_python_ipython = 1
+            vim.g.slime_no_mappings = 1
+        end,
+    }
+    use { 'hanschen/vim-ipython-cell', -- send code 'cells' to REPL
+        ft = "python",
+        config = function()
+            vim.g.ipython_cell_highlight_cells_ft = {'python'}
+            vim.g.ipython_cell_insert_tag = "## Cell"
+        end,
+    }
+
     --
     -- nvim plugs
-
     use 'Iron-E/nvim-cartographer' -- makes it easier to set mappings through lua
     use 'marty-oehme/zettelkasten.nvim' -- simple static markdown linking
     use {
@@ -145,12 +169,21 @@ require("packer").startup(function()
 
     -- lsp
     use 'neovim/nvim-lspconfig' -- some commong language server configurations
-    use 'tami5/lspsaga.nvim' -- nice and fast ui for lsp actions
+    use 'tami5/lspsaga.nvim' -- nice and fast ui for lsp actions WILL HAVE TO BE REPLACED SOON
     use 'simrat39/symbols-outline.nvim' -- vista-like outline view for code
+    use 'ray-x/lsp_signature.nvim'
     -- and completion
-    use 'hrsh7th/nvim-compe' -- simple completion engine built specifically for nvim and lsp
+    use {
-    use 'GoldsteinE/compe-latex-symbols' -- adding unicode symbols for latex (/pandoc) files
+        'hrsh7th/nvim-cmp', -- simple completion engine built specifically for nvim and lsp
-    use {'andersevenrud/compe-tmux', branch = 'compe' } -- completion source from adjacent tmux panes
+        requires = {
+            'onsails/lspkind-nvim', 'andersevenrud/cmp-tmux', -- completion source from adjacent tmux panes
+            'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-buffer', 'hrsh7th/cmp-path',
+            'hrsh7th/cmp-cmdline', 'hrsh7th/cmp-vsnip',
+            'kdheepak/cmp-latex-symbols', 'ray-x/cmp-treesitter',
+            'f3fora/cmp-spell', 'jc-doyle/cmp-pandoc-references',
+            'cbarrete/completion-vcard'
+        }
+    }
     -- snippeting
     use {"hrsh7th/vim-vsnip", event = "InsertEnter"} -- snippet engine
     use {"rafamadriz/friendly-snippets", event = "InsertEnter"} -- many snippets
@@ -181,5 +214,9 @@ require("packer").startup(function()
     }
     use 'p00f/nvim-ts-rainbow' -- rainbow brackets using treesitter
     use 'JoosepAlviste/nvim-ts-context-commentstring' -- improves commenting plugin above by using ts
+    use {
+        'lewis6991/spellsitter.nvim', -- uses treesitter to highlight spelling errors
+        config = function() require('spellsitter').setup() end
+    }
 
 end)