nvim: rework fzy jump to use nvim_open_win()

4 files changed, 55 insertions, 28 deletions

diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index bb21870..ff59ec8 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -22,6 +22,7 @@ require('settings')
 require('maps')
 require('statusline.line')
 require('treesitter')
+require('fzy/fzy')
 
 -- lsp setup
 -- require('lsp.yaml') shits too noisy
diff --git a/config/nvim/lua/fzy/fzy.lua b/config/nvim/lua/fzy/fzy.lua
new file mode 100644
index 0000000..9ac1b37
--- /dev/null
+++ b/config/nvim/lua/fzy/fzy.lua
@@ -0,0 +1,42 @@
+local M = {}
+local api = vim.api
+local o = vim.o
+local fn = vim.fn
+
+function M.fzy_search(cmd, exit_fn)
+    local width = o.columns - 4
+    local height = 11
+    if (o.columns >= 85) then
+        width = 80
+    end
+
+    buf = api.nvim_create_buf(false, true)
+    api.nvim_buf_set_option(buf, 'bufhidden', 'wipe')
+    api.nvim_buf_set_option(buf, 'modifiable', true)
+
+    api.nvim_open_win(
+        buf,
+        true,
+        {
+            relative = 'editor',
+            style = 'minimal',
+            noautocmd = true,
+            border = 'none',
+            width = width,
+            height = height,
+            col = math.min((o.columns - width) / 2),
+            row = math.min((o.lines - height) / 2 - 1),
+        }
+    )
+    local file = vim.fn.tempname()
+    api.nvim_command('startinsert!')
+
+    vim.fn.termopen(cmd .. ' > ' .. file, {on_exit = function()
+        local f = io.open(file, 'r')
+        stdout = f:read('*all')
+        exit_fn(stdout)
+        f:close()
+        os.remove(file)
+    end})
+end
+return M
diff --git a/config/nvim/lua/fzy/jump.lua b/config/nvim/lua/fzy/jump.lua
index e3e3791..5a723f8 100644
--- a/config/nvim/lua/fzy/jump.lua
+++ b/config/nvim/lua/fzy/jump.lua
@@ -9,7 +9,6 @@ local function get_line_nr(s)
   end
 end
 
-
 local function annotated_input()
   local lines = {}
 
@@ -20,7 +19,6 @@ local function annotated_input()
     table.insert(lines, fn.getline(nr))
   end
 
-
   local outfile = fn.tempname()
   local f = io.open(outfile, 'a')
   for n, l in pairs(lines) do
@@ -32,39 +30,25 @@ local function annotated_input()
 end
 
 function M.fzy_jmp()
-  local outfile = fn.tempname()
   local idxfile, lines = annotated_input()
-  shell_cmd = {
-    '/bin/sh',
-    '-c',
-    'fzy -p "jmp > "  < ' ..  idxfile ..  ' > ' .. outfile
-  }
-
-  winid = fn.win_getid()
-  -- start a new buffer
-  cmd('botright 10 new')
-  cmd('startinsert')
-
-  fn.termopen(shell_cmd, { on_exit = function()
-    -- delete buffer on exit
-    cmd('bd!')
-    fn.win_gotoid(winid)
 
-    -- read contents of file
-    local f = io.open(outfile, 'r')
-    line_choice = f:read('*all')
+  fzy_cmd = {
+    'fzy -p "jmp > " ',
+    '< ' .. idxfile,
+  }
 
+  require('fzy/fzy').fzy_search(table.concat(fzy_cmd), function(stdout)
     -- strip '\n'
-    selected, _ = string.gsub(line_choice, '\n', '')
+    local selected, _ = stdout:gsub('\n', '')
+    cmd('bd!')
 
+    print(get_line_nr(selected))
     -- jump to line
     cmd(':' .. get_line_nr(selected))
-
     -- housekeeping
-    f:close()
-    os.remove(outfile)
     os.remove(idxfile)
-  end })
-end
+  end
+  )
 
+end
 return M
diff --git a/config/nvim/lua/settings.lua b/config/nvim/lua/settings.lua
index e5b362f..b64692d 100644
--- a/config/nvim/lua/settings.lua
+++ b/config/nvim/lua/settings.lua
@@ -46,7 +46,7 @@ vim.cmd("syntax on")
 vim.cmd('colorscheme plain')
 
 vim.cmd('au TextYankPost * lua vim.highlight.on_yank{timeout=200}')
-o.background = 'dark'
+o.background = 'light'
 
 -- gitgutter options
 g.gitgutter_override_sign_column_highlight = 0