asdf

1 files changed, 36 insertions, 15 deletions

diff --git a/nvim/init.vim b/nvim/init.vim
index 26fe0ad..699fcb4 100755
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -12,23 +12,37 @@ Plug 'ap/vim-css-color'
 Plug 'junegunn/goyo.vim'
 Plug 'vimwiki/vimwiki'
 Plug 'tpope/vim-commentary'
+Plug 'hrsh7th/nvim-cmp'                  " The completion plugin
+Plug 'hrsh7th/cmp-buffer'                " buffer completions
+Plug 'hrsh7th/cmp-path'                  " path completions
+Plug 'hrsh7th/cmp-cmdline'               " cmdline completions
+Plug 'hrsh7th/cmp-nvim-lsp'
+Plug 'saadparwaiz1/cmp_luasnip'          " snippet completions
+Plug 'L3MON4D3/LuaSnip'                  " snippet engine
+Plug 'rafamadriz/friendly-snippets'      " a bunch of snippets to use
+Plug 'neovim/nvim-lspconfig'             " enable LSP
+Plug 'williamboman/mason.nvim'           " simple to use language server installer
+Plug 'williamboman/mason-lspconfig.nvim' " simple to use language server installer
 call plug#end()
 
+" lua require('user.cmp')
+" lua require('user.lsp')
+
 "" Basic options
-set autochdir			" Always change directory to current file
-set autoindent			" Keeps indentation on new lines
-set hlsearch			" Highlight search hits
-set ignorecase			" Case-insensitive search...
-set linebreak			" Word wrap
-set list			" Show whitespace characters defined in listchars
-set listchars=tab:▏\ \,space:·	" Highlight tabs and spaces
-set mouse=a			" Because sometimes it's just easier to use the mouse
-set number relativenumber	" Enable relative line numbers
-set smartcase			" ...Unless the search term is capital
-set splitbelow splitright	" Open splits on bottom/right instead of top/left
-set termguicolors		" Enable GUI colors for the terminal to get truecolor
-set wildmode=longest,list,full	" Enable file auto-complete
-syntax on			" Enable syntax highlighting
+set autochdir                  " Always change directory to current file
+set autoindent                 " Keeps indentation on new lines
+set hlsearch                   " Highlight search hits
+set ignorecase                 " Case-insensitive search...
+set linebreak                  " Word wrap
+set list                       " Show whitespace characters defined in listchars
+set listchars=tab:▏\ \,space:· " Highlight tabs and spaces
+set mouse=a                    " Because sometimes it's just easier to use the mouse
+set number relativenumber	   " Enable relative line numbers
+set smartcase                  " ...Unless the search term is capital
+set splitbelow splitright	   " Open splits on bottom/right instead of top/left
+set termguicolors              " Enable GUI colors for the terminal to get truecolor
+set wildmode=longest,list,full " Enable file auto-complete
+syntax on                      " Enable syntax highlighting
 
 " Get rid of the pointless .viminfo files that clutter the home directory
 let skip_defaults_vim=1
@@ -37,6 +51,13 @@ set viminfo=""
 " Disables automatic commenting on newline:
 autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
 
+" Tabbing
+let tabwidth = 4
+set tabstop=4                  " Set width of tabs to 4 instead of default 8
+set shiftwidth=4               " Tab key will only insert 1 tab
+" Use tabs instead of spaces
+autocmd FileType sass setlocal noet ci pi sts=0 sw=4 ts=4
+
 "" Plugin options
 " Closetag
 let g:closetag_filenames = '*.html,*.xhtml,*.phtml'
@@ -160,4 +181,4 @@ augroup END
 
 "" Auto compile
 " Sass
-autocmd BufWritePost [^_]*.sass,[^_]*.scss silent !sass %:p %:p:r.css
+"autocmd BufWritePost [^_]*.sass,[^_]*.scss silent !sass %:p %:p:r.css