updates, everything false by default

This commit is contained in:
Chris 2021-06-29 18:55:01 -04:00
parent 758798b6f9
commit fba5bc3d85
5 changed files with 292 additions and 307 deletions

View file

@ -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},

View file

@ -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

View file

@ -30,9 +30,7 @@
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
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
}
@ -61,7 +59,9 @@
{noremap = true, silent = true})
-- explorer
vim.api.nvim_set_keymap('n', '<Leader>e', ":NvimTreeToggle<CR>",
vim.api.nvim_set_keymap('n', '<Leader>e',
":lua require'lv-nvimtree'.toggle_tree()<CR>",
{noremap = true, silent = true})
-- telescope
@ -82,15 +82,6 @@
vim.api.nvim_set_keymap("n", "<leader>c", ":BufferClose<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})
vim.api.nvim_set_keymap("n", "<leader>z", ":ZenMode<CR>",
{noremap = true, silent = true})
-- z = {"<cmd>TZAtaraxis<cr>", "toggle zen"}
-- TODO create entire treesitter section
local mappings = {
@ -100,22 +91,14 @@
["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"
"<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"
@ -133,9 +116,7 @@
d = {
name = "Diagnostics",
t = {"<cmd>TroubleToggle<cr>", "trouble"},
w = {
"<cmd>TroubleToggle lsp_workspace_diagnostics<cr>", "workspace"
},
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"},
@ -159,27 +140,23 @@
-- 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"}
},
-- 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"
},
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"
},
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>",
@ -224,8 +201,7 @@
r = {
name = "Replace",
f = {
"<cmd>lua require('spectre').open_file_search()<cr>",
"Current File"
"<cmd>lua require('spectre').open_file_search()<cr>", "Current File"
},
p = {"<cmd>lua require('spectre').open()<cr>", "Project"}
},
@ -254,16 +230,25 @@
s = {"<cmd>SessionSave<cr>", "Save Session"},
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"}
-- }
}
if O.extras then
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
-- [";"] = "Dashboard",
if O.lang.latex.active then
mappings["L"] = {
name = "+Latex",
c = {"<cmd>VimtexCompile<cr>", "Toggle Compilation Mode"},
@ -274,26 +259,6 @@
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
-- }
-- 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"}
-- }
-- }
local wk = require("which-key")
wk.register(mappings, opts)
-- wk.register(visualMappings, visualOpts)

View file

@ -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)

View file

@ -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
@ -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