2 files changed, 38 insertions, 33 deletions

diff --git a/init.vim b/init.vim
index d312d38..c5859b5 100644
--- a/init.vim
+++ b/init.vim
@@ -39,16 +39,6 @@ if has('nvim')
   " Neovim
   source ~/.config/nvim/nvim.lua
 else
-" Plugin
+  " Plugin
   source ~/.vim/vim-init/init/init-plugins.vim
 endif
-
-" Temp
-let g:NERDTreeWinPos = "right"
-let NERDTreeShowHidden=0
-let NERDTreeQuitOnOpen=1
-let NERDTreeIgnore = ['\.pyc$', '__pycache__']
-let g:NERDTreeWinSize=35
-map <leader>nn :NERDTreeToggle<cr>
-map <leader>nb :NERDTreeFromBookmark<Space>
-map <leader>nf :NERDTreeFind<cr>
diff --git a/nvim.lua b/nvim.lua
index 735bafe..91dd462 100644
--- a/nvim.lua
+++ b/nvim.lua
@@ -61,7 +61,6 @@ vim.opt.runtimepath:prepend(lazypath)
 --    as they will be available in your neovim runtime.
 require('lazy').setup({
   -- NOTE: First, some plugins that don't require any configuration
-
   -- Git related plugins
   'tpope/vim-fugitive',
   'tpope/vim-rhubarb',
@@ -76,9 +75,11 @@ require('lazy').setup({
   'nathangrigg/vim-beancount',
 
   -- For surrounding
-  'machakann/vim-sandwich',
-
+  'tpope/vim-surround',
 
+  -- From vim plugin
+  'junegunn/goyo.vim',
+  'itchyny/lightline.vim',
 
 
   -- NOTE: This is where your plugins related to LSP can be installed.
@@ -160,19 +161,19 @@ require('lazy').setup({
     end,
   },
 
-  {
-    -- Set lualine as statusline
-    'nvim-lualine/lualine.nvim',
-    -- See `:help lualine.txt`
-    opts = {
-      options = {
-        icons_enabled = false,
-        theme = 'onedark',
-        component_separators = '|',
-        section_separators = { left = '', right = '' },
-      },
-    },
-  },
+  --{
+  --  -- Set lualine as statusline
+  --  'nvim-lualine/lualine.nvim',
+  --  -- See `:help lualine.txt`
+  --  opts = {
+  --    options = {
+  --      icons_enabled = false,
+  --      theme = 'onedark',
+  --      component_separators = '|',
+  --      section_separators = { left = '', right = '' },
+  --    },
+  --  },
+  --},
 
   {
     -- Add indentation guides even on blank lines
@@ -303,12 +304,26 @@ vim.cmd("command! W execute 'SudaWrite %'")
 
 -- [[ Configure lualine ]]
 -- Change the background of lualine_b section for normal mode
-local custom_wombat = require 'lualine.themes.wombat'
-custom_wombat.normal.b.bg = '#a8a8a8'
-custom_wombat.normal.b.fg = '#444444'
-require('lualine').setup {
-  options = { theme = custom_wombat },
-}
+-- local custom_wombat = require 'lualine.themes.wombat'
+-- custom_wombat.normal.b.bg = '#a8a8a8'
+-- custom_wombat.normal.b.fg = '#444444'
+-- require('lualine').setup {
+--   options = { theme = custom_wombat },
+-- }
+-- [[ Configure lightline ]]
+vim.cmd("let g:lightline = { 'colorscheme': 'wombat' }")
+
+-- [[ Configure Goyo ]]
+vim.cmd("nnoremap <silent> <leader>z :Goyo<CR>")
+
+-- [[ Configure NERDTree ]]
+vim.cmd('let g:NERDTreeWinPos = "left"')
+vim.cmd("let NERDTreeShowHidden=0")
+vim.cmd("let NERDTreeQuitOnOpen=1")
+vim.api.nvim_set_var('NERDTreeWinSize', 35)
+vim.cmd("map <C-n> :NERDTreeToggle<cr>")
+vim.cmd("map <leader>nb :NERDTreeFromBookmark<Space>")
+vim.cmd("map <leader>nf :NERDTreeFind<cr>")
 
 -- [[ Highlight on yank ]]
 -- See `:help vim.highlight.on_yank()`