summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lua/default-config.lua2
-rw-r--r--lua/lv-matchup/init.lua8
-rw-r--r--lua/lv-which-key/init.lua16
-rw-r--r--lua/plugins.lua51
-rw-r--r--lv-config.lua1
5 files changed, 39 insertions, 39 deletions
diff --git a/lua/default-config.lua b/lua/default-config.lua
index a694cd25..ecd53b86 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -31,7 +31,7 @@ O = {
hop = {active = false},
dial = {active = false},
dashboard = {active = false},
- zen = {active = false}
+ matchup = {active = false}
},
diff --git a/lua/lv-matchup/init.lua b/lua/lv-matchup/init.lua
index 27b3f57f..a14c5ce4 100644
--- a/lua/lv-matchup/init.lua
+++ b/lua/lv-matchup/init.lua
@@ -1,2 +1,8 @@
-vim.g.matchup_matchparen_offscreen = {method = 'popup'}
+local M = {}
+
+M.config = function()
+ vim.g.matchup_matchparen_offscreen = {method = 'popup'}
+end
+
+return M
diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua
index cce960c3..50bc66ae 100644
--- a/lua/lv-which-key/init.lua
+++ b/lua/lv-which-key/init.lua
@@ -75,6 +75,9 @@ vim.api.nvim_set_keymap("n", "<leader>c", ":BufferClose<CR>", {noremap = true, s
vim.api.nvim_set_keymap('n', '<leader>p', ":lua require'telescope'.extensions.project.project{}<CR>",
{noremap = true, silent = true})
+vim.api.nvim_set_keymap("n", "<leader>z", ":TZAtaraxis<CR>", {noremap = true, silent = true})
+-- z = {"<cmd>TZAtaraxis<cr>", "toggle zen"}
+
-- TODO create entire treesitter section
local mappings = {
@@ -85,6 +88,7 @@ local mappings = {
["f"] = "Find File",
["h"] = "No Highlight",
["p"] = "Projects",
+ ["z"] = "Zen",
b = {
name = "+Buffers",
j = {"<cmd>BufferPick<cr>", "jump to buffer"},
@@ -180,12 +184,12 @@ local mappings = {
l = {"<cmd>SessionLoad<cr>", "Load Session"}
},
-- extras
- z = {
- name = "Zen",
- s = {"<cmd>TZBottom<cr>", "toggle status line"},
- t = {"<cmd>TZTop<cr>", "toggle tab bar"},
- z = {"<cmd>TZAtaraxis<cr>", "toggle zen"}
- }
+ -- z = {
+ -- name = "Zen",
+ -- s = {"<cmd>TZBottom<cr>", "toggle status line"},
+ -- t = {"<cmd>TZTop<cr>", "toggle tab bar"},
+ -- z = {"<cmd>TZAtaraxis<cr>", "toggle zen"}
+ -- }
}
if O.extras then
diff --git a/lua/plugins.lua b/lua/plugins.lua
index d68cd25c..b617c085 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -61,7 +61,6 @@ return require("packer").startup(function(use)
config = function()
require("lv-nvimtree").config()
end
-
}
-- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'}
@@ -144,77 +143,70 @@ return require("packer").startup(function(use)
disable = not O.plugin.dashboard.active,
opt = true
}
- -- Zen Mode
- -- use {
- -- "Pocco81/TrueZen.nvim",
- -- cmd = {"TZAtaraxis", "TZMinimalist"},
- -- config = function()
- -- require('lv-zen').config()
- -- end,
- -- disable = not O.plugin.zen.active,
- -- opt = true
- -- }
-
- -- -- matchup
- -- use {'andymass/vim-matchup', opt = true}
- -- require_plugin('vim-matchup')
+ -- Zen Mode TODO this don't work with whichkey might gave to make this built in
+ use {
+ "Pocco81/TrueZen.nvim",
+ event = 'BufRead',
+ -- cmd = {"TZAtaraxis", "TZMinimalist"},
+ config = function()
+ require('lv-zen').config()
+ end,
+ -- disable = not O.plugin.zen.active,
+ }
+
+ -- matchup
+ use {'andymass/vim-matchup',
+ event = "CursorMoved",
+ config = function()
+ require('lv-matchup').config()
+ end,
+ disable = not O.plugin.matchup.active,
+ opt = true
+ }
-- -- Snippets
-- use {"rafamadriz/friendly-snippets", opt = true}
- -- require_plugin("friendly-snippets")
-- -- Colorizer
-- use {'norcalli/nvim-colorizer.lua', opt = true}
- -- require_plugin('nvim-colorizer.lua')
-- -- Peek lines
-- use {'nacro90/numb.nvim', opt = true}
- -- require_plugin('numb.nvim')
--
-- -- Treesitter playground
-- use {'nvim-treesitter/playground', opt = true}
- -- require_plugin('playground')
--
--
--
-- -- Latex
-- use {"lervag/vimtex", opt = true}
- -- require_plugin("vimtex")
--
-- -- comments in context
-- use {'JoosepAlviste/nvim-ts-context-commentstring', opt = true}
- -- require_plugin("nvim-ts-context-commentstring")
--
--
-- -- Git extras
-- use {'f-person/git-blame.nvim', opt = true}
- -- require_plugin("git-blame.nvim")
--
--
-- -- diagnostics
-- use {"folke/trouble.nvim", opt = true}
- -- require_plugin('trouble.nvim')
--
-- -- Debugging
-- use {"mfussenegger/nvim-dap", opt = true}
- -- require_plugin("nvim-dap")
--
--
-- -- Better quickfix
-- use {"kevinhwang91/nvim-bqf", opt = true}
- -- require_plugin("nvim-bqf")
--
-- -- Search & Replace
-- use {'windwp/nvim-spectre', opt = true}
- -- require_plugin('nvim-spectre')
--
-- -- Symbol Outline
-- use {'simrat39/symbols-outline.nvim', opt = true}
- -- require_plugin('symbols-outline.nvim')
--
-- -- Interactive scratchpad
-- use {'metakirby5/codi.vim', opt = true}
- -- require_plugin('codi.vim')
--
-- -- Markdown preview
-- use {
@@ -222,18 +214,15 @@ return require("packer").startup(function(use)
-- run = 'cd app && npm install',
-- opt = true
-- }
- -- require_plugin('markdown-preview.nvim')
--
-- -- Floating terminal
-- use {'numToStr/FTerm.nvim', opt = true}
- -- require_plugin('FTerm.nvim')
--
-- -- Sane gx for netrw_gx bug
-- use {"felipec/vim-sanegx", opt = true}
-- lsp root
-- use {"ahmedkhalf/lsp-rooter.nvim", opt = true} -- with this nvim-tree will follow you
- -- require_plugin('lsp-rooter.nvim')
-- Extras
if O.extras then
diff --git a/lv-config.lua b/lv-config.lua
index 2f1fdd97..dc196eeb 100644
--- a/lv-config.lua
+++ b/lv-config.lua
@@ -20,6 +20,7 @@ O.leader_key = ' '
O.plugin.hop.active = true
O.plugin.dial.active = true
O.plugin.dashboard.active = true
+O.plugin.matchup.active = true
-- dashboard
-- O.dashboard.custom_header = {""}