diff options
| -rw-r--r-- | lua/default-config.lua | 1 | ||||
| -rw-r--r-- | lua/lv-nvimtree/init.lua | 15 | ||||
| -rw-r--r-- | lua/lv-which-key/init.lua | 511 | ||||
| -rw-r--r-- | lua/plugins.lua | 31 | ||||
| -rw-r--r-- | lv-config.lua | 19 |
5 files changed, 281 insertions, 296 deletions
diff --git a/lua/default-config.lua b/lua/default-config.lua index 950bcf0f..215092ee 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -50,6 +50,7 @@ O = { codi = {active = false}, telescope_fzy = {active = false}, sanegx = {active = false}, + ranger = {active = false}, todo_comments = {active = false}, lsp_colors = {active = false}, git_blame = {active = false}, diff --git a/lua/lv-nvimtree/init.lua b/lua/lv-nvimtree/init.lua index ac42629d..24b7a50f 100644 --- a/lua/lv-nvimtree/init.lua +++ b/lua/lv-nvimtree/init.lua @@ -25,7 +25,7 @@ M.config = function() git = 1, folders = 1, files = 1, - folder_arrows = 0 + folder_arrows = 1 } vim.g.nvim_tree_icons = { @@ -89,4 +89,17 @@ M.config = function() } end +local view = require 'nvim-tree.view' + +M.toggle_tree = function() + if view.win_open() then + require'nvim-tree'.close() + require'bufferline.state'.set_offset(0) + else + require'bufferline.state'.set_offset(31, 'File Explorer') + require'nvim-tree'.find_file(true) + end + +end + return M diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua index 0222004b..f3e05cad 100644 --- a/lua/lv-which-key/init.lua +++ b/lua/lv-which-key/init.lua @@ -1,299 +1,264 @@ - require("which-key").setup { - plugins = { - marks = true, -- shows a list of your marks on ' and ` - registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode - -- the presets plugin, adds help for a bunch of default keybindings in Neovim - -- No actual key bindings are created - presets = { - operators = false, -- adds help for operators like d, y, ... - motions = false, -- adds help for motions - text_objects = false, -- help for text objects triggered after entering an operator - windows = true, -- default bindings on <c-w> - nav = true, -- misc bindings to work with windows - z = true, -- bindings for folds, spelling and others prefixed with z - g = true -- bindings for prefixed with g - } - }, - icons = { - breadcrumb = "ยป", -- symbol used in the command line area that shows your active key combo - separator = "โ", -- symbol used between a key and it's label - group = "+" -- symbol prepended to a group - }, - window = { - border = "single", -- none, single, double, shadow - position = "bottom", -- bottom, top - margin = {1, 0, 1, 0}, -- extra window margin [top, right, bottom, left] - padding = {2, 2, 2, 2} -- extra window padding [top, right, bottom, left] - }, - layout = { - height = {min = 4, max = 25}, -- min and max height of the columns - width = {min = 20, max = 50}, -- min and max width of the columns - spacing = 3 -- spacing between columns - }, - hidden = { - "<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ " - }, -- hide mapping boilerplate - show_help = true -- show help message on the command line when the popup is visible - } - - -- Set leader - if O.leader_key == ' ' or O.leader_key == 'space' then - vim.api.nvim_set_keymap('n', '<Space>', '<NOP>', - {noremap = true, silent = true}) - vim.g.mapleader = ' ' - else - vim.api.nvim_set_keymap('n', O.leader_key, '<NOP>', - {noremap = true, silent = true}) - vim.g.mapleader = O.leader_key - end - - local opts = { - mode = "n", -- NORMAL mode - prefix = "<leader>", - buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings - silent = true, -- use `silent` when creating keymaps - noremap = true, -- use `noremap` when creating keymaps - nowait = false -- use `nowait` when creating keymaps - } +require("which-key").setup { + plugins = { + marks = true, -- shows a list of your marks on ' and ` + registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode + -- the presets plugin, adds help for a bunch of default keybindings in Neovim + -- No actual key bindings are created + presets = { + operators = false, -- adds help for operators like d, y, ... + motions = false, -- adds help for motions + text_objects = false, -- help for text objects triggered after entering an operator + windows = true, -- default bindings on <c-w> + nav = true, -- misc bindings to work with windows + z = true, -- bindings for folds, spelling and others prefixed with z + g = true -- bindings for prefixed with g + } + }, + icons = { + breadcrumb = "ยป", -- symbol used in the command line area that shows your active key combo + separator = "โ", -- symbol used between a key and it's label + group = "+" -- symbol prepended to a group + }, + window = { + border = "single", -- none, single, double, shadow + position = "bottom", -- bottom, top + margin = {1, 0, 1, 0}, -- extra window margin [top, right, bottom, left] + padding = {2, 2, 2, 2} -- extra window padding [top, right, bottom, left] + }, + layout = { + height = {min = 4, max = 25}, -- min and max height of the columns + width = {min = 20, max = 50}, -- min and max width of the columns + spacing = 3 -- spacing between columns + }, + hidden = {"<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ "}, -- hide mapping boilerplate + show_help = true -- show help message on the command line when the popup is visible +} - -- no hl - vim.api.nvim_set_keymap('n', '<Leader>h', ':let @/=""<CR>', +-- Set leader +if O.leader_key == ' ' or O.leader_key == 'space' then + vim.api.nvim_set_keymap('n', '<Space>', '<NOP>', {noremap = true, silent = true}) - - -- explorer - vim.api.nvim_set_keymap('n', '<Leader>e', ":NvimTreeToggle<CR>", + vim.g.mapleader = ' ' +else + vim.api.nvim_set_keymap('n', O.leader_key, '<NOP>', {noremap = true, silent = true}) + vim.g.mapleader = O.leader_key +end - -- telescope - vim.api.nvim_set_keymap('n', '<Leader>f', ':Telescope find_files<CR>', - {noremap = true, silent = true}) +local opts = { + mode = "n", -- NORMAL mode + prefix = "<leader>", + buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings + silent = true, -- use `silent` when creating keymaps + noremap = true, -- use `noremap` when creating keymaps + nowait = false -- use `nowait` when creating keymaps +} - -- dashboard - vim.api.nvim_set_keymap('n', '<Leader>;', ':Dashboard<CR>', - {noremap = true, silent = true}) +-- no hl +vim.api.nvim_set_keymap('n', '<Leader>h', ':let @/=""<CR>', + {noremap = true, silent = true}) - -- Comments - vim.api.nvim_set_keymap("n", "<leader>/", ":CommentToggle<CR>", - {noremap = true, silent = true}) - vim.api.nvim_set_keymap("v", "<leader>/", ":CommentToggle<CR>", - {noremap = true, silent = true}) +-- explorer - -- close buffer - vim.api.nvim_set_keymap("n", "<leader>c", ":BufferClose<CR>", - {noremap = true, silent = true}) +vim.api.nvim_set_keymap('n', '<Leader>e', + ":lua require'lv-nvimtree'.toggle_tree()<CR>", + {noremap = true, silent = true}) - -- open projects - vim.api.nvim_set_keymap('n', '<leader>p', - ":lua require'telescope'.extensions.project.project{}<CR>", - {noremap = true, silent = true}) +-- telescope +vim.api.nvim_set_keymap('n', '<Leader>f', ':Telescope find_files<CR>', + {noremap = true, silent = true}) - vim.api.nvim_set_keymap("n", "<leader>z", ":ZenMode<CR>", - {noremap = true, silent = true}) - -- z = {"<cmd>TZAtaraxis<cr>", "toggle zen"} +-- dashboard +vim.api.nvim_set_keymap('n', '<Leader>;', ':Dashboard<CR>', + {noremap = true, silent = true}) - -- TODO create entire treesitter section +-- Comments +vim.api.nvim_set_keymap("n", "<leader>/", ":CommentToggle<CR>", + {noremap = true, silent = true}) +vim.api.nvim_set_keymap("v", "<leader>/", ":CommentToggle<CR>", + {noremap = true, silent = true}) - local mappings = { +-- close buffer +vim.api.nvim_set_keymap("n", "<leader>c", ":BufferClose<CR>", + {noremap = true, silent = true}) - ["/"] = "Comment", - ["c"] = "Close Buffer", - ["e"] = "Explorer", - ["f"] = "Find File", - ["h"] = "No Highlight", - ["p"] = "Projects", - ["z"] = "Zen", - ["gy"] = "Gitlink", - [";"] = "Dashboard", - b = { - name = "+Buffers", - j = {"<cmd>BufferPick<cr>", "jump to buffer"}, - w = {"<cmd>BufferWipeout<cr>", "wipeout buffer"}, - e = { - "<cmd>BufferCloseAllButCurrent<cr>", - "close all but current buffer" - }, - h = { - "<cmd>BufferCloseBuffersLeft<cr>", - "close all buffers to the left" - }, - l = { - "<cmd>BufferCloseBuffersRight<cr>", - "close all BufferLines to the right" - }, - D = { - "<cmd>BufferOrderByDirectory<cr>", - "sort BufferLines automatically by directory" - }, - L = { - "<cmd>BufferOrderByLanguage<cr>", - "sort BufferLines automatically by language" - } - }, +-- TODO create entire treesitter section - d = { - name = "Diagnostics", - t = {"<cmd>TroubleToggle<cr>", "trouble"}, - w = { - "<cmd>TroubleToggle lsp_workspace_diagnostics<cr>", "workspace" - }, - d = {"<cmd>TroubleToggle lsp_document_diagnostics<cr>", "document"}, - q = {"<cmd>TroubleToggle quickfix<cr>", "quickfix"}, - l = {"<cmd>TroubleToggle loclist<cr>", "loclist"}, - r = {"<cmd>TroubleToggle lsp_references<cr>", "references"} - }, +local mappings = { - -- " Available Debug Adapters: - -- " https://microsoft.github.io/debug-adapter-protocol/implementors/adapters/ - -- " - -- " Adapter configuration and installation instructions: - -- " https://github.com/mfussenegger/nvim-dap/wiki/Debug-Adapter-installation - -- " - -- " Debug Adapter protocol: - -- " https://microsoft.github.io/debug-adapter-protocol/ - -- " Debugging - -- command! DebugToggleBreakpoint lua require'dap'.toggle_breakpoint() - -- command! DebugStart lua require'dap'.continue() - -- command! DebugContinue lua require'dap'.continue() - -- command! DebugStepOver lua require'dap'.step_over() - -- command! DebugStepOut lua require'dap'.step_out() - -- command! DebugStepInto lua require'dap'.step_into() - -- command! DebugToggleRepl lua require'dap'.repl.toggle() - -- command! DebugGetSession lua require'dap'.session() - D = { - name = "Debug", - b = {"<cmd>DebugToggleBreakpoint<cr>", "Toggle Breakpoint"}, - c = {"<cmd>DebugContinue<cr>", "Continue"}, - i = {"<cmd>DebugStepInto<cr>", "Step Into"}, - o = {"<cmd>DebugStepOver<cr>", "Step Over"}, - r = {"<cmd>DebugToggleRepl<cr>", "Toggle Repl"}, - s = {"<cmd>DebugStart<cr>", "Start"} - }, - g = { - name = "Git", - j = {"<cmd>lua require 'lv-utils'.next_hunk()<cr>", "Next Hunk"}, - k = {"<cmd>lua require 'lv-utils'.prev_hunk()<cr>", "Prev Hunk"}, - l = {"<cmd>lua require 'lv-utils'.blame_line()<cr>", "Blame"}, - p = { - "<cmd>lua require 'lv-utils'.preview_hunk()<cr>", "Preview Hunk" - }, - r = {"<cmd>lua require 'lv-utils'.reset_hunk()<cr>", "Reset Hunk"}, - R = { - "<cmd>lua require 'lv-utils'.reset_buffer()<cr>", "Reset Buffer" - }, - s = {"<cmd>lua require 'lv-utils'.stage_hunk()<cr>", "Stage Hunk"}, - u = { - "<cmd>lua require 'lv-utils'.undo_stage_hunk()<cr>", - "Undo Stage Hunk" - }, - o = {"<cmd>Telescope git_status<cr>", "Open changed file"}, - b = {"<cmd>Telescope git_branches<cr>", "Checkout branch"}, - c = {"<cmd>Telescope git_commits<cr>", "Checkout commit"}, - C = { - "<cmd>Telescope git_bcommits<cr>", - "Checkout commit(for current file)" - } + ["/"] = "Comment", + ["c"] = "Close Buffer", + ["e"] = "Explorer", + ["f"] = "Find File", + ["h"] = "No Highlight", + b = { + name = "+Buffers", + j = {"<cmd>BufferPick<cr>", "jump to buffer"}, + w = {"<cmd>BufferWipeout<cr>", "wipeout buffer"}, + e = { + "<cmd>BufferCloseAllButCurrent<cr>", "close all but current buffer" }, + h = {"<cmd>BufferCloseBuffersLeft<cr>", "close all buffers to the left"}, l = { - name = "LSP", - a = {"<cmd>Lspsaga code_action<cr>", "Code Action"}, - A = {"<cmd>Lspsaga range_code_action<cr>", "Selected Action"}, - d = { - "<cmd>Telescope lsp_document_diagnostics<cr>", - "Document Diagnostics" - }, - D = { - "<cmd>Telescope lsp_workspace_diagnostics<cr>", - "Workspace Diagnostics" - }, - f = {"<cmd>lua require 'lv-utils'.formatting()<cr>", "Format"}, - h = {"<cmd>Lspsaga hover_doc<cr>", "Hover Doc"}, - i = {"<cmd>LspInfo<cr>", "Info"}, - l = {"<cmd>Lspsaga lsp_finder<cr>", "LSP Finder"}, - L = {"<cmd>Lspsaga show_line_diagnostics<cr>", "Line Diagnostics"}, - p = {"<cmd>Lspsaga preview_definition<cr>", "Preview Definition"}, - q = {"<cmd>Telescope quickfix<cr>", "Quickfix"}, - r = {"<cmd>Lspsaga rename<cr>", "Rename"}, - t = {"<cmd>LspTypeDefinition<cr>", "Type Definition"}, - x = {"<cmd>cclose<cr>", "Close Quickfix"}, - s = {"<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols"}, - S = { - "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", - "Workspace Symbols" - } + "<cmd>BufferCloseBuffersRight<cr>", + "close all BufferLines to the right" + }, + D = { + "<cmd>BufferOrderByDirectory<cr>", + "sort BufferLines automatically by directory" + }, + L = { + "<cmd>BufferOrderByLanguage<cr>", + "sort BufferLines automatically by language" + } + }, + + d = { + name = "Diagnostics", + t = {"<cmd>TroubleToggle<cr>", "trouble"}, + w = {"<cmd>TroubleToggle lsp_workspace_diagnostics<cr>", "workspace"}, + d = {"<cmd>TroubleToggle lsp_document_diagnostics<cr>", "document"}, + q = {"<cmd>TroubleToggle quickfix<cr>", "quickfix"}, + l = {"<cmd>TroubleToggle loclist<cr>", "loclist"}, + r = {"<cmd>TroubleToggle lsp_references<cr>", "references"} + }, + + -- " Available Debug Adapters: + -- " https://microsoft.github.io/debug-adapter-protocol/implementors/adapters/ + -- " + -- " Adapter configuration and installation instructions: + -- " https://github.com/mfussenegger/nvim-dap/wiki/Debug-Adapter-installation + -- " + -- " Debug Adapter protocol: + -- " https://microsoft.github.io/debug-adapter-protocol/ + -- " Debugging + -- command! DebugToggleBreakpoint lua require'dap'.toggle_breakpoint() + -- command! DebugStart lua require'dap'.continue() + -- command! DebugContinue lua require'dap'.continue() + -- command! DebugStepOver lua require'dap'.step_over() + -- command! DebugStepOut lua require'dap'.step_out() + -- command! DebugStepInto lua require'dap'.step_into() + -- command! DebugToggleRepl lua require'dap'.repl.toggle() + -- command! DebugGetSession lua require'dap'.session() + -- D = { + -- name = "Debug", + -- b = {"<cmd>DebugToggleBreakpoint<cr>", "Toggle Breakpoint"}, + -- c = {"<cmd>DebugContinue<cr>", "Continue"}, + -- i = {"<cmd>DebugStepInto<cr>", "Step Into"}, + -- o = {"<cmd>DebugStepOver<cr>", "Step Over"}, + -- r = {"<cmd>DebugToggleRepl<cr>", "Toggle Repl"}, + -- s = {"<cmd>DebugStart<cr>", "Start"} + -- }, + g = { + name = "Git", + j = {"<cmd>lua require 'lv-utils'.next_hunk()<cr>", "Next Hunk"}, + k = {"<cmd>lua require 'lv-utils'.prev_hunk()<cr>", "Prev Hunk"}, + l = {"<cmd>lua require 'lv-utils'.blame_line()<cr>", "Blame"}, + p = {"<cmd>lua require 'lv-utils'.preview_hunk()<cr>", "Preview Hunk"}, + r = {"<cmd>lua require 'lv-utils'.reset_hunk()<cr>", "Reset Hunk"}, + R = {"<cmd>lua require 'lv-utils'.reset_buffer()<cr>", "Reset Buffer"}, + s = {"<cmd>lua require 'lv-utils'.stage_hunk()<cr>", "Stage Hunk"}, + u = { + "<cmd>lua require 'lv-utils'.undo_stage_hunk()<cr>", + "Undo Stage Hunk" }, - r = { - name = "Replace", - f = { - "<cmd>lua require('spectre').open_file_search()<cr>", - "Current File" - }, - p = {"<cmd>lua require('spectre').open()<cr>", "Project"} + o = {"<cmd>Telescope git_status<cr>", "Open changed file"}, + b = {"<cmd>Telescope git_branches<cr>", "Checkout branch"}, + c = {"<cmd>Telescope git_commits<cr>", "Checkout commit"}, + C = { + "<cmd>Telescope git_bcommits<cr>", + "Checkout commit(for current file)" + } + }, + l = { + name = "LSP", + a = {"<cmd>Lspsaga code_action<cr>", "Code Action"}, + A = {"<cmd>Lspsaga range_code_action<cr>", "Selected Action"}, + d = { + "<cmd>Telescope lsp_document_diagnostics<cr>", + "Document Diagnostics" }, - s = { - name = "Search", - b = {"<cmd>Telescope git_branches<cr>", "Checkout branch"}, - c = {"<cmd>Telescope colorscheme<cr>", "Colorscheme"}, - d = { - "<cmd>Telescope lsp_document_diagnostics<cr>", - "Document Diagnostics" - }, - D = { - "<cmd>Telescope lsp_workspace_diagnostics<cr>", - "Workspace Diagnostics" - }, - f = {"<cmd>Telescope find_files<cr>", "Find File"}, - h = {"<cmd>Telescope help_tags<cr>", "Find Help"}, - m = {"<cmd>Telescope marks<cr>", "Marks"}, - M = {"<cmd>Telescope man_pages<cr>", "Man Pages"}, - r = {"<cmd>Telescope oldfiles<cr>", "Open Recent File"}, - R = {"<cmd>Telescope registers<cr>", "Registers"}, - t = {"<cmd>Telescope live_grep<cr>", "Text"} + D = { + "<cmd>Telescope lsp_workspace_diagnostics<cr>", + "Workspace Diagnostics" }, + f = {"<cmd>lua require 'lv-utils'.formatting()<cr>", "Format"}, + h = {"<cmd>Lspsaga hover_doc<cr>", "Hover Doc"}, + i = {"<cmd>LspInfo<cr>", "Info"}, + l = {"<cmd>Lspsaga lsp_finder<cr>", "LSP Finder"}, + L = {"<cmd>Lspsaga show_line_diagnostics<cr>", "Line Diagnostics"}, + p = {"<cmd>Lspsaga preview_definition<cr>", "Preview Definition"}, + q = {"<cmd>Telescope quickfix<cr>", "Quickfix"}, + r = {"<cmd>Lspsaga rename<cr>", "Rename"}, + t = {"<cmd>LspTypeDefinition<cr>", "Type Definition"}, + x = {"<cmd>cclose<cr>", "Close Quickfix"}, + s = {"<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols"}, S = { - name = "Session", - s = {"<cmd>SessionSave<cr>", "Save Session"}, - l = {"<cmd>SessionLoad<cr>", "Load Session"} + "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", + "Workspace Symbols" } - -- extras - -- z = { - -- name = "Zen", - -- s = {"<cmd>TZBottom<cr>", "toggle status line"}, - -- t = {"<cmd>TZTop<cr>", "toggle tab bar"}, - -- z = {"<cmd>TZAtaraxis<cr>", "toggle zen"} - -- } + }, + r = { + name = "Replace", + f = { + "<cmd>lua require('spectre').open_file_search()<cr>", "Current File" + }, + p = {"<cmd>lua require('spectre').open()<cr>", "Project"} + }, + s = { + name = "Search", + b = {"<cmd>Telescope git_branches<cr>", "Checkout branch"}, + c = {"<cmd>Telescope colorscheme<cr>", "Colorscheme"}, + d = { + "<cmd>Telescope lsp_document_diagnostics<cr>", + "Document Diagnostics" + }, + D = { + "<cmd>Telescope lsp_workspace_diagnostics<cr>", + "Workspace Diagnostics" + }, + f = {"<cmd>Telescope find_files<cr>", "Find File"}, + h = {"<cmd>Telescope help_tags<cr>", "Find Help"}, + m = {"<cmd>Telescope marks<cr>", "Marks"}, + M = {"<cmd>Telescope man_pages<cr>", "Man Pages"}, + r = {"<cmd>Telescope oldfiles<cr>", "Open Recent File"}, + R = {"<cmd>Telescope registers<cr>", "Registers"}, + t = {"<cmd>Telescope live_grep<cr>", "Text"} + }, + S = { + name = "Session", + s = {"<cmd>SessionSave<cr>", "Save Session"}, + l = {"<cmd>SessionLoad<cr>", "Load Session"} } +} - if O.extras then - mappings["L"] = { - name = "+Latex", - c = {"<cmd>VimtexCompile<cr>", "Toggle Compilation Mode"}, - f = {"<cmd>call vimtex#fzf#run()<cr>", "Fzf Find"}, - i = {"<cmd>VimtexInfo<cr>", "Project Information"}, - s = {"<cmd>VimtexStop<cr>", "Stop Project Compilation"}, - t = {"<cmd>VimtexTocToggle<cr>", "Toggle Table Of Content"}, - v = {"<cmd>VimtexView<cr>", "View PDF"} - } - end - -- TODO come back and fix visual mappings - -- local visualOpts = { - -- mode = "v", -- Visual mode - -- prefix = "<leader>", - -- buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings - -- silent = true, -- use `silent` when creating keymaps - -- noremap = true, -- use `noremap` when creating keymaps - -- nowait = false -- use `nowait` when creating keymaps - -- } +if O.plugin.gitlinker.active then mappings["gy"] = "Gitlink" end +if O.plugin.zen.active then + vim.api.nvim_set_keymap("n", "<leader>z", ":ZenMode<CR>", + {noremap = true, silent = true}) + mappings["z"] = "Zen" +end +if O.plugin.telescope_project then + -- open projects + vim.api.nvim_set_keymap('n', '<leader>p', + ":lua require'telescope'.extensions.project.project{}<CR>", + {noremap = true, silent = true}) + mappings["p"] = "Projects" +end - -- local visualMappings = { - -- ["/"] = {"<cmd>CommentToggle<cr>", "Comment"}, - -- r = { - -- name = "Replace", - -- f = {"<cmd>lua require('spectre').open_visual({path = vim.fn.expand('%')})<cr>", "File"}, - -- p = {"<cmd>lua require('spectre').open_visual()<cr>", "Project"} - -- } - -- } +-- [";"] = "Dashboard", - local wk = require("which-key") - wk.register(mappings, opts) - -- wk.register(visualMappings, visualOpts) +if O.lang.latex.active then + mappings["L"] = { + name = "+Latex", + c = {"<cmd>VimtexCompile<cr>", "Toggle Compilation Mode"}, + f = {"<cmd>call vimtex#fzf#run()<cr>", "Fzf Find"}, + i = {"<cmd>VimtexInfo<cr>", "Project Information"}, + s = {"<cmd>VimtexStop<cr>", "Stop Project Compilation"}, + t = {"<cmd>VimtexTocToggle<cr>", "Toggle Table Of Content"}, + v = {"<cmd>VimtexView<cr>", "View PDF"} + } +end +local wk = require("which-key") +wk.register(mappings, opts) diff --git a/lua/plugins.lua b/lua/plugins.lua index af1aee4d..1d1a1628 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -138,6 +138,16 @@ return require("packer").startup(function(use) end, disable = not O.plugin.zen.active } + -- Ranger + use { + "kevinhwang91/rnvimr", + cmd = "Rnvimr", + config = function() + require('lv-rnvimr').config() + end, + disable = not O.plugin.ranger.active + } + -- matchup use { 'andymass/vim-matchup', @@ -186,9 +196,8 @@ return require("packer").startup(function(use) vim.g.indentLine_enabled = 1 vim.g.indent_blankline_char = "โ" - vim.g.indent_blankline_filetype_exclude = { - "help", "terminal", "dashboard" - } + vim.g.indent_blankline_filetype_exclude = + {"help", "terminal", "dashboard"} vim.g.indent_blankline_buftype_exclude = {"terminal"} vim.g.indent_blankline_show_trailing_blankline_indent = false @@ -330,12 +339,6 @@ return require("packer").startup(function(use) requires = 'nvim-lua/plenary.nvim' } - -- Rust tools - -- TODO: use lazy loading maybe? - use { - "simrat39/rust-tools.nvim", - disable = not O.lang.rust.active - } -- Lazygit use { "kdheepak/lazygit.nvim", @@ -372,9 +375,9 @@ return require("packer").startup(function(use) -- LANGUAGE SPECIFIC GOES HERE -- Latex TODO what filetypes should this be active for? - use { - "lervag/vimtex", - ft = "latex", - disable = not O.lang.latex.active - } + use {"lervag/vimtex", ft = "latex", disable = not O.lang.latex.active} + + -- Rust tools + -- TODO: use lazy loading maybe? + use {"simrat39/rust-tools.nvim", disable = not O.lang.rust.active} end) diff --git a/lv-config.lua b/lv-config.lua index b1d6045c..9e81fd71 100644 --- a/lv-config.lua +++ b/lv-config.lua @@ -21,14 +21,14 @@ O.smart_case = true -- After changing plugin config it is recommended to run :PackerCompile O.plugin.hop.active = false O.plugin.dial.active = false -O.plugin.dashboard.active = true +O.plugin.dashboard.active = false O.plugin.matchup.active = false O.plugin.colorizer.active = false O.plugin.numb.active = false O.plugin.ts_playground.active = false O.plugin.indent_line.active = false -O.plugin.gitlinker.active = true -O.plugin.zen.active = true +O.plugin.gitlinker.active = false +O.plugin.zen.active = false -- dashboard -- O.dashboard.custom_header = {""} @@ -49,7 +49,7 @@ O.lang.clang.diagnostics.underline = false -- add things like O.python.formatter.isort.exec_path O.lang.python.formatter = 'yapf' -- O.python.linter = 'flake8' -O.lang.python.active = true +O.lang.python.active = false O.lang.python.isort = true O.lang.python.autoformat = true O.lang.python.diagnostics.virtual_text = true @@ -61,7 +61,7 @@ O.lang.python.analysis.use_library_code_types = true -- lua -- TODO look into stylua -O.lang.lua.active = true +O.lang.lua.active = false O.lang.lua.formatter = 'lua-format' -- O.lua.formatter = 'lua-format' O.lang.lua.autoformat = false @@ -72,7 +72,7 @@ O.lang.tsserver.linter = nil O.lang.tsserver.autoformat = true -- json -O.lang.json.active = true +O.lang.json.active = false O.lang.json.autoformat = true -- ruby @@ -91,7 +91,7 @@ O.lang.rust.autoformat = true -- Turn off cursorline -- O.cursorline = false --- Neovim turns the default cursor to 'Block' +-- Neovim turns the default cursor to 'Block' -- when switched back into terminal. -- This below line fixes that. Uncomment if needed. @@ -104,4 +104,7 @@ O.lang.rust.autoformat = true -- The numbers didn't make a difference in alacritty. Please change -- the number to something that suits your needs if it looks weird. - +-- TODO +-- custom autocommands +-- user defined plugin config +-- custom settings |