- Disable visual multi until useful

- Switch to darcula-solid theme

.config/nvim/init.lua

@@ -16,6 +16,7 @@ require('lsp.terraform-ls')
 
 require('plugins.telescope')
 require('plugins.telescope-project')
+require('plugins.treesitter')
 require('plugins.compe')
 require('plugins.which-key')
 require('plugins.lualine')

.config/nvim/lua/globals.lua

@@ -6,7 +6,7 @@ O = {
     clipboard = unnamedplus,
     incsearch = true,
     termguicolors = true,
-    colorscheme = 'monokai',
+    colorscheme = 'darcula-solid',
     hidden_files = true,
     wrap_lines = false,
     number = true,

.config/nvim/lua/keymappings.lua

@@ -11,17 +11,17 @@ vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', {silent = true})
 
 -- TODO fix this
 -- Terminal window navigation
-vim.cmd([[
-    tnoremap <C-h> <C-\><C-N><C-w>h
-    tnoremap <C-j> <C-\><C-N><C-w>j
-    tnoremap <C-k> <C-\><C-N><C-w>k
-    tnoremap <C-l> <C-\><C-N><C-w>l
-    inoremap <C-h> <C-\><C-N><C-w>h
-    inoremap <C-j> <C-\><C-N><C-w>j
-    inoremap <C-k> <C-\><C-N><C-w>k
-    inoremap <C-l> <C-\><C-N><C-w>l
-    tnoremap <Esc> <C-\><C-n>
-]])
+--vim.cmd([[
+    --tnoremap <C-h> <C-\><C-N><C-w>h
+    --tnoremap <C-j> <C-\><C-N><C-w>j
+    --tnoremap <C-k> <C-\><C-N><C-w>k
+    --tnoremap <C-l> <C-\><C-N><C-w>l
+    --inoremap <C-h> <C-\><C-N><C-w>h
+    --inoremap <C-j> <C-\><C-N><C-w>j
+    --inoremap <C-k> <C-\><C-N><C-w>k
+    --inoremap <C-l> <C-\><C-N><C-w>l
+    --tnoremap <Esc> <C-\><C-n>
+--]])
 
 -- resize with arrows
 vim.api.nvim_set_keymap('n', '<C-Up>', ':resize -2<CR>', {silent = true})

.config/nvim/lua/lsp/init.lua

@@ -18,9 +18,9 @@ vim.fn.sign_define(
 
 vim.cmd("nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>")
 vim.cmd("nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>")
-vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
-vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
-vim.cmd("nnoremap <silent> ca :Lspsaga code_action<CR>")
+--vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
+--vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
+--vim.cmd("nnoremap <silent> ca :Lspsaga code_action<CR>")
 vim.cmd("nnoremap <silent> K :Lspsaga hover_doc<CR>")
 -- vim.cmd('nnoremap <silent> <C-k> <cmd>lua vim.lsp.buf.signature_help()<CR>')
 vim.cmd("nnoremap <silent> <C-p> :Lspsaga diagnostic_jump_prev<CR>")

.config/nvim/lua/plugins.lua

@@ -44,12 +44,12 @@ return require("packer").startup(
         use {'junegunn/vim-easy-align'}
 
         -- Multiple cursors for editing
-        use {'mg979/vim-visual-multi', branch='master'}
+        --use {'mg979/vim-visual-multi', branch='master'}
 
         -- Goodies
         use {'tpope/vim-abolish'}
         use {'tpope/vim-fugitive'}
-        use {'tpope/vim-surround'}
+        use {'tpope/vim-surround'} -- ✅
 
         -- Treesitter
         use {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}
@@ -58,8 +58,6 @@ return require("packer").startup(
         vim.g.tagbar_ctags_bin = '/usr/local/bin/ctags'
 
         -- Status Line and Bufferline
-        -- use {"glepnir/galaxyline.nvim"}
-        --use {"romgrk/barbar.nvim"}
         use {
             'hoob3rt/lualine.nvim',
             requires = {'kyazdani42/nvim-web-devicons'}
@@ -123,6 +121,7 @@ return require("packer").startup(
         -- themes & colorschemes
         use {'challenger-deep-theme/vim', as='challenger-deep' }
         use {'dracula/vim', as='dracula' }
+        use { "briones-gabriel/darcula-solid.nvim", requires = "rktjmp/lush.nvim" }
         use {'shaunsingh/moonlight.nvim', as='moonlight'}
         use {'tanvirtin/monokai.nvim'}
         use {'arcticicestudio/nord-vim'}

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

@@ -12,7 +12,7 @@ require'compe'.setup {
   max_abbr_width = 100;
   max_kind_width = 100;
   max_menu_width = 100;
-  documentation = false;
+  documentation = true;
 
   source = {
     path = true;
@@ -31,6 +31,29 @@ require'compe'.setup {
 local t = function(str)
   return vim.api.nvim_replace_termcodes(str, true, true, true)
 end
+
+
+local check_back_space = function()
+    local col = vim.fn.col('.') - 1
+    if col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then
+        return true
+    else
+        return false
+    end
+end
+
+_G.tab_complete = function()
+  if vim.fn.pumvisible() == 1 then
+    return t "<C-n>"
+  --elseif vim.fn.call("vsnip#available", {1}) == 1 then
+    --return t "<Plug>(vsnip-expand-or-jump)"
+  elseif check_back_space() then
+    return t "<Tab>"
+  else
+    return vim.fn['compe#complete']()
+  end
+end
+
 _G.s_tab_complete = function()
   if vim.fn.pumvisible() == 1 then
     return t "<C-p>"
@@ -41,6 +64,7 @@ _G.s_tab_complete = function()
   end
 end
 
+vim.api.nvim_set_keymap("i", "<Tab>", "v:lua.tab_complete()", {expr = true})
 vim.api.nvim_set_keymap("s", "<Tab>", "v:lua.tab_complete()", {expr = true})
 vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
 vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})