From 59809f0f77d67e36fd88173b307cec04eeb8eee0 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Wed, 26 May 2021 22:18:02 +0200 Subject: [PATCH] - Disable visual multi until useful - Switch to darcula-solid theme --- .config/nvim/init.lua | 1 + .config/nvim/lua/globals.lua | 2 +- .config/nvim/lua/keymappings.lua | 22 +++++++++++----------- .config/nvim/lua/lsp/init.lua | 6 +++--- .config/nvim/lua/plugins.lua | 7 +++---- .config/nvim/lua/plugins/compe.lua | 26 +++++++++++++++++++++++++- 6 files changed, 44 insertions(+), 20 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d6efa2a..65d4718 100644 --- a/.config/nvim/init.lua +++ b/.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') diff --git a/.config/nvim/lua/globals.lua b/.config/nvim/lua/globals.lua index 21653a0..4153e4b 100644 --- a/.config/nvim/lua/globals.lua +++ b/.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, diff --git a/.config/nvim/lua/keymappings.lua b/.config/nvim/lua/keymappings.lua index 71c2524..3faf0f8 100644 --- a/.config/nvim/lua/keymappings.lua +++ b/.config/nvim/lua/keymappings.lua @@ -11,17 +11,17 @@ vim.api.nvim_set_keymap('n', '', 'l', {silent = true}) -- TODO fix this -- Terminal window navigation -vim.cmd([[ - tnoremap h - tnoremap j - tnoremap k - tnoremap l - inoremap h - inoremap j - inoremap k - inoremap l - tnoremap -]]) +--vim.cmd([[ + --tnoremap h + --tnoremap j + --tnoremap k + --tnoremap l + --inoremap h + --inoremap j + --inoremap k + --inoremap l + --tnoremap +--]]) -- resize with arrows vim.api.nvim_set_keymap('n', '', ':resize -2', {silent = true}) diff --git a/.config/nvim/lua/lsp/init.lua b/.config/nvim/lua/lsp/init.lua index 20dc51c..c2f5b6d 100644 --- a/.config/nvim/lua/lsp/init.lua +++ b/.config/nvim/lua/lsp/init.lua @@ -18,9 +18,9 @@ vim.fn.sign_define( vim.cmd("nnoremap gd lua vim.lsp.buf.definition()") vim.cmd("nnoremap gD lua vim.lsp.buf.declaration()") -vim.cmd("nnoremap gr lua vim.lsp.buf.references()") -vim.cmd("nnoremap gi lua vim.lsp.buf.implementation()") -vim.cmd("nnoremap ca :Lspsaga code_action") +--vim.cmd("nnoremap gr lua vim.lsp.buf.references()") +--vim.cmd("nnoremap gi lua vim.lsp.buf.implementation()") +--vim.cmd("nnoremap ca :Lspsaga code_action") vim.cmd("nnoremap K :Lspsaga hover_doc") -- vim.cmd('nnoremap lua vim.lsp.buf.signature_help()') vim.cmd("nnoremap :Lspsaga diagnostic_jump_prev") diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 719379e..6c6f36a 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.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'} diff --git a/.config/nvim/lua/plugins/compe.lua b/.config/nvim/lua/plugins/compe.lua index 44bbefc..506d9f8 100644 --- a/.config/nvim/lua/plugins/compe.lua +++ b/.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 "" + --elseif vim.fn.call("vsnip#available", {1}) == 1 then + --return t "(vsnip-expand-or-jump)" + elseif check_back_space() then + return t "" + else + return vim.fn['compe#complete']() + end +end + _G.s_tab_complete = function() if vim.fn.pumvisible() == 1 then return t "" @@ -41,6 +64,7 @@ _G.s_tab_complete = function() end end +vim.api.nvim_set_keymap("i", "", "v:lua.tab_complete()", {expr = true}) vim.api.nvim_set_keymap("s", "", "v:lua.tab_complete()", {expr = true}) vim.api.nvim_set_keymap("i", "", "v:lua.s_tab_complete()", {expr = true}) vim.api.nvim_set_keymap("s", "", "v:lua.s_tab_complete()", {expr = true})