From 1dd81f5fc9ace2539cbc94f600271f7dc2cc50ea Mon Sep 17 00:00:00 2001
From: Benjamin Kyd <benjamin.kyd@intel.com>
Date: Tue, 21 Feb 2023 16:56:11 +0000
Subject: [PATCH] remove LSP for testing

---
 common/.config/nvim/lua/keymappings.lua       | 10 +++---
 common/.config/nvim/lua/lsp-general.lua       |  8 -----
 common/.config/nvim/lua/plugins.lua           | 16 ++++-----
 .../.config/nvim/plugin/packer_compiled.lua   | 35 +++----------------
 4 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/common/.config/nvim/lua/keymappings.lua b/common/.config/nvim/lua/keymappings.lua
index 886c71e..f39d761 100644
--- a/common/.config/nvim/lua/keymappings.lua
+++ b/common/.config/nvim/lua/keymappings.lua
@@ -17,7 +17,7 @@ vim.api.nvim_set_keymap('n', '<C-b>', ":Lexplore<CR> :vertical resize 30<CR>", {
 vim.api.nvim_set_keymap('i', 'ć', '<Esc>l', opts)
 vim.api.nvim_set_keymap('i', 'Ć', '<Esc>l', opts)
 
--- make ctrl-shift arrows movement
+-- make ctrl-shift arrows line movement
 vim.api.nvim_set_keymap('n', '<C-A-Up>', 'ddkP', opts)
 vim.api.nvim_set_keymap('v', '<C-A-Up>', ':m \'<-2<CR>gv=gv', opts)
 vim.api.nvim_set_keymap('n', '<C-A-Down>', 'ddp', opts)
@@ -52,10 +52,10 @@ vim.api.nvim_set_keymap('i', '<Tab>', '\t', opts)
 vim.api.nvim_set_keymap('i', '<S-Tab>', '\b', opts)
 
 -- window movement
---vim.api.nvim_set_keymap('', '<C-w>j', '<C-w>h', opts)
---vim.api.nvim_set_keymap('', '<C-w>k', '<C-w>j', opts)
---vim.api.nvim_set_keymap('', '<C-w>l', '<C-w>k', opts)
---vim.api.nvim_set_keymap('', '<C-w>č', '<C-w>l', opts)
+vim.api.nvim_set_keymap('', '<C-w><S-Left>', '<C-w><S-h>', opts)
+vim.api.nvim_set_keymap('', '<C-w><S-Down>', '<C-w><S-j>', opts)
+vim.api.nvim_set_keymap('', '<C-w><S-Up>', '<C-w><S-k>', opts)
+vim.api.nvim_set_keymap('', '<C-w><S-Right>', '<C-w><S-l>', opts)
 
 -- opening terminal with shortcut
 vim.api.nvim_set_keymap('', '<Leader><CR>', '<Cmd>silent !$TERM &<CR>', opts)
diff --git a/common/.config/nvim/lua/lsp-general.lua b/common/.config/nvim/lua/lsp-general.lua
index 824ba61..1549693 100644
--- a/common/.config/nvim/lua/lsp-general.lua
+++ b/common/.config/nvim/lua/lsp-general.lua
@@ -24,14 +24,6 @@ installServers({'angularls', 'bashls', 'dockerls', 'lua_ls', 'pyright', 'jsonls'
 lsp_installer.on_server_ready(function(server)
     local opts = {}
 
-    -- (optional) Customize the options passed to the server
-    -- if server.name == "tsserver" then
-    --     opts.root_dir = function() ... end
-    -- end
-    if server.name == 'lua_ls' then
-        opts = require'lsp-server-config.lua'
-    end
-
     -- This setup() function is exactly the same as lspconfig's setup function.
     -- Refer to https://github.com/neovim/nvim-lspconfig/blob/master/ADVANCED_README.md
     server:setup(opts)
diff --git a/common/.config/nvim/lua/plugins.lua b/common/.config/nvim/lua/plugins.lua
index b2b80b8..b914a58 100644
--- a/common/.config/nvim/lua/plugins.lua
+++ b/common/.config/nvim/lua/plugins.lua
@@ -114,18 +114,14 @@ local packer = require('packer').startup(function(use)
   use {
     'neovim/nvim-lspconfig',
     'williamboman/nvim-lsp-installer',
+    'hrsh7th/nvim-cmp',
   }
 
-  -- for LSP autocompletion
-  use 'hrsh7th/cmp-nvim-lsp'
-  use 'hrsh7th/cmp-buffer'
-  use 'hrsh7th/cmp-path'
-  use 'hrsh7th/cmp-cmdline'
-  use 'hrsh7th/nvim-cmp'
-
-  -- For vsnip users.
-  use 'hrsh7th/cmp-vsnip'
-  use 'hrsh7th/vim-vsnip'
+  ---- for LSP autocompletion
+  --use 'hrsh7th/cmp-nvim-lsp'
+  --use 'hrsh7th/cmp-buffer'
+  --use 'hrsh7th/cmp-path'
+  --use 'hrsh7th/cmp-cmdline'
 
   -- highlight variables under cursor
   use 'RRethy/vim-illuminate'
diff --git a/common/.config/nvim/plugin/packer_compiled.lua b/common/.config/nvim/plugin/packer_compiled.lua
index 54454fd..355cfba 100644
--- a/common/.config/nvim/plugin/packer_compiled.lua
+++ b/common/.config/nvim/plugin/packer_compiled.lua
@@ -79,31 +79,6 @@ _G.packer_plugins = {
     path = "/home/benk/.local/share/nvim/site/pack/packer/start/catppuccin",
     url = "https://github.com/catppuccin/nvim"
   },
-  ["cmp-buffer"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-buffer",
-    url = "https://github.com/hrsh7th/cmp-buffer"
-  },
-  ["cmp-cmdline"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-cmdline",
-    url = "https://github.com/hrsh7th/cmp-cmdline"
-  },
-  ["cmp-nvim-lsp"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
-    url = "https://github.com/hrsh7th/cmp-nvim-lsp"
-  },
-  ["cmp-path"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-path",
-    url = "https://github.com/hrsh7th/cmp-path"
-  },
-  ["cmp-vsnip"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-vsnip",
-    url = "https://github.com/hrsh7th/cmp-vsnip"
-  },
   ["codewindow.nvim"] = {
     config = { "\27LJ\2\nW\0\0\3\0\4\0\b6\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\0019\1\3\0B\1\1\1K\0\1\0\27apply_default_keybinds\nsetup\15codewindow\frequire\0" },
     loaded = true,
@@ -130,6 +105,11 @@ _G.packer_plugins = {
     path = "/home/benk/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
     url = "https://github.com/lukas-reineke/indent-blankline.nvim"
   },
+  ["kanagawa.nvim"] = {
+    loaded = true,
+    path = "/home/benk/.local/share/nvim/site/pack/packer/start/kanagawa.nvim",
+    url = "https://github.com/rebelot/kanagawa.nvim"
+  },
   ["leap.nvim"] = {
     loaded = true,
     path = "/home/benk/.local/share/nvim/site/pack/packer/start/leap.nvim",
@@ -250,11 +230,6 @@ _G.packer_plugins = {
     loaded = true,
     path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-surround",
     url = "https://github.com/tpope/vim-surround"
-  },
-  ["vim-vsnip"] = {
-    loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-vsnip",
-    url = "https://github.com/hrsh7th/vim-vsnip"
   }
 }