From 70d23c102688e1c0549de88cd7b29e70411efc43 Mon Sep 17 00:00:00 2001
From: Andrew Tomaka <atomaka@atomaka.com>
Date: Thu, 21 Sep 2023 20:37:28 -0400
Subject: [PATCH] Midway work with lazy

---
 nvim/.config/nvim/after/plugin/config.lua | 32 +++++++++++++++++------
 nvim/.config/nvim/init.lua                |  2 +-
 nvim/.config/nvim/lazy-lock.json          |  2 +-
 nvim/.config/nvim/lua/config.lua          |  2 --
 nvim/.config/nvim/lua/options.lua         |  2 ++
 nvim/.config/nvim/lua/plugins.lua         |  3 ++-
 6 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/nvim/.config/nvim/after/plugin/config.lua b/nvim/.config/nvim/after/plugin/config.lua
index 3279c52..b39292d 100644
--- a/nvim/.config/nvim/after/plugin/config.lua
+++ b/nvim/.config/nvim/after/plugin/config.lua
@@ -24,14 +24,14 @@ require("gitsigns").setup()
 vim.keymap.set("n", "<leader>gb", require("gitsigns").toggle_current_line_blame)
 
 --- NeoZoom.lua
-require("neo-zoom").setup({
-  left_ratio = 0,
-  top_ratio = 0,
-  width_ratio = 1,
-  height_ratio = 1,
-  border = "none",
-})
-vim.keymap.set("n", "<C-w>z", require("neo-zoom").neo_zoom)
+-- require("neo-zoom").setup({
+--   left_ratio = 0,
+--   top_ratio = 0,
+--   width_ratio = 1,
+--   height_ratio = 1,
+--   border = "none",
+-- })
+-- vim.keymap.set("n", "<C-w>z", require("neo-zoom").neo_zoom)
 
 --- nvim-surround
 require("nvim-surround").setup()
@@ -69,3 +69,19 @@ require("whitespace-nvim").setup({
 vim.keymap.set("n", "<Leader>fw", function()
   require("whitespace-nvim").trim()
 end, { silent = true })
+
+--- vim-zoom
+vim.keymap.set("n", "<C-w>z", "<Plug>(zoom-toggle)")
+vim.keymap.set("n", "<C-w><C-z>", "<Plug>(zoom-toggle)")
+-- let g:zoom#statustext='Z'
+-- function! MyCtrlW()
+--   let char = nr2char(getchar())
+-- 
+--   if get(t:, 'zoomed', 0) == 1
+--     if char is# 'v' || char is# 's' || char is# '' || char is# ''
+--       return ""
+--     endif
+--   end
+--   return "\<C-w>".char
+-- endfunction
+-- nnoremap <expr> <C-w> MyCtrlW()
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index de3c6ea..f5a013e 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -1,3 +1,3 @@
-require "plugins"
 require "options"
+require "plugins"
 require "config"
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 854e8ef..250d574 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,5 +1,4 @@
 {
-  "NeoZoom.lua": { "branch": "main", "commit": "1289b900bd478fd135dcc0faf4a43b3cf7524097" },
   "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" },
   "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" },
   "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
@@ -16,5 +15,6 @@
   "vim-rails": { "branch": "master", "commit": "1ad9663ce31e8c08134849d04184cda94bb42aba" },
   "vim-ruby": { "branch": "master", "commit": "88f29671b776fff56e5ee554becf34dd2ee1975c" },
   "vim-terraform": { "branch": "master", "commit": "2bbc5f65a80c79a5110494a2ba1b869075fcf7a0" },
+  "vim-zoom": { "branch": "master", "commit": "01c737005312c09e0449d6518decf8cedfee32c7" },
   "whitespace.nvim": { "branch": "master", "commit": "fe9ca0ba3c6e6cc1dd14c0d6cbe49d97496700dd" }
 }
\ No newline at end of file
diff --git a/nvim/.config/nvim/lua/config.lua b/nvim/.config/nvim/lua/config.lua
index 1b49b08..5c696f8 100644
--- a/nvim/.config/nvim/lua/config.lua
+++ b/nvim/.config/nvim/lua/config.lua
@@ -45,8 +45,6 @@ end
 ChangeBackground()
 
 -- LEADER CONFIGURATION
-vim.g.mapleader = ","
-
 vim.keymap.set("n", "<leader>sz", ":luafile ~/.config/nvim/init.lua<cr>")
 
 vim.keymap.set({ "n", "v" }, "<leader>cp", '"+y')
diff --git a/nvim/.config/nvim/lua/options.lua b/nvim/.config/nvim/lua/options.lua
index 971a79f..72a77c6 100644
--- a/nvim/.config/nvim/lua/options.lua
+++ b/nvim/.config/nvim/lua/options.lua
@@ -29,3 +29,5 @@ vim.opt.shiftround = true                 -- make >> go to next tab
 vim.opt.undolevels = 5000
 vim.opt.undofile = true
 vim.opt.undodir = os.getenv("HOME") .. "/.config/nvim/undo"
+
+vim.g.mapleader = ","
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 137d329..06e8b0e 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -14,11 +14,12 @@ require("lazy").setup({
   "nvim-lua/plenary.nvim",
   "nvim-telescope/telescope.nvim",
   "famiu/bufdelete.nvim",
+  "dhruvasagar/vim-zoom",
   "gpanders/editorconfig.nvim",
   "johnfrankmorgan/whitespace.nvim",
   "kylechui/nvim-surround",
   "lewis6991/gitsigns.nvim",
-  "nyngwang/NeoZoom.lua", -- TODO: Floating window background color
+  -- "nyngwang/NeoZoom.lua", -- TODO: Floating window background color
   "ruifm/gitlinker.nvim",
   "tpope/vim-eunuch",