From b07e2a2699a65f95daec32af9b05e2a6fe5841f9 Mon Sep 17 00:00:00 2001
From: Robert Kmiec <robert.r.kmiec@gmail.com>
Date: Fri, 21 Oct 2022 14:00:10 +0200
Subject: [PATCH] Nvim: reorganize plugins - move some from testing to
 categories

---
 .config/nvim/after/plugin/window.rc.lua |  8 --------
 .config/nvim/init.vim                   | 21 ++++++++++-----------
 2 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 .config/nvim/after/plugin/window.rc.lua

diff --git a/.config/nvim/after/plugin/window.rc.lua b/.config/nvim/after/plugin/window.rc.lua
deleted file mode 100644
index 1ceab05..0000000
--- a/.config/nvim/after/plugin/window.rc.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-require('nvim-window').setup({
-  chars = {
-    'j', 'k', 'l', 'f', 'd', 's', 'g', 'h', 'i', 'e', 'a', 'b', 'm', 'n', 'o',
-    'p', 'q', 'r', 'c', 't', 'u', 'v', 'w', 'x', 'y', 'z'
-  },
-})
-
-vim.api.nvim_set_keymap('n', '<leader>j', '<cmd>lua require("nvim-window").pick()<cr>', {silent=true, noremap = true})
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 17b1031..5da8d4d 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -16,26 +16,25 @@ Plug 'neovim/nvim-lspconfig'
 Plug 'p00f/clangd_extensions.nvim'
 "Plug 'ray-x/lsp_signature.nvim'
 Plug 'matsui54/denops-signature_help'
+Plug 'jubnzv/virtual-types.nvim'
 Plug 'RRethy/vim-illuminate'
 Plug 'mizlan/iswap.nvim'
+Plug 'Saecki/crates.nvim' | Plug 'jose-elias-alvarez/null-ls.nvim'
 
 "Plug 'dbeniamine/cheat.sh-vim'
 "Plug 'puremourning/vimspector'
 "Plug 'vim-test/vim-test'
 Plug 'lukas-reineke/indent-blankline.nvim'
 Plug 'liuchengxu/vista.vim'
-Plug 'ggandor/leap.nvim'
 
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'nvim-treesitter/playground'
 Plug 'p00f/nvim-ts-rainbow'
-Plug 'nvim-treesitter/nvim-treesitter-textobjects'
 Plug 'romgrk/nvim-treesitter-context'
 
 Plug 'cdelledonne/vim-cmake'
 
 Plug 'andymass/vim-matchup'
-Plug 'folke/which-key.nvim'
 Plug 'numToStr/Comment.nvim'
 Plug 'danymat/neogen'
 
@@ -59,6 +58,7 @@ Plug 'MunifTanjim/nui.nvim'
 Plug 'inside/vim-search-pulse'
 Plug 'wellle/targets.vim'
 Plug 'numToStr/FTerm.nvim'
+Plug 'ggandor/leap.nvim'
 " }}}
 
 " Git integration {{{
@@ -80,14 +80,15 @@ Plug 'chrisbra/csv.vim'
 "Plug 'MortenStabenau/matlab-vim'
 "Plug 'junegunn/goyo.vim'
 Plug 'lukas-reineke/virt-column.nvim'
+Plug 'folke/which-key.nvim'
 "Plug 'glacambre/firenvim'
 "Plug 'JMcKiern/vim-shoot'
 "Plug 'protex/better-digraphs.nvim'
 " }}}
 
 " Note taking {{{
-Plug 'vimwiki/vimwiki'
-Plug 'michal-h21/vimwiki-sync'
+"Plug 'vimwiki/vimwiki'
+"Plug 'michal-h21/vimwiki-sync'
 "Plug 'michal-h21/vim-zettel'
 " }}}
 
@@ -102,20 +103,15 @@ Plug 'vim-airline/vim-airline' | Plug 'vim-airline/vim-airline-themes'
 
 " Testing phase {{{
 Plug 'nvim-neorg/neorg'
-Plug 'jubnzv/virtual-types.nvim'
-Plug 'https://gitlab.com/yorickpeterse/nvim-window.git'
 Plug 'themercorp/themer.lua'
 "Plug 'mfussenegger/nvim-dap'
-Plug 'mizlan/iswap.nvim'
-Plug 'wuelnerdotexe/vim-enfocado'
 Plug 'frabjous/knap'
 Plug 'kevinhwang91/nvim-ufo' | Plug 'kevinhwang91/promise-async'
-"Plug 'kaiuri/nvim-mariana'
 Plug 'ziontee113/icon-picker.nvim'
-Plug 'Saecki/crates.nvim' | Plug 'jose-elias-alvarez/null-ls.nvim'
 Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
 Plug 'anuvyklack/pretty-fold.nvim'
 Plug 'anuvyklack/fold-preview.nvim' | Plug 'anuvyklack/keymap-amend.nvim'
+Plug 'anuvyklack/windows.nvim' | Plug 'anuvyklack/middleclass' | Plug 'anuvyklack/animation.nvim'
 "Plug 'https://git.sr.ht/%7Ewhynothugo/lsp_lines.nvim'
 " }}}
 
@@ -158,6 +154,9 @@ set laststatus=2
 
 lua << EOF
 require("virt-column").setup { }
+vim.o.winwidth = 10
+vim.o.winminwidth = 10
+require("windows").setup()
 EOF
 set colorcolumn=80