2 files changed, 12 insertions, 23 deletions
diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua
index 9e40930..5fe59da 100755
--- a/Common/nvim/lua/basic.lua
+++ b/Common/nvim/lua/basic.lua
@@ -145,34 +145,16 @@ vim.opt.si = true
 vim.opt.wrap = true
 
 --[[
-Visual mode related
---]]
-map('v', '<silent> *', ':<C-u>call VisualSelection("","")<CR>/<C-R>=@/<CR><CR>', silentnoremap)
-map('v', '<silent> #', ':<C-u>call VisualSelection("","")<CR>?<C-R>=@/<CR><CR>', silentnoremap)
-
---[[
 Moving around, tabs, windows and buffers
 --]]
 -- Disable highlight when <leader><cr> is pressed
 map('n', '<leader><cr>', ':noh<cr>', silentnoremap)
 
--- Smart way to move between windows
-map('', '<C-j>', '<C-W>j', silentnoremap)
-map('', '<C-k>', '<C-W>k', silentnoremap)
-map('', '<C-h>', '<C-W>h', silentnoremap)
-map('', '<C-l>', '<C-W>l', silentnoremap)
-
 -- Tab commands
 map('n', '<leader>tn', ':tabnext<cr>', silentnoremap)
 map('n', '<leader>tc',  ':tabnew<cr>', silentnoremap)
 map('n', '<leader>tx',  ':tabclose<cr>', silentnoremap)
 
--- Switch CWD to directory of the open buffer
-map('n', '<leader>cd', ':cd %:p:h<cr>:pwd<cr', silentnoremap)
-
--- Behaviour when switching between buffers
-vim.opt.switchbuf = 'useopen,usetab,newtab'
-
 -- Always show tabbar
 vim.opt.stal = 1
 
@@ -181,9 +163,6 @@ vim.cmd [[
   au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
 ]]
 
--- Make mouse work nice with tmux
-vim.opt.mouse = 'a'
-
 --[[
 Status Line
 --]]
diff --git a/Common/nvim/lua/plugins.lua b/Common/nvim/lua/plugins.lua
index 2866731..9270c5c 100755
--- a/Common/nvim/lua/plugins.lua
+++ b/Common/nvim/lua/plugins.lua
@@ -173,8 +173,18 @@ return require('packer').startup(function(use)
      end
   }
 
-  use 'tpope/vim-surround'
-  --use { 'PatrickFeiring/tree-sitter-sql' }
+  --use 'tpope/vim-surround'
+  use {
+    "nvim-treesitter/nvim-treesitter",
+    config = function()
+      require'nvim-treesitter.configs'.setup {
+        ensure_installed = { "c", "cpp", "python", "php", "java", "lua", "vim", "vimdoc", "query", "php", "sql" },
+        sync_install = false,
+        auto_install = true,
+        --ignore_install = { "javascript" },
+      }
+    end
+  }
   use 'evanleck/vim-svelte'
   use 'pangloss/vim-javascript'
   use 'ledger/vim-ledger'