1 files changed, 131 insertions, 142 deletions

diff --git a/init.lua b/init.lua
index d58bbba..c710f99 100644
--- a/init.lua
+++ b/init.lua
@@ -3,56 +3,150 @@ vim.cmd('source ~/.vim/vimrc')
 vim.o.termguicolors = true
 vim.o.exrc = true
 
-vim.o.shadafile = (os.getenv("XDG_CACHE_HOME") or
-                   os.getenv("HOME") .. "/.cache"
-                  ) .. "/vim.shada"
+if vim.fn.has("win32") then
+  vim.o.shell = 'cmd.exe'
+  vim.opt.rtp:append(vim.fn.expand("$HOME\\scoop\\shims"))
+end
 
--- vimscript: get(environ(), "XDG_CACHE_HOME", "~/.cache")."/vim.shada"
+-- vim.o.shadafile = "/tmp/shada"
 
-require'man'
+-- only on Linux...
+-- vim.o.shadafile = (os.getenv("XDG_CACHE_HOME") or
+--                    os.getenv("HOME") .. "/.cache"
+--                   ) .. "/vim.shada"
+-- vimscript: get(environ(), "XDG_CACHE_HOME", "~/.cache")."/vim.shada"
+-- require'man'
 
 require'colorizer'.setup()
 
--- language servers:
+-- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
+require('cmp_nvim_lsp').setup{}
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+
+local cmp = require('cmp');
+cmp.setup({
+  snippet = {
+    -- REQUIRED - you must specify a snippet engine
+    expand = function(args)
+      vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+      -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+      -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+      -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+    end,
+  },
+  window = {
+    completion = cmp.config.window.bordered(),
+    documentation = cmp.config.window.bordered(),
+  },
+  mapping = cmp.mapping.preset.insert({
+    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ["<Tab>"] = cmp.mapping.select_next_item({behavior=cmp.SelectBehavior.Insert}),
+    ["<S-Tab>"] = cmp.mapping.select_prev_item({behavior=cmp.SelectBehavior.Insert}),
+    ['<C-Space>'] = cmp.mapping.complete(),
+    ['<C-e>'] = cmp.mapping.abort(),
+    -- ['<CR>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+
+    ["<CR>"] = cmp.mapping.confirm({
+      behavior = cmp.ConfirmBehavior.Replace,
+      select = true,
+    }),
+
+    ['<C-s>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+  }),
+  sources = cmp.config.sources({
+    { name = 'nvim_lsp' },
+    { name = 'vsnip' }, -- For vsnip users.
+    -- { name = 'luasnip' }, -- For luasnip users.
+    -- { name = 'ultisnips' }, -- For ultisnips users.
+    -- { name = 'snippy' }, -- For snippy users.
+  }, {
+    { name = 'buffer' },
+  })
+})
+
+-- Set configuration for specific filetype.
+cmp.setup.filetype('gitcommit', {
+  sources = cmp.config.sources({
+    { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
+  }, {
+    { name = 'buffer' },
+  })
+})
+
+-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline({ '/', '?' }, {
+  -- mapping = cmp.mapping.preset.cmdline(),
+  sources = {
+    { name = 'buffer' }
+  }
+})
+
+-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline(':', {
+  -- mapping = cmp.mapping.preset.cmdline(),
+  sources = cmp.config.sources({
+    { name = 'cmdline' }
+  })
+})
+
+
+-- # Language Servers
 --   https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
 
+-- The following example advertise capabilities to `clangd`.
 -- C/C++ | clang
-require'lspconfig'.clangd.setup{}
+require('lspconfig')['clangd'].setup{capabilities = capabilities}
 
--- lua
-require'lspconfig'.sumneko_lua.setup{
-    settings = {
-        Lua = {
-            diagnostics = {
-                globals = { 'vim' }
-            }
-        }
-    }
-}
+-- bash | bash-language-server
+require('lspconfig')['bashls'].setup{capabilities = capabilities}
+
+-- ccs | vscode-css-languageserver
+require('lspconfig')['cssls'].setup{capabilities = capabilities}
+
+-- rust | rust-analyzer
+require('lspconfig')['rust_analyzer'].setup{capabilities = capabilities}
+
+-- javascript | eslint
+require('lspconfig')['eslint'].setup{capabilities = capabilities}
+
+-- javascript | typescript-language-server
+require('lspconfig')['tsserver'].setup{capabilities = capabilities}
+
+-- vimscript | vim-language-server
+require('lspconfig')['vimls'].setup{capabilities = capabilities}
+
+require('lspconfig')['html'].setup{capabilities = capabilities}
+
+require('lspconfig')['jsonls'].setup{capabilities = capabilities}
+
+-- C/C++ | clang
+require('lspconfig')['clangd'].setup{capabilities = capabilities}
 
 -- bash | bash-language-server
-require'lspconfig'.bashls.setup{}
+require('lspconfig')['bashls'].setup{capabilities = capabilities}
 
 -- ccs | vscode-css-languageserver
-require'lspconfig'.cssls.setup{}
+require('lspconfig')['cssls'].setup{capabilities = capabilities}
 
 -- rust | rust-analyzer
-require'lspconfig'.rust_analyzer.setup{}
+require('lspconfig')['rust_analyzer'].setup{capabilities = capabilities}
 
 -- javascript | eslint
-require'lspconfig'.eslint.setup{}
+require('lspconfig')['eslint'].setup{capabilities = capabilities}
 
 -- javascript | typescript-language-server
-require'lspconfig'.tsserver.setup{}
+require('lspconfig')['tsserver'].setup{capabilities = capabilities}
 
 -- vimscript | vim-language-server
-require'lspconfig'.vimls.setup{}
+require('lspconfig')['vimls'].setup{capabilities = capabilities}
 
-require'lspconfig'.html.setup{}
+require('lspconfig')['html'].setup{capabilities = capabilities}
 
-require'lspconfig'.jsonls.setup{}
+require('lspconfig')['jsonls'].setup{capabilities = capabilities}
 
-require'lspconfig'.pylsp.setup{
+require('lspconfig')['pylsp'].setup{
   settings = {
     pylsp = {
       plugins = {
@@ -65,123 +159,16 @@ require'lspconfig'.pylsp.setup{
   }
 }
 
-
-require'cmp_nvim_lsp'.setup{}
-
-require'cmp'.setup {
-  sources = {
-    { name = 'nvim_lsp' }
-  }
-}
-
--- -- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
--- 
--- -- The following example advertise capabilities to `clangd`.
-require'lspconfig'.clangd.setup {
-capabilities = capabilities,
-}
-
--- Set up nvim-cmp.
-local cmp = require'cmp'
-
-cmp.setup({
-  snippet = {
-  -- REQUIRED - you must specify a snippet engine
-  expand = function(args)
-  vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
-  -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-  -- require('snippy').expand_snippet(args.body) -- For `snippy` users.
-  -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-  end,
-  },
-  window = {
-    completion = cmp.config.window.bordered(),
-    documentation = cmp.config.window.bordered(),
-  },
-  mapping = cmp.mapping.preset.insert({
-  ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-  ['<C-f>'] = cmp.mapping.scroll_docs(4),
-  ['<C-Space>'] = cmp.mapping.complete(),
-  ['<C-e>'] = cmp.mapping.abort(),
-  -- ['<CR>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-
-  ["<CR>"] = cmp.mapping.confirm({
-    behavior = cmp.ConfirmBehavior.Replace,
-    select = true,
-  }),
-
-  ['<C-s>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-  }),
-  sources = cmp.config.sources({
-  { name = 'nvim_lsp' },
-  { name = 'vsnip' }, -- For vsnip users.
-  -- { name = 'luasnip' }, -- For luasnip users.
-  -- { name = 'ultisnips' }, -- For ultisnips users.
-  -- { name = 'snippy' }, -- For snippy users.
-  }, {
-  { name = 'buffer' },
-  })
-})
-
--- Set configuration for specific filetype.
-cmp.setup.filetype('gitcommit', {
-sources = cmp.config.sources({
-{ name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
-}, {
-{ name = 'buffer' },
-})
-})
-
--- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
-cmp.setup.cmdline({ '/', '?' }, {
-mapping = cmp.mapping.preset.cmdline(),
-sources = {
-{ name = 'buffer' }
+-- lua
+require('lspconfig')['lua_ls'].setup{
+    settings = {
+        Lua = {
+            diagnostics = {
+                globals = { 'vim', 'require', 'cmp' }
+            }
+        }
+    }
 }
-})
-
--- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-cmp.setup.cmdline(':', {
-mapping = cmp.mapping.preset.cmdline(),
-sources = cmp.config.sources({
-{ name = 'path' }
-}, {
-{ name = 'cmdline' }
-})
-})
-
--- -- Set up lspconfig.
--- local capabilities = require('cmp_nvim_lsp').default_capabilities()
--- -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
--- -- require('lspconfig')['<YOUR_LSP_SERVER>'].setup {
--- -- }
--- 
--- -- C/C++ | clang
--- require'lspconfig'.clangd.setup{capabilities = capabilities}
--- 
--- -- bash | bash-language-server
--- require'lspconfig'.bashls.setup{capabilities = capabilities}
--- 
--- -- ccs | vscode-css-languageserver
--- require'lspconfig'.cssls.setup{capabilities = capabilities}
--- 
--- -- rust | rust-analyzer
--- require'lspconfig'.rust_analyzer.setup{capabilities = capabilities}
--- 
--- -- javascript | eslint
--- require'lspconfig'.eslint.setup{capabilities = capabilities}
--- 
--- -- javascript | typescript-language-server
--- require'lspconfig'.tsserver.setup{capabilities = capabilities}
--- 
--- -- vimscript | vim-language-server
--- require'lspconfig'.vimls.setup{capabilities = capabilities}
--- 
--- require'lspconfig'.html.setup{capabilities = capabilities}
--- 
--- require'lspconfig'.jsonls.setup{capabilities = capabilities}
---
 
 
 require'nvim-treesitter.configs'.setup {
@@ -212,3 +199,5 @@ require'nvim-treesitter.configs'.setup {
     additional_vim_regex_highlighting = false,
   },
 }
+
+-- vim: tabstop=2 shiftwidth=2 softtabstop=2