From 00efb1065b2a5164f87e7eb8dc4854e7bfd984d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <es.ensar@gmail.com>
Date: Thu, 4 Mar 2021 20:29:11 +0100
Subject: [PATCH] Clean up NeoVim configuration

---
 symlinks/config/nvim/README.md               |  9 ++------
 symlinks/config/nvim/after/ftplugin/text.vim |  2 +-
 symlinks/config/nvim/lua/init/plugins.lua    |  1 +
 symlinks/config/nvim/plugin/vsnip.vim        | 22 --------------------
 symlinks/vim/README.md                       |  4 +++-
 5 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 symlinks/config/nvim/plugin/vsnip.vim

diff --git a/symlinks/config/nvim/README.md b/symlinks/config/nvim/README.md
index 5cd2597..3d33dc4 100644
--- a/symlinks/config/nvim/README.md
+++ b/symlinks/config/nvim/README.md
@@ -1,6 +1,4 @@
-## My vim configuration
-
-Currently configuration is shared between Vim and NeoVim, although I use NeoVim. Migration will happen when NeoVim 0.5.0 is released and `init.lua` is supported.
+## My NeoVim configuration
 
 Configuration is separated into directories:
  - `plugin` for logical collection of functionalities into a simple plugin
@@ -10,7 +8,4 @@ Configuration is separated into directories:
  - `undodir` is just a placeholder for configured undo directory
  - `spell` for spelling dictionary
  - `after` with same directory structure for loading after plugins - allows easy overrides, most `ftplugins` are here
-
-Besides this, directory contains other files:
- - `plugins.vim` all used plugins
- - `vimrc` global basic configuration
+ - `lua` for all lua config files, with `ftplugin` and `plugin` too, enabled by [astronauta](https://github.com/tjdevries/astronauta.nvim)
diff --git a/symlinks/config/nvim/after/ftplugin/text.vim b/symlinks/config/nvim/after/ftplugin/text.vim
index 1693a33..07f6fc3 100644
--- a/symlinks/config/nvim/after/ftplugin/text.vim
+++ b/symlinks/config/nvim/after/ftplugin/text.vim
@@ -1,3 +1,3 @@
 setlocal textwidth=78
-set spell
+setlocal spell
 let b:undo_ftplugin .= '|setlocal textwidth< spell<'
diff --git a/symlinks/config/nvim/lua/init/plugins.lua b/symlinks/config/nvim/lua/init/plugins.lua
index 6eaf078..19ccaca 100644
--- a/symlinks/config/nvim/lua/init/plugins.lua
+++ b/symlinks/config/nvim/lua/init/plugins.lua
@@ -32,6 +32,7 @@ return require('packer').startup {
       use 'wellle/targets.vim'                       -- Additional targets for inside and around motions
       use 'flazz/vim-colorschemes'                   -- All popular colorschemes
       use 'romainl/vim-qf'                           -- Quickfix list upgrades
+      use 'romainl/vim-devdocs'                      -- Quick DevDocs.io search using :DD
 
       -- Tools                                       --
       use 'direnv/direnv.vim'                        -- Integration with Direnv
diff --git a/symlinks/config/nvim/plugin/vsnip.vim b/symlinks/config/nvim/plugin/vsnip.vim
deleted file mode 100644
index 9b58695..0000000
--- a/symlinks/config/nvim/plugin/vsnip.vim
+++ /dev/null
@@ -1,22 +0,0 @@
-" NOTE: You can use other key to expand snippet.
-
-" Expand
-imap <expr> <C-j>   vsnip#expandable()  ? '<Plug>(vsnip-expand)'         : '<C-j>'
-smap <expr> <C-j>   vsnip#expandable()  ? '<Plug>(vsnip-expand)'         : '<C-j>'
-
-" Expand or jump
-imap <expr> <C-l>   vsnip#available(1)  ? '<Plug>(vsnip-expand-or-jump)' : '<C-l>'
-smap <expr> <C-l>   vsnip#available(1)  ? '<Plug>(vsnip-expand-or-jump)' : '<C-l>'
-
-" Jump forward or backward
-imap <expr> <Tab>   vsnip#jumpable(1)   ? '<Plug>(vsnip-jump-next)'      : '<Tab>'
-smap <expr> <Tab>   vsnip#jumpable(1)   ? '<Plug>(vsnip-jump-next)'      : '<Tab>'
-imap <expr> <S-Tab> vsnip#jumpable(-1)  ? '<Plug>(vsnip-jump-prev)'      : '<S-Tab>'
-smap <expr> <S-Tab> vsnip#jumpable(-1)  ? '<Plug>(vsnip-jump-prev)'      : '<S-Tab>'
-
-" Select or cut text to use as $TM_SELECTED_TEXT in the next snippet.
-" See https://github.com/hrsh7th/vim-vsnip/pull/50
-nmap        s   <Plug>(vsnip-select-text)
-xmap        s   <Plug>(vsnip-select-text)
-nmap        S   <Plug>(vsnip-cut-text)
-xmap        S   <Plug>(vsnip-cut-text)
diff --git a/symlinks/vim/README.md b/symlinks/vim/README.md
index 8e29b74..5cd2597 100644
--- a/symlinks/vim/README.md
+++ b/symlinks/vim/README.md
@@ -1,4 +1,6 @@
-## My NeoVim configuration
+## My vim configuration
+
+Currently configuration is shared between Vim and NeoVim, although I use NeoVim. Migration will happen when NeoVim 0.5.0 is released and `init.lua` is supported.
 
 Configuration is separated into directories:
  - `plugin` for logical collection of functionalities into a simple plugin