neovim

commit f0e1d4fada70fc1174f4199d8aee40a5d4a5318e
parent 786ddad8e4e75b5820917471b36d86e54efc4d7e
Author: Tomas Nemec <nemi@skaut.cz>
Date:   Sun, 20 Mar 2022 21:26:29 +0100

feat: get rid of vifm

Diffstat:
M
init.lua
 | 
9
+++------
M
lua/my-default.lua
 | 
1
+
M
lua/tms/lsp/init.lua
 | 
2
+-
D
lua/tms/p/vifm.lua
 | 
28
----------------------------
M
lua/tms/plugins.lua
 | 
6
+-----

5 files changed, 6 insertions(+), 40 deletions(-)
diff --git a/init.lua b/init.lua
@@ -59,7 +59,7 @@ vim.opt.foldlevel = 999
 vim.opt.foldmethod = 'indent'
 vim.opt.foldtext = 'MyFoldText()'
 vim.opt.list = false
-vim.opt.laststatus = 1
+vim.opt.laststatus = 3
 vim.opt.statusline = ' '
 vim.opt.ruler = false
 vim.opt.listchars = {space = '·', tab = '» ', extends = '›', precedes = '‹', nbsp = '_', trail = '_', eol = '$'}
@@ -112,11 +112,8 @@ vim.keymap.set('n', '<a-J>', '<c-w>J', {noremap = true})
 vim.keymap.set('n', '<a-K>', '<c-w>K', {noremap = true})
 vim.keymap.set('n', '<a-L>', '<c-w>L', {noremap = true})
 -- window split
-vim.keymap.set('n', '<c-w><c-s>', require('tms.p.vifm').split, {silent = true, noremap = true})
-vim.keymap.set('n', '<c-w><c-v>', require('tms.p.vifm').vsplit, {silent = true, noremap = true})
-vim.keymap.set('n', '<c-w><c-w>', require('tms.p.vifm').current, {silent = true, noremap = true})
-vim.keymap.set('n', '<c-w>V', '<cmd>vnew<cr>', {noremap = true})
-vim.keymap.set('n', '<c-w>S', '<cmd>new<cr>', {noremap = true})
+vim.keymap.set('n', '<c-w><c-v>', '<cmd>vnew<cr>', {noremap = true})
+vim.keymap.set('n', '<c-w><c-s>', '<cmd>new<cr>', {noremap = true})
 -- line movement
 vim.keymap.set('n', '<c-j>', ':m .+1<cr>==', {noremap = true})
 vim.keymap.set('n', '<c-k>', ':m .-2<cr>==', {noremap = true})
diff --git a/lua/my-default.lua b/lua/my-default.lua
@@ -144,6 +144,7 @@ Group.new('Repeat', colors.c3, colors.none)
 Group.new('SpecialChar', colors.c5, colors.none)
 Group.new('Tag', colors.c3, colors.none)
 Group.new('Typedef', colors.c3, colors.none)
+Group.new('WinSeparator', nil, colors.none)
 
 -- Telescope
 Group.new('TelescopeSelection', nil, dimm(N.bg, 0.05))
diff --git a/lua/tms/lsp/init.lua b/lua/tms/lsp/init.lua
@@ -3,7 +3,6 @@ local servers = require('tms.lsp.servers')
 local M = {}
 
 local keybind = function(client, bufnr)
-  local t = require('tms.p.telescope')
   vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {silent = true, buffer = bufnr})
   vim.keymap.set('n', 'gD', '<cmd>vsplit | lua vim.lsp.buf.definition()<cr>', {silent = true, buffer = bufnr})
   vim.keymap.set('n', 'gT', vim.lsp.buf.type_definition, {silent = true, buffer = bufnr})
@@ -20,6 +19,7 @@ local keybind = function(client, bufnr)
     vim.keymap.set('v', 'Q', vim.lsp.buf.range_formatting, {silent = true, buffer = bufnr})
   end
   -- symbols
+  local t = require('tms.p.telescope')
   vim.keymap.set('n', 'gm', t.lsp_document_symbols, {silent = true, buffer = bufnr})
   vim.keymap.set('n', 'gww', t.b.lsp_dynamic_workspace_symbols, {silent = true, buffer = bufnr})
   vim.keymap.set('n', 'gwW', vim.lsp.buf.workspace_symbol, {silent = true, buffer = bufnr})
diff --git a/lua/tms/p/vifm.lua b/lua/tms/p/vifm.lua
@@ -1,28 +0,0 @@
-local M = {}
-
-local function defaults() vim.cmd [[ set ft=vifm ]] end
-
-local function run(cmd, args)
-  if args then
-    vim.g.vifm_exec_args = table.concat(args, ' ')
-  end
-  vim.cmd(cmd)
-  defaults()
-end
-
-local function select(args, file)
-  local filename = file or vim.api.nvim_buf_get_name(0)
-  table.insert(args, '--select=' .. filename)
-  if vim.opt.background:get() == 'light' then
-    table.insert(args, '+"color solarized-dark"')
-  end
-  return args
-end
-
-M.current = function() run([[Vifm\ %:h]], select({'+only'})) end
-
-M.split = function() run([[split +Vifm\ %:h]], select({'+only'})) end
-
-M.vsplit = function() run([[vsplit +Vifm\ %:h]], select({'+only'})) end
-
-return M
diff --git a/lua/tms/plugins.lua b/lua/tms/plugins.lua
@@ -103,7 +103,6 @@ return packer.startup({
     }
     use { -- beacon last cursor pos
       'danilamihailov/beacon.nvim',
-      setup = function() vim.g.beacon_ignore_filetypes = {'vifm'} end,
       config = function()
         vim.keymap.set('n', '*', '*:Beacon<cr>')
         vim.keymap.set('n', '#', '#:Beacon<cr>')
@@ -293,9 +292,6 @@ return packer.startup({
       end,
     }
 
-    -- file manager
-    use {'vifm/vifm.vim', setup = function() vim.g.vifm_replace_netrw = true end}
-
     -- tasks
     use {'amirrezaask/actions.nvim', config = function() require('tms.p.actions').setup() end}
 
@@ -335,7 +331,7 @@ return packer.startup({
       'stevearc/dressing.nvim',
       config = function()
         require('dressing').setup({
-          select = {backend = {'telescope', 'builtin', 'nui'}, telescope = {theme = 'dropdown'}},
+          select = {backend = {'telescope', 'builtin'}, telescope = require('telescope.themes').get_dropdown()},
         })
       end,
     }