1 files changed, 69 insertions, 202 deletions

diff --git a/init.lua b/init.lua
index 2dc45ee..a68778d 100644
--- a/init.lua
+++ b/init.lua
@@ -1,213 +1,80 @@
-vim.cmd('source ~/.vim/vimrc')
-
-vim.opt.termguicolors = true
-vim.opt.exrc = true
-vim.opt.foldmethod = 'syntax'
-
-if vim.fn.has("win32") then
-  vim.opt.rtp:append(vim.fn.expand("$HOME\\scoop\\shims"))
+--------------------------------------------------------------------------------
+-- vim options, first sourced from vimrc, then appended by Neovim specific stuff
+--------------------------------------------------------------------------------
+local configdir = vim.fn.fnamemodify(vim.fn.expand("$MYVIMRC"), ":p:h")
+vim.cmd('source ' .. configdir .. '/vimrc')
+
+vim.opt.encoding='utf-8'
+vim.opt.inccommand = "nosplit" -- Neovim only: preview substitute and such things in real time 
+vim.opt.shadafile = configdir .. "/shada.file"
+
+--------------------------------------------------------------------------------
+-- Bootstrap lazy.nvim
+--------------------------------------------------------------------------------
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out, "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
 end
+vim.opt.rtp:prepend(lazypath)
 
-vim.opt.runtimepath:remove("/usr/share/vim/vimfiles")
-vim.keymap.set('n', '<F12>', ':Buffers<CR>')
-
-
-
--- vim.o.shadafile = "/tmp/shada"
-
--- 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()
-
--- 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' }
+require("lazy").setup({
+        spec = {
+        { import = "plugins", },
+  'coderonline/vim-fancy-line',
+  'coderonline/vim-recently-used',
   }
 })
 
--- 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' }
-  })
+-- Restore cursor position
+vim.api.nvim_create_autocmd({ "BufReadPost" }, {
+    callback = function() vim.cmd('silent! normal! g`"zv') end
 })
 
+-- LSP says 'fix available', but there is no such command? Let us fix that:
+vim.api.nvim_create_user_command(
+  'LspFix',
+  function()
+    vim.lsp.buf.code_action()
+  end, {}
+)
+
+-- speaking of lsp, lets enable logging (TODO: remove if you remove
+-- `lua/cmp.lua`, but why would you?)
+vim.g.lsp_log_verbose = 1
+vim.g.lsp_log_file = configdir .. ('/vim-lsp.log')
+vim.lsp.set_log_level 'error'
+if vim.fn.has 'nvim-0.5.1' == 1 then
+  require('vim.lsp.log').set_format_func(vim.inspect)
+end
 
--- # 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{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}
-
--- 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('lspconfig')['pylsp'].setup{
-  settings = {
-    pylsp = {
-      plugins = {
-        pycodestyle = {
-          ignore = {'W391'},
-          maxLineLength = 100
-        }
-      }
-    }
-  }
-}
-
--- lua
-require('lspconfig')['lua_ls'].setup{
-    settings = {
-        Lua = {
-            diagnostics = {
-                globals = { 'vim', 'require', 'cmp' }
-            }
-        }
-    }
-}
-
-
-require'nvim-treesitter.configs'.setup {
-  -- A list of parser names, or "all"
-  ensure_installed = { "c", "bash", "javascript" },
-
-  -- Install parsers synchronously (only applied to `ensure_installed`)
-  sync_install = false,
-
-  -- Automatically install missing parsers when entering buffer
-  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
-  auto_install = true,
-
-  -- List of parsers to ignore installing (for "all")
-  ignore_install = { "javascript" },
-
-  ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
-  -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
-
-  highlight = {
-    -- `false` will disable the whole extension
-    enable = true,
-
-    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
-    additional_vim_regex_highlighting = false,
-  },
-}
-
--- vim.wo.foldtext = 'v:lua.vim.treesitter.foldtext()' -- not available yet in my installation
-vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
-vim.wo.foldlevel = 1
+-- If you need scoop for some dependencies on Windows machines this may come
+-- handy:
+if vim.fn.has("win32") then
+  vim.opt.rtp:append(vim.fn.expand("$HOME\\scoop\\shims"))
+end
 
+if vim.g.neovide then
+  vim.guifont = "monospace:h11:b"
+  vim.g.neovide_cursor_animation_length = 0.03
+  vim.g.neovide_cursor_trail_size = 0.8
+  vim.g.neovide_scroll_animation_length = 0.05
+  vim.g.neovide_transparency = 0.9
+  vim.g.neovide_cursor_animation_length=0
+  vim.g.neovide_cursor_vfx_mode = ""
+  vim.g.neovide_floating_blur_amount_x = 4.0
+  vim.g.neovide_floating_blur_amount_y = 4.0
+  vim.g.neovide_background_color = '#383a62'
+  vim.g.neovide_scale_factor = 1.0
+end
 
 -- vim: tabstop=2 shiftwidth=2 softtabstop=2