Mix improvements (#206)

7 files changed, 17 insertions, 4 deletions

diff --git a/init.lua b/init.lua
index 99138407..dc4831b3 100644
--- a/init.lua
+++ b/init.lua
@@ -38,6 +38,7 @@ require('nv-indentline')
 require('nv-bookmark')
 require('nv-dadbod')
 require('nv-doge')
+require('nv-dependency')
 -- require('nv-lspinstall')
 
 -- Which Key (Hope to replace with Lua plugin someday)
diff --git a/lua/nv-barbar/init.lua b/lua/nv-barbar/init.lua
index 070bdb4f..49c1206b 100644
--- a/lua/nv-barbar/init.lua
+++ b/lua/nv-barbar/init.lua
@@ -1,2 +1,3 @@
 vim.api.nvim_set_keymap('n', '<TAB>', ':BufferNext<CR>', { noremap = true, silent = true })
 vim.api.nvim_set_keymap('n', '<S-TAB>', ':BufferPrevious<CR>', { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<S-x>', ':BufferClose<CR>', { noremap = true, silent = true })
diff --git a/lua/nv-dependency/init.lua b/lua/nv-dependency/init.lua
new file mode 100644
index 00000000..fc056d55
--- /dev/null
+++ b/lua/nv-dependency/init.lua
@@ -0,0 +1 @@
+require('dependency_assist').setup()
\ No newline at end of file
diff --git a/lua/nv-globals.lua b/lua/nv-globals.lua
index 36c92c23..48b7432b 100644
--- a/lua/nv-globals.lua
+++ b/lua/nv-globals.lua
@@ -2,6 +2,9 @@ O = {
     auto_close_tree = 0,
     auto_complete = true,
     colorscheme = 'nvcode',
+    hidden_files = true,
+    wrap_lines = true,
+    number = true,
     relative_number = true,
     shell = 'bash',
     database = {
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 387e659d..db94d660 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -88,9 +88,15 @@ return require('packer').startup(function(use)
     -- use 'gennaro-tedesco/nvim-jqx'
     -- use 'turbio/bracey.vim'
 
+    -- Php
+    use 'phpactor/phpactor'
+
     -- Flutter
     use 'thosakwe/vim-flutter'
 
+    -- Dependency assistent
+    use 'akinsho/dependency-assist.nvim'
+
     -- Registers
     -- use 'gennaro-tedesco/nvim-peekup'
 
@@ -113,6 +119,7 @@ return require('packer').startup(function(use)
     use 'andymass/vim-matchup'
     use 'MattesGroeger/vim-bookmarks'
     use 'windwp/nvim-autopairs'
+    use 'mbbill/undotree'
 
     -- Database
     use 'tpope/vim-dadbod'
diff --git a/lua/settings.lua b/lua/settings.lua
index db0178cf..1832c8e1 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -1,7 +1,7 @@
 vim.cmd('set iskeyword+=-') -- treat dash separated words as a word text object"
 vim.cmd('set shortmess+=c') -- Don't pass messages to |ins-completion-menu|.
-vim.o.hidden = true -- Required to keep multiple buffers open multiple buffers
-vim.wo.wrap = false -- Display long lines as just one line
+vim.o.hidden = O.hidden_files -- Required to keep multiple buffers open multiple buffers
+vim.wo.wrap = O.wrap_lines -- Display long lines as just one line
 vim.cmd('set whichwrap+=<,>,[,],h,l') -- move to next line with theses keys
 vim.cmd('syntax on') -- move to next line with theses keys
 vim.o.pumheight = 10 -- Makes popup menu smaller
@@ -18,7 +18,7 @@ vim.cmd('set ts=4') -- Insert 2 spaces for a tab
 vim.cmd('set sw=4') -- Change the number of space characters inserted for indentation
 vim.bo.expandtab = true -- Converts tabs to spaces
 vim.bo.smartindent = true -- Makes indenting smart
-vim.wo.number = true -- set numbered lines
+vim.wo.number = O.number -- set numbered lines
 vim.wo.relativenumber = O.relative_number -- set relative number
 vim.wo.cursorline = true -- Enable highlighting of the current line
 vim.o.showtabline = 2 -- Always show tabs
diff --git a/vimscript/nv-whichkey/init.vim b/vimscript/nv-whichkey/init.vim
index fb1a83ab..3898aa14 100644
--- a/vimscript/nv-whichkey/init.vim
+++ b/vimscript/nv-whichkey/init.vim
@@ -33,6 +33,7 @@ let g:which_key_map['M'] = [ ':MarkdownPreviewToggle'                          ,
 let g:which_key_map['h'] = [ ':let @/ = ""'                                    , 'no highlight' ]
 let g:which_key_map['r'] = [ ':RnvimrToggle'                                   , 'ranger' ]
 let g:which_key_map['*'] = [ ':DogeGenerate'                                   , 'documentation generator' ]
+let g:which_key_map['u'] = [ ':UndotreeToggle'                                 , 'undo tree' ]
 " TODO create entire treesitter section
 let g:which_key_map['T'] = [ ':TSHighlightCapturesUnderCursor'                 , 'treesitter highlight' ]
 let g:which_key_map['v'] = [ '<C-W>v'                                          , 'split right']
@@ -110,7 +111,6 @@ let g:which_key_map.D = {
       \ 'l' : ['DBUILastQueryInfo'  , 'db last query'],
       \ }
 
-
 " F is for fold
 let g:which_key_map.F = {
     \ 'name': '+fold',