23 files changed, 198 insertions, 162 deletions

diff --git a/.gitmodules b/.gitmodules
index 986283d..92552d3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,6 @@
 [submodule "pack/submodules/start/nvim-cmp"]
         path = pack/nvim/start/nvim-cmp
         url = https://github.com/hrsh7th/nvim-cmp
-[submodule "pack/submodules/start/nvim-lspconfig"]
-        path = pack/nvim/start/nvim-lspconfig
-        url = https://github.com/neovim/nvim-lspconfig
 [submodule "pack/submodules/start/nvim-cmp-nvim-lsp"]
         path = pack/nvim/start/nvim-cmp-nvim-lsp
         url = https://github.com/hrsh7th/cmp-nvim-lsp
@@ -61,3 +58,21 @@
 [submodule "pack/all/start/fzf.vim"]
         path = pack/all/start/fzf.vim
         url = https://github.com/junegunn/fzf.vim
+[submodule "pack/all/start/fzf"]
+        path = pack/all/start/fzf
+        url = https://github.com/junegunn/fzf
+[submodule "pack/nvim/start/nvim-telescope"]
+        path = pack/nvim/start/nvim-telescope
+        url = https://github.com/nvim-telescope/telescope.nvim
+[submodule "pack/nvim/start/nvim-plenary"]
+        path = pack/nvim/start/nvim-plenary
+        url = https://github.com/nvim-lua/plenary.nvim
+[submodule "pack/nvim/start/nvim-lua-language-server"]
+        path = pack/nvim/start/nvim-lua-language-server
+        url = https://github.com/LuaLS/lua-language-server
+[submodule "pack/nvim/start/nvim-lspconfig"]
+        path = pack/nvim/start/nvim-lspconfig
+        url = https://github.com/neovim/nvim-lspconfig
+[submodule "pack/nvim/start/nvim-lsp"]
+        path = pack/nvim/start/nvim-lsp
+        url = https://github.com/prabirshrestha/vim-lsp
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
deleted file mode 120000
index 64e3fd4..0000000
--- a/after/syntax/cpp.vim
+++ /dev/null
@@ -1 +0,0 @@
-c.vim
\ No newline at end of file
diff --git a/gvimrc b/gvimrc
new file mode 100644
index 0000000..eda4fc7
--- /dev/null
+++ b/gvimrc
@@ -0,0 +1,30 @@
+" ======================================================================================================================
+" GUI_DEFAULTS:
+" We want to have a minimal UI
+" ======================================================================================================================
+
+if has("gui_running")
+  set guicursor=a:block-blinkon100
+  set browsedir=buffer
+  set toolbar+=text
+  set guiheadroom=0
+  set guioptions+=eig
+  set guioptions-=T   | " toolbar
+  set guioptions+=c   | " use console dialogues instead of popups
+  set guioptions+=a   | " auto select: copy&paste using middle click
+  set guioptions+=m   | " remove menu
+  set guioptions-=e   | " do not display tabs
+  set guioptions-=L   | " do not show left scrollbar
+  set guioptions-=r   | " do not show right scrollbar
+  set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
+  " set selectmode=mouse,key,cmd  | " enters vim's select mode when pressing shift-left or shift-END
+  " set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text
+
+  set background=light
+  " its possible to define alternative fonts (order matters), but we will
+  " use the systems default font and cofigure that if necessary
+  set guifont=Monospace\ 10
+
+  " like in the terminal: use Ctrl-shift-v for paste in vim's command editor
+  cnoremap <c-s-v> <c-r>*
+endif
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
diff --git a/pack/all/start/fzf b/pack/all/start/fzf
new file mode 160000
+Subproject 70c461c60bb1e2165a378e8ba0451b511c29b5c
diff --git a/pack/all/start/fzf.vim b/pack/all/start/fzf.vim
-Subproject 0f03107bc94b31a9c7adcee6da8e5de7492e4b0
+Subproject d1016dbd7cec2d2a3bb5863776c84b4034e4b85
diff --git a/pack/all/start/vim-editorconfig b/pack/all/start/vim-editorconfig
-Subproject 30ddc057f71287c3ac2beca876e7ae6d5abe26a
+Subproject e014708e917b457e8f6c57f357d55dd3826880d
diff --git a/pack/all/start/vim-fancy-line b/pack/all/start/vim-fancy-line
-Subproject bf4fadce4d57396ccbadd0493cac294fe6c69b9
+Subproject 6bef9966d5f15203c1567516a5da49b72121423
diff --git a/pack/nvim/start/nvim-cmp b/pack/nvim/start/nvim-cmp
-Subproject c49ad26e894e137e401b1d294948c46327877ea
+Subproject d3a3056204e1a9dbb7c7fe36c114dc43b681768
diff --git a/pack/nvim/start/nvim-cmp-lsp-signature-help b/pack/nvim/start/nvim-cmp-lsp-signature-help
-Subproject d2768cb1b83de649d57d967085fe73c5e01f8fd
+Subproject 3d8912ebeb56e5ae08ef0906e3a54de1c66b92f
diff --git a/pack/nvim/start/nvim-cmp-nvim-lsp b/pack/nvim/start/nvim-cmp-nvim-lsp
-Subproject 59224771f91b86d1de12570b4070fe4ad7cd1ee
+Subproject 44b16d11215dce86f253ce0c30949813c0a9076
diff --git a/pack/nvim/start/nvim-lsp b/pack/nvim/start/nvim-lsp
new file mode 160000
+Subproject c58edb98f09a650612adaaf8c47995c9e2b7ffb
diff --git a/pack/nvim/start/nvim-lspconfig b/pack/nvim/start/nvim-lspconfig
-Subproject 6b43ce561d97412cc512b569db6938e44529293
+Subproject 38da5bbe1eaab2394056109e48c7e195bdb8fdf
diff --git a/pack/nvim/start/nvim-lua-language-server b/pack/nvim/start/nvim-lua-language-server
new file mode 160000
+Subproject ce964793afc6251673238c256a25e06502e487b
diff --git a/pack/nvim/start/nvim-plenary b/pack/nvim/start/nvim-plenary
new file mode 160000
+Subproject 50012918b2fc8357b87cff2a7f7f0446e47da17
diff --git a/pack/nvim/start/nvim-telescope b/pack/nvim/start/nvim-telescope
new file mode 160000
+Subproject 74ce793a60759e3db0d265174f137fb62743035
diff --git a/pack/nvim/start/nvim-treesitter b/pack/nvim/start/nvim-treesitter
-Subproject 68e8181dbcf29330716d380e5669f2cd838eadb
+Subproject 4a68f0778c05083cc458a3a144205cfc4147443
diff --git a/pack/nvim/start/nvim-vsnip b/pack/nvim/start/nvim-vsnip
-Subproject 8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558
+Subproject be277461265f1e5c7db470aa479f30956597ea9
diff --git a/pack/vim/opt/vim-youcompleteme b/pack/vim/opt/vim-youcompleteme
-Subproject 88efc6f6035e4c656e8791f3c3a8a4328a1634d
+Subproject cc9a3ae3efdcc7d038aab0620ea28882533c236
diff --git a/plugin/lsp.nvim b/plugin/lsp.nvim
new file mode 100644
index 0000000..979b35f
--- /dev/null
+++ b/plugin/lsp.nvim
@@ -0,0 +1 @@
+command! LspFix lua vim.lsp.buf.code_action()
diff --git a/utils/applications/vim.desktop b/utils/applications/vim.desktop
index f8efe76..8169f57 100644..100755
--- a/utils/applications/vim.desktop
+++ b/utils/applications/vim.desktop
@@ -1,13 +1,15 @@
 [Desktop Entry]
-X-Desktop-File-Install-Version=0.23
+Version=1.0
 Type=Application
-Name=Vi IMproved->buffer2
-Icon=gvim
+Name=Vi IMproved
 Comment=Open file in an existing instance of vi and in a new tab
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-X-XClassHintResName=VIM
+Icon=gvim
+MimeType=text/*
 Categories=Application;Utility;TextEditor;
-# Exec=vim --servername VIM --remote-silent %F
-Exec=xfce4-terminal -e "bash -c '~/.bashrc ; vim --servername VIM --remote-silent %F'"
+Exec=vim %F
 Terminal=true
-StartupNotify=true
+Actions=Server;
+
+[Desktop Action Server]
+Exec=vim --servername VIM --remote-silent %F
+Name=Browse in Server
diff --git a/vimrc b/vimrc
index ea8ee2b..4a81724 100644
--- a/vimrc
+++ b/vimrc
@@ -8,11 +8,11 @@ set signcolumn=yes
 set foldcolumn=1
 
 
-if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY))
-  autocmd TextYankPost  *  call system("wl-copy", get(v:event, 'regcontents'))
-  nnoremap p   :silent  put    =system('wl-paste')<CR>
-  nnoremap P   :silent  put!   =system('wl-paste')<CR>
-endif
+" if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY))
+"   autocmd TextYankPost  *  call system("wl-copy", get(v:event, 'regcontents'))
+"   nnoremap p   :silent  put    =system('wl-paste')<CR>
+"   nnoremap P   :silent  put!   =system('wl-paste')<CR>
+" endif
 
 
 if has("nvim")
diff --git a/vimrc-common b/vimrc-common
index c7d450d..6c06c66 100644
--- a/vimrc-common
+++ b/vimrc-common
@@ -221,9 +221,9 @@ if has("autocmd")
   " Workaround: Allows Vim to yank text within wayland
   " XDG_SESSION_TYPE is only set if a login manager was used
   " WAYLAND_DISPLAY should always work
-  if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY)) && !has('nvim')
-    autocmd TextYankPost       * call system("wl-copy", getreg('+'))
-  endif 
+  " if ($XDG_SESSION_TYPE ==# 'wayland' || ! empty($WAYLAND_DISPLAY)) && !has('nvim')
+  "  autocmd TextYankPost       * call system("wl-copy", getreg('+'))
+  " endif 
 
   autocmd TextYankPost       *  echo '> text yanked to '.
         \ (get(v:event,'regname') == ''