Variant nvim-lua#2

Author: besaint

lua/Lazy.lua

@@ -12,30 +12,32 @@ end
 vim.opt.rtp:prepend(lazypath)
 
 require('lazy').setup({
+    'nvim-lua/plenary.nvim',
+
     -- Git related plugins
     'tpope/vim-fugitive',
     'tpope/vim-rhubarb',
 
     -- Detect tabstop and shiftwidth automatically
     -- 'tpope/vim-sleuth',
 
-    "famiu/bufdelete.nvim",
+    'famiu/bufdelete.nvim',
     {
         'akinsho/bufferline.nvim',
-        version = "*",
+        version = '*',
         dependencies = 'nvim-tree/nvim-web-devicons',
         opts = {
             options = {
                 offsets = {
                     {
-                        filetype = "NvimTree",
-                        text = "File Explorer",
-                        text_align = "center",
+                        filetype = 'NvimTree',
+                        text = 'File Explorer',
+                        text_align = 'center',
                         separator = false,
                     },
                 },
             },
-        }
+        },
     },
 
     {
@@ -48,54 +50,55 @@ require('lazy').setup({
 
     {
         'windwp/nvim-autopairs',
-        event = "insertenter",
-        opts = {}
+        event = 'insertenter',
+        opts = {},
     },
     {
-        "windwp/nvim-ts-autotag",
+        'windwp/nvim-ts-autotag',
         config = function()
-            require("nvim-ts-autotag").setup()
+            require('nvim-ts-autotag').setup()
         end,
     },
 
     {
-        "folke/trouble.nvim",
-        dependencies = { "nvim-tree/nvim-web-devicons" },
+        'folke/trouble.nvim',
+        dependencies = { 'nvim-tree/nvim-web-devicons' },
         opts = {},
     },
 
     {
-        "petertriho/nvim-scrollbar",
-        event = "VeryLazy",
+        'petertriho/nvim-scrollbar',
+        event = 'VeryLazy',
         config = function()
-            local scrollbar = require("scrollbar")
-            scrollbar.setup({
+            local scrollbar = require 'scrollbar'
+            scrollbar.setup {
                 show_in_active_only = true,
                 handle = {
                     blend = 0,
-                    text = " ",
-                    color = "#1c1c1c",
+                    text = ' ',
+                    color = '#1c1c1c',
                     color_nr = 234,
                 },
                 marks = {
-                    Search = { color = "#C9A554" },
-                    Error  = { color = "#685742" },
-                    Warn   = { color = "#B36D43" },
-                    Info   = { color = "#5f875f" },
-                    Hint   = { color = "#5f875f" },
-                    Misc   = { color = "#bb7744" },
-                    Cursor = { color = "#222222", text = " " },
-                }
-            })
+                    Search = { color = '#C9A554' },
+                    Error = { color = '#685742' },
+                    Warn = { color = '#B36D43' },
+                    Info = { color = '#5f875f' },
+                    Hint = { color = '#5f875f' },
+                    Misc = { color = '#bb7744' },
+                    Cursor = { color = '#222222', text = ' ' },
+                },
+            }
         end,
     },
 
     {
-        "kylechui/nvim-surround",
-        version = "*", -- Use for stability; omit to use `main` branch for the latest features
-        event = "VeryLazy",
+        'kylechui/nvim-surround',
+        version = '*', -- Use for stability; omit to use `main` branch for the latest features
+        event = 'VeryLazy',
         opts = {},
     },
 
-    { import = 'plugins' }
+    { import = 'plugins' },
+    { import = 'plugins.lsp' },
 }, {})

lua/keymaps.lua

@@ -21,43 +21,43 @@ vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = tr
 vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
 -- Better window navigation
-keymap("n", "<C-h>", "<C-w>h", opts)
-keymap("n", "<C-j>", "<C-w>j", opts)
-keymap("n", "<C-k>", "<C-w>k", opts)
-keymap("n", "<C-l>", "<C-w>l", opts)
+keymap('n', '<C-h>', '<C-w>h', opts)
+keymap('n', '<C-j>', '<C-w>j', opts)
+keymap('n', '<C-k>', '<C-w>k', opts)
+keymap('n', '<C-l>', '<C-w>l', opts)
 
 -- Resize with arrows
-keymap("n", "<C-Up>", ";resize -2<CR>", opts)
-keymap("n", "<C-Down>", ";resize +2<CR>", opts)
-keymap("n", "<C-Left>", ":vertical resize -2<CR>", opts)
-keymap("n", "<C-Right>", ":vertical resize +2<CR>", opts)
+keymap('n', '<C-Up>', ';resize -2<CR>', opts)
+keymap('n', '<C-Down>', ';resize +2<CR>', opts)
+keymap('n', '<C-Left>', ':vertical resize -2<CR>', opts)
+keymap('n', '<C-Right>', ':vertical resize +2<CR>', opts)
 
 -- Navigate buffers
-keymap("n", "<S-l>", ":bnext<CR>", opts)
-keymap("n", "<S-h>", ":bprevious<CR>", opts)
+keymap('n', '<S-l>', ':bnext<CR>', opts)
+keymap('n', '<S-h>', ':bprevious<CR>', opts)
 
 -- Clear highlights
 -- keymap("n", "<leader>h", "<cmd>nohlsearch<CR>", opts)
 
 -- Cancel search highlighting with ESC
-keymap("n", "<ESC>", ":nohlsearch<Bar>:echo<CR>", opts)
+keymap('n', '<ESC>', ':nohlsearch<Bar>:echo<CR>', opts)
 
 -- Close buffers
-keymap("n", "<S-q>", "<cmd>Bdelete!<CR>", opts)
+keymap('n', '<S-q>', '<cmd>Bdelete!<CR>', opts)
 
 -- Paste over currently selected text without yanking it
-keymap("v", "p", '"_dP', opts)
+-- keymap("v", "p", '"_dP', opts)
 
 -- Insert --
 -- Press jk fast to enter
-keymap("i", "jj", "<ESC>", opts)
-keymap("i", "kk", "<ESC>", opts)
+keymap('i', 'jj', '<ESC>', opts)
+keymap('i', 'kk', '<ESC>', opts)
 
 -- Visual --
 -- Stay in indent mode
-keymap("v", "<", "<gv", opts)
-keymap("v", ">", ">gv", opts)
+keymap('v', '<', '<gv', opts)
+keymap('v', '>', '>gv', opts)
 
 -- Move selected line / block of text in visual mode
-keymap("x", "K", ":move '<-2<CR>gv-gv", opts)
-keymap("x", "J", ":move '>+1<CR>gv-gv", opts)
+keymap('x', 'K', ":move '<-2<CR>gv-gv", opts)
+keymap('x', 'J', ":move '>+1<CR>gv-gv", opts)

lua/options.lua

@@ -37,12 +37,12 @@ vim.o.mouse = 'a'
 --  See `:help 'clipboard'`
 vim.o.clipboard = 'unnamedplus'
 
-vim.opt.colorcolumn = "79"
+vim.opt.colorcolumn = '79'
 
 -- searching
 vim.o.hlsearch = true
 vim.o.incsearch = true
-vim.o.inccommand = "split"
+vim.o.inccommand = 'split'
 
 -- Keep signcolumn on by default
 vim.wo.signcolumn = 'yes'
@@ -92,19 +92,19 @@ vim.o.smartcase = true
 vim.o.infercase = true
 
 -- make backspace behave in a sane manner
-vim.o.backspace = "indent,eol,start"
+vim.o.backspace = 'indent,eol,start'
 
 -- show matching brackets/parenthesis
 vim.opt.showmatch = true
 
 -- disable startup message
-vim.opt.shortmess:append("sI")
+vim.opt.shortmess:append 'sI'
 
 -- cmd display (set to zero to autohide)
 vim.opt.cmdheight = 1
 
 -- gutter sizing
-vim.opt.signcolumn = "yes:2"
+vim.opt.signcolumn = 'yes:2'
 
 -- syntax highlighting
 vim.opt.termguicolors = true
@@ -125,10 +125,21 @@ vim.opt.cursorline = true
 -- set cursorcolumn = true
 
 -- show invisibles
-vim.opt.listchars = { tab = "  ", trail = "·", extends = "»", precedes = "«", nbsp = "░" }
+vim.opt.listchars = { tab = '  ', trail = '·', extends = '»', precedes = '«', nbsp = '░' }
 vim.opt.list = true
 
 -- split style
-vim.opt.fillchars = { vert = "▒" }
+vim.opt.fillchars = { vert = '▒' }
 vim.opt.splitbelow = true
 vim.opt.splitright = true
+
+local function system(command)
+    local file = assert(io.popen(command, 'r'))
+    local output = file:read('*all'):gsub('%s+', '')
+    file:close()
+    return output
+end
+
+if vim.fn.executable 'python3' > 0 then
+    vim.g.python3_host_prog = system 'which python3'
+end

lua/plugins/cmp.lua

@@ -1,65 +1,74 @@
-local M = {
-    -- Autocompletion
+return {
     'hrsh7th/nvim-cmp',
+    event = 'InsertEnter',
     dependencies = {
-        -- Snippet Engine & its associated nvim-cmp source
-        'L3MON4D3/LuaSnip',
-        'saadparwaiz1/cmp_luasnip',
+        'hrsh7th/cmp-buffer', -- source for text in buffer
+        'hrsh7th/cmp-path', -- source for file system paths
+        'L3MON4D3/LuaSnip', -- snippet engine
+        'saadparwaiz1/cmp_luasnip', -- for autocompletion
+        'rafamadriz/friendly-snippets', -- useful snippets
+        'onsails/lspkind.nvim', -- vs-code like pictograms
+    },
+    config = function()
+        local cmp = require 'cmp'
 
-        -- Adds LSP completion capabilities
-        'hrsh7th/cmp-nvim-lsp',
+        local luasnip = require 'luasnip'
 
-        -- Adds a number of user-friendly snippets
-        -- 'rafamadriz/friendly-snippets',
-    },
-}
+        local lspkind = require 'lspkind'
 
-function M.config()
-    local cmp = require 'cmp'
-    local luasnip = require 'luasnip'
-    require('luasnip.loaders.from_vscode').lazy_load()
-    luasnip.config.setup {}
+        -- loads vscode style snippets from installed plugins (e.g. friendly-snippets)
+        require('luasnip.loaders.from_vscode').lazy_load()
 
-    cmp.setup {
-        snippet = {
-            expand = function(args)
-                luasnip.lsp_expand(args.body)
-            end,
-        },
-        mapping = cmp.mapping.preset.insert {
-            ['<C-j>'] = cmp.mapping.select_next_item(),
-            ['<C-k>'] = cmp.mapping.select_prev_item(),
-            ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-            ['<C-u>'] = cmp.mapping.scroll_docs(4),
-            ['<C-Space>'] = cmp.mapping.complete {},
-            ['<CR>'] = cmp.mapping.confirm {
-                behavior = cmp.ConfirmBehavior.Replace,
-                select = true,
+        cmp.setup {
+            completion = {
+                completeopt = 'menu,menuone,preview,noselect',
             },
-            ['<Tab>'] = cmp.mapping(function(fallback)
-                if cmp.visible() then
-                    cmp.select_next_item()
-                elseif luasnip.expand_or_locally_jumpable() then
-                    luasnip.expand_or_jump()
-                else
-                    fallback()
-                end
-            end, { 'i', 's' }),
-            ['<S-Tab>'] = cmp.mapping(function(fallback)
-                if cmp.visible() then
-                    cmp.select_prev_item()
-                elseif luasnip.locally_jumpable(-1) then
-                    luasnip.jump(-1)
-                else
-                    fallback()
-                end
-            end, { 'i', 's' }),
-        },
-        sources = {
-            { name = 'nvim_lsp' },
-            { name = 'luasnip' },
-        },
-    }
-end
-
-return M
+            snippet = { -- configure how nvim-cmp interacts with snippet engine
+                expand = function(args)
+                    luasnip.lsp_expand(args.body)
+                end,
+            },
+            mapping = cmp.mapping.preset.insert {
+                ['<C-k>'] = cmp.mapping.select_prev_item(), -- previous suggestion
+                ['<C-j>'] = cmp.mapping.select_next_item(), -- next suggestion
+                ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+                ['<C-f>'] = cmp.mapping.scroll_docs(4),
+                ['<C-Space>'] = cmp.mapping.complete(), -- show completion suggestions
+                ['<C-e>'] = cmp.mapping.abort(), -- close completion window
+                ['<CR>'] = cmp.mapping.confirm { select = false },
+                ['<Tab>'] = cmp.mapping(function(fallback)
+                    if cmp.visible() then
+                        cmp.select_next_item()
+                    elseif luasnip.expand_or_locally_jumpable() then
+                        luasnip.expand_or_jump()
+                    else
+                        fallback()
+                    end
+                end, { 'i', 's' }),
+                ['<S-Tab>'] = cmp.mapping(function(fallback)
+                    if cmp.visible() then
+                        cmp.select_prev_item()
+                    elseif luasnip.locally_jumpable(-1) then
+                        luasnip.jump(-1)
+                    else
+                        fallback()
+                    end
+                end, { 'i', 's' }),
+            },
+            -- sources for autocompletion
+            sources = cmp.config.sources {
+                { name = 'nvim_lsp' },
+                { name = 'luasnip' }, -- snippets
+                { name = 'buffer' }, -- text within current buffer
+                { name = 'path' }, -- file system paths
+            },
+            -- configure lspkind for vs-code like pictograms in completion menu
+            formatting = {
+                format = lspkind.cmp_format {
+                    maxwidth = 50,
+                    ellipsis_char = '...',
+                },
+            },
+        }
+    end,
+}