update

home/dot_config/nvim/lua/basic/mapping.lua

@@ -19,3 +19,9 @@ keymap.set('n', '<leader>dd', 'gt')
 keymap.set('n', '<F9>', ':%!jq .<CR>')
 
 keymap.set('n', '<leader>sg', ':lua vim.diagnostic.open_float(0, {scope="line"})<CR>')
+
+if vim.api.nvim_win_get_option(0, "diff") then
+  keymap.set('n', '<leader>1', ':diffget LOCAL<CR>')
+  keymap.set('n', '<leader>2', ':diffget REMOTE<CR>')
+  keymap.set('n', '<leader>3', ':%diffget LOCAL<CR>')
+end

home/dot_config/nvim/lua/plugins/list.lua

@@ -74,7 +74,7 @@ return {
   require('plugins.lualine'),
   require('plugins.bufferline'),
 
-  require('plugins.indent_blankline'),
+  --require('plugins.indent_blankline'),
   "nvim-treesitter/nvim-treesitter",
 
   {
@@ -124,6 +124,7 @@ return {
   "elkowar/yuck.vim",
 
   "evanleck/vim-svelte",
+  "AndrewRadev/linediff.vim",
 
   -- themes
   "tomasr/molokai",

home/dot_config/nvim/lua/plugins/lsp.lua

@@ -48,7 +48,7 @@ return {
       capabilities = capabilities,
       on_attach = on_attach,
     }
-    nvlsp['tsserver'].setup{
+    nvlsp['ts_ls'].setup{
       capabilities = capabilities,
       on_attach = on_attach,
     }