2 files changed, 8 insertions, 7 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index ab4e89b..344b463 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -107,18 +107,19 @@ endfunction
 nnoremap gl :call ToggleQuit()<CR>
 
 " Simply exit when closing the last buffer
+
 function! Bye()
     " Delete current buffer if working on special filetype
     let specialFileTypes = ['help', 'netrw', 'vim-plug', 'nerdtree']
     if index(specialFileTypes, &filetype) != -1
-        :bdelete
+        :bdelete
     " Delete current buffer if more than one buffers
-    elseif len(filter(range(1, bufnr('$')), 'buflisted(v:val)')) != 1
-        :bdelete
+    elseif len(getbufinfo(bufnr())[0].windows) == 1 && len(getwininfo()) > 1
+        :bdelete
     elseif g:quitVimWhenPressingCtrlC
-    " Otherwise, quit vim
-        :silent! qall
-    else 
+        " Otherwise, quit vim
+        :silent! quit
+    else
         :echo "Press gl to allow quit with <C-c>"
     endif
 endfunction
diff --git a/vim/lazy/lazy.lua b/vim/lazy/lazy.lua
index 3925c36..3142c9a 100644
--- a/vim/lazy/lazy.lua
+++ b/vim/lazy/lazy.lua
@@ -376,7 +376,7 @@ vim.cmd("nnoremap <silent> <leader>z :Goyo<CR>")
 -- [[ Configure NERDTree ]]
 vim.g.NERDTreeWinPos = 'left'
 vim.g.NERDTreeShowHidden = 0
-vim.api.nvim_set_var('NERDTreeWinSize', 35)
+vim.api.nvim_set_var('NERDTreeWinSize', 22)
 vim.cmd("map <C-n> :NERDTreeToggle<cr>")
 vim.cmd("map <leader>nb :NERDTreeFromBookmark<Space>")
 vim.cmd("map <leader>nf :NERDTreeFind<cr>")