From f20307981cf4ddcde031a6ef077475d54dbf086d Mon Sep 17 00:00:00 2001
From: Smirnov Alexander <ss2316544@gmail.com>
Date: Thu, 24 Jun 2021 16:12:44 +0300
Subject: [PATCH] Update nvim

---
 config/bspwm/bspwmrc               | 12 +++++++-----
 config/nvim/lua/config.lua         |  5 +++--
 config/nvim/lua/plug/nvimtree.lua  |  4 ++--
 config/nvim/lua/tsserver.lua       | 17 +++++++++++++++++
 config/nvim/vimscript/mappings.vim | 10 +++++++---
 5 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 config/nvim/lua/tsserver.lua

diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index c58a7b2..93b01f7 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -44,10 +44,12 @@ C urgent_border_color  "#FF6C6B"
 #== BSPWM Rules
 R kitty           desktop='^1' focus=on  follow=on
 R Google-chrome   desktop='^2' focus=on  follow=on
+R Brave           desktop='^2' focus=on  follow=on
 R Code            desktop='^3' focus=on  follow=on
-R Simplenote      desktop='^4' focus=on  follow=on
+R Postman         desktop='^4' focus=off follow=off
+R Simplenote      desktop='^4' focus=off follow=off
+R Zathura         desktop='^4' focus=on  follow=on state=tiled
+R discord         desktop='^5' focus=on  follow=off
+R TelegramDesktop desktop='^5' focus=off follow=on
 R Nemo            desktop='^5' focus=on  follow=on
-R Zathura         desktop='^5' focus=on  follow=on state=tiled
-R discord         desktop='^6' focus=on  follow=off
-R TelegramDesktop desktop='^6' focus=off follow=on
-R KeePassXC       desktop='^7' focus=on  follow=on
+R KeePassXC       desktop='^6' focus=on  follow=on
diff --git a/config/nvim/lua/config.lua b/config/nvim/lua/config.lua
index fe85ee1..73df2b2 100644
--- a/config/nvim/lua/config.lua
+++ b/config/nvim/lua/config.lua
@@ -13,8 +13,9 @@ require'compe'.setup {
   source = {
     -- path = true,
     buffer = true,
-    nvim_lsp = true,
-  };
+    description = true,
+    nvim_lsp = true
+  }
 }
 
 -- LuaLine
diff --git a/config/nvim/lua/plug/nvimtree.lua b/config/nvim/lua/plug/nvimtree.lua
index a5fac69..2c69074 100644
--- a/config/nvim/lua/plug/nvimtree.lua
+++ b/config/nvim/lua/plug/nvimtree.lua
@@ -1,8 +1,8 @@
 local S = vim.g
 
 -- Settings
-S.nvim_tree_side = "left"
-S.nvim_tree_ignore = {".git", ".cache", "node_modules", "venv", "env"}
+S.nvim_tree_side = "right"
+S.nvim_tree_ignore = {".git", ".cache", "node_modules", "__pycache__", "venv", "env"}
 S.nvim_tree_auto_close = 0
 S.nvim_tree_quit_on_open = 0
 S.nvim_tree_width = 24
diff --git a/config/nvim/lua/tsserver.lua b/config/nvim/lua/tsserver.lua
new file mode 100644
index 0000000..c1daf99
--- /dev/null
+++ b/config/nvim/lua/tsserver.lua
@@ -0,0 +1,17 @@
+require('lspconfig').typescript.setup({
+  handlers = {
+    ["textDocument/publishDiagnostics"] = function(_, _, params, client_id, _, config)
+      if params.diagnostics ~= nil then
+        local idx = 1
+        while idx <= #params.diagnostics do
+          if params.diagnostics[idx].code == 80001 then
+            table.remove(params.diagnostics, idx)
+          else
+            idx = idx + 1
+          end
+        end
+      end
+      vim.lsp.diagnostic.on_publish_diagnostics(_, _, params, client_id, _, config)
+    end,
+  },
+})
diff --git a/config/nvim/vimscript/mappings.vim b/config/nvim/vimscript/mappings.vim
index b922443..cd38529 100644
--- a/config/nvim/vimscript/mappings.vim
+++ b/config/nvim/vimscript/mappings.vim
@@ -1,10 +1,11 @@
+ino jk <esc>
 nno <C-s> :w<cr>
 nno <C-p> :GFiles<cr>
 nno <space> :noh<cr>
 nno <leader>t :Term<cr>
 nno <leader>e :NvimTreeToggle<cr>
 nno <leader>; :Files<cr>
-nno <leader>d :Neogit<cr>
+nno <leader>g :Neogit<cr>
 
 " Buffer
 nno <leader>j :bn<cr>
@@ -20,8 +21,6 @@ nno sh :lua vim.lsp.buf.hover()<cr>
 nno sd :lua vim.lsp.buf.definition()<cr>
 nno sa :lua vim.lsp.buf.code_action()<cr>
 nno si :lua vim.lsp.buf.implementation()<cr>
-nno sf :lua vim.lsp.buf.formatting()
-nno sR :lua vim.lsp.buf.references()<CR>
 
 " Split
 nno <C-h> :winc h<cr>
@@ -29,6 +28,11 @@ nno <C-j> :winc j<cr>
 nno <C-k> :winc k<cr>
 nno <C-l> :winc l<cr>
 
+nno <A-h> :vert res +3<cr>
+nno <A-j> :res -3<cr>
+nno <A-k> :res +3<cr>
+nno <A-l> :vert res -3<cr>
+
 nno spv :vs<cr>
 nno sph :sp<cr>
 nno spk :winc K<cr>