Update init.vim

moonfly/config/nvim/init.vim

@@ -8,24 +8,26 @@ augroup packer_user_config
 augroup end
 
 " color configuration
-set termguicolors           " enable 24-bit RGB colors
-colorscheme moonfly 		" color scheme selection
+set termguicolors                       " enable 24-bit RGB colors
+colorscheme moonfly 		            " color scheme selection
 
 " core configuration				
-set scrolloff=7				" show 7 lines around the cursorline
-set tabstop=4				" length of a tab
-set expandtab				" tab uses tabstop length
-set shiftwidth=4			" level of indentation
-set number relativenumber	" enable line numbers
-set hidden  				" allow buffer switching without saving
-set ignorecase				" ignore case when searching
-set smartcase				" search for uppercase specifically only when you specify uppercase
-set cursorline				" show cursor line
-set showtabline=1			" disable tab line
-set guicursor=				" status bar shows mode; cursor doesn't need to
-set clipboard+=unnamedplus	" enable copy to system clipboard
-set noshowmode				" disable mode indicator as it is handled by lualine
-set re=1				    " use the original regex engine 
+set scrolloff=7				            " show 7 lines around the cursorline
+set tabstop=4				            " length of a tab
+set expandtab				            " tab uses tabstop length
+set shiftwidth=4			            " level of indentation
+set number relativenumber	            " enable line numbers
+set hidden  				            " allow buffer switching without saving
+set ignorecase				            " ignore case when searching
+set smartcase				            " search for uppercase specifically only when you specify uppercase
+set cursorline				            " show cursor line
+set showtabline=1			            " disable tab line
+set guicursor=				            " status bar shows mode; cursor doesn't need to
+set clipboard+=unnamedplus	            " enable copy to system clipboard
+set noshowmode				            " disable mode indicator as it is handled by lualine
+set re=1				                " use the original regex engine 
+set spelllang=en_us                     " set language for spell checking
+set completeopt=menu,menuone,noselect   " options for completion menu
 
 " keybindings			
 " set leader key
@@ -38,8 +40,8 @@ nnoremap <leader>fb 	<cmd>Telescope buffers<cr>
 nnoremap <leader>fd 	<cmd>Telescope file_browser<cr>
 
 " switch between buffers quickly
-nnoremap <C-N> :bn<CR>
-nnoremap <C-P> :bp<CR>
+nnoremap <C-N> :bn<cr>
+nnoremap <C-P> :bp<cr>
 
 " zenmode and twilight toggles
 nnoremap <leader>zm 	<cmd>ZenMode<cr>
@@ -53,8 +55,9 @@ let g:pencil#wrapModeDefault = 'soft'
 
 augroup pencil
 	autocmd!
-  		autocmd FileType markdown,mkd,gmi 	call pencil#init()
-		autocmd FileType text         		call pencil#init({'wrap': 'hard'})
+  		autocmd FileType markdown,mkd,gmi 	    call pencil#init()
+		autocmd FileType text         		    call pencil#init({'wrap': 'hard'})
+        autocmd FileType markdown,mkd,gmi,text  set spell
 	augroup END
 
 " autopairs configuration
@@ -92,14 +95,14 @@ require("lualine").setup {
 	disabled_filetypes = {'NvimTree'},
 	theme = 'moonfly',
 	component_separators = {left = '|', right = '|'},
-	section_separators = {left = '', right = ''},
+	section_separators = {left = '', right = ''},
 },
   sections = {
     lualine_a = {
 	{
       'mode',
-	  separator = {left = '', right = ''},
-      padding = { left = 1, right = 2 },
+	  separator = {left = '', right = ''},
+      padding = { left = 1, right = 1 },
       }
     },
     lualine_b = {
@@ -127,8 +130,8 @@ require("lualine").setup {
     lualine_z = {
     {
     'location',
-        separator = {left = '', right = ''},
-          padding = { left = 2, right = 1 },
+        separator = {left = '', right = ''},
+          padding = { left = 1, right = 1 },
         }
       },
   },
@@ -169,7 +172,7 @@ require("telescope").setup{
         horizontal = {
           mirror = false,
           prompt_position = 'top',
-          preview_width = 100,
+          preview_width = 80,
         },
       },
     },
@@ -185,3 +188,97 @@ EOF
 lua << EOF
 require("nvim-web-devicons").setup()
 EOF
+
+" nvim-tree setup
+lua << EOF
+require("nvim-tree").setup()
+EOF
+
+" lsp and accessories
+lua << EOF
+
+-- luasnip setup
+local luasnip = require('luasnip')
+
+-- lspkind setup
+local lspkind = require('lspkind')
+
+local cmp = require('cmp')
+
+cmp.setup({
+  snippet = {
+    expand = function(args)
+      require('luasnip').lsp_expand(args.body)
+  end,
+      },
+  mapping = {
+    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ['<C-Space>'] = cmp.mapping.complete(),
+    ['<C-e>'] = cmp.mapping.close(),
+    ['<CR>'] = cmp.mapping.confirm({ select = true }),
+      },
+  sources = {
+      { name = "buffer", keyword_length = 5 },
+      { name = "path" },
+      { name = "spell", keyword_length = 5 },
+      { name = "calc" },
+      { name = "emoji" },
+      { name = "nvim_lsp"},
+      { name = "nvim_lua"},
+      { name = "luasnip" },
+      },
+  formatting = {
+      format = lspkind.cmp_format({with_text = false, maxwidth = 50})
+      },
+  experimental = {
+      native_menu = false,
+      ghost_text = true,
+      }
+  })
+
+-- lua-language-server
+local system_name
+if vim.fn.has("unix") == 1 then
+    system_name = "Linux"
+else
+    print("Unsupported system for sumneko")
+end
+
+-- set the path to the sumneko installation
+local sumneko_binary = "/usr/bin/lua-language-server"
+
+local runtime_path = vim.split(package.path, ';')
+table.insert(runtime_path, "lua/?.lua")
+table.insert(runtime_path, "lua/?/init.lua")
+
+local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
+
+require'lspconfig'.sumneko_lua.setup {
+  cmd = {sumneko_binary, "-E"};
+  capabilities = capabilities,
+  settings = {
+    Lua = {
+      runtime = {
+        version = 'LuaJIT',
+        path = runtime_path,
+      },
+      diagnostics = {
+        globals = {'vim'},
+      },
+      workspace = {
+        library = vim.api.nvim_get_runtime_file("", true),
+      },
+      telemetry = {
+        enable = false,
+      },
+    },
+  },
+}
+
+-- bash language server
+local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
+require'lspconfig'.bashls.setup{
+  capabilities = capabilities,
+}
+EOF