nvim colorizer, cmdheight=2, cleaned up lua files a bit

4 files changed, 22 insertions, 14 deletions

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 6907a74..9858e3b 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -16,3 +16,13 @@ if has('persistent_undo')
 endif
 
 lua require 'init'
+
+" lua require'colorizer'.setup()
+lua << EOF
+require 'colorizer'.setup {
+  '*'; -- Highlight all files, but customize some others.
+  '!vim'; -- Exclude vim from highlighting.
+  css = { rgb_fn = true; }; -- Enable parsing rgb(...) functions in css.
+  html = { names = false; } -- Disable parsing "names" like Blue or Gray
+}
+EOF
diff --git a/.config/nvim/lua/opts.lua b/.config/nvim/lua/opts.lua
index 4500929..ef8472a 100644
--- a/.config/nvim/lua/opts.lua
+++ b/.config/nvim/lua/opts.lua
@@ -61,14 +61,15 @@ require'lspconfig'.sumneko_lua.setup {
     },
 }
 
+-- HTML, CSS, JS (TS), BASH
+require'lspconfig'.html.setup{}
+require'lspconfig'.cssls.setup{}
+require'lspconfig'.tsserver.setup{}
+require'lspconfig'.bashls.setup{}
+
 -- Treesitter
 require'nvim-treesitter.configs'.setup {
     highlight = {
         enable = true,
     },
 }
-
-require'lspconfig'.html.setup{}
-require'lspconfig'.cssls.setup{}
-require'lspconfig'.tsserver.setup{}
-require'lspconfig'.bashls.setup{}
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 49354f2..2866afe 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -1,6 +1,8 @@
 return require('packer').startup(function()
     use 'wbthomason/packer.nvim'
     use 'gruvbox-community/gruvbox'
+    use 'tpope/vim-fugitive'
+    use 'ThePrimeagen/vim-be-good'
 
     use 'neovim/nvim-lspconfig'
     use 'hrsh7th/nvim-cmp'
@@ -9,19 +11,13 @@ return require('packer').startup(function()
     use 'hrsh7th/cmp-path'
 
     use 'kyazdani42/nvim-web-devicons'
-
-    use {
-        'norcalli/nvim-colorizer.lua',
-        ft = { 'css', 'javascript', 'vim', 'html' },
-        config = [[require('colorizer').setup {'css', 'javascript', 'vim', 'html'}]],
-    }
+    use 'norcalli/nvim-colorizer.lua'
 
     use { 
         'nvim-telescope/telescope.nvim',
         requires = { {'nvim-lua/plenary.nvim'} }
     }
 
-    use 'tpope/vim-fugitive'
     use {
         'lewis6991/gitsigns.nvim',
         requires = {
@@ -41,6 +37,4 @@ return require('packer').startup(function()
         'nvim-treesitter/nvim-treesitter',
         run = ':TSUpdate'
     }
-
-    use 'ThePrimeagen/vim-be-good'
 end)
diff --git a/.config/nvim/lua/setup.lua b/.config/nvim/lua/setup.lua
index 9dc3698..ae460e7 100644
--- a/.config/nvim/lua/setup.lua
+++ b/.config/nvim/lua/setup.lua
@@ -18,6 +18,9 @@ set.autoindent = true
 set.expandtab = true
 set.showmode = false
 set.ruler = false
+set.cmdheight = 2
+set.timeout = false
+set.ttimeoutlen = 200
 
 vim.cmd('colorscheme gruvbox')
 vim.cmd('highlight CursorLineNr cterm=bold ctermfg=Yellow ctermbg=none')