Compare commits

..

No commits in common. "master" and "plugin-fix" have entirely different histories.

3 changed files with 12 additions and 129 deletions

View File

@ -1,6 +1,7 @@
local opt = vim.opt
local g = vim.g
g.maplocalleader = ";"
opt.foldmethod = "indent"
opt.foldnestmax = 10
opt.foldlevel = 2
-- local autocmd = vim.api.nvim_create_autocmd
-- Auto resize panes when resizing nvim window
-- autocmd("VimResized", {
-- pattern = "*",
-- command = "tabdo wincmd =",
-- })

View File

@ -1,123 +1,21 @@
---@type MappingsTable
local M = {}
M.disabled = {
n = {
["<leader>h"] = "",
["<C-a>"] = "",
["<C-s>"] = "",
},
}
M.lazygit = {
plugin = true,
n = {
["<leader>gg"] = { "<cmd>LazyGit<CR>", "Open LazyGit" },
},
}
M.telescope = {
plugin = true,
n = {
-- find
["<localleader>ff"] = { "<cmd> Telescope find_files <CR>", "Find files" },
["<localleader>fa"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "Find all" },
["<localleader>fw"] = { "<cmd> Telescope live_grep <CR>", "Live grep" },
["<localleader>fb"] = { "<cmd> Telescope buffers <CR>", "Find buffers" },
["<localleader>fh"] = { "<cmd> Telescope help_tags <CR>", "Help page" },
["<localleader>fo"] = { "<cmd> Telescope oldfiles <CR>", "Find oldfiles" },
["<localleader>fz"] = { "<cmd> Telescope current_buffer_fuzzy_find <CR>", "Find in current buffer" },
-- git
["<localleader>cm"] = { "<cmd> Telescope git_commits <CR>", "Git commits" },
["<localleader>gt"] = { "<cmd> Telescope git_status <CR>", "Git status" },
-- pick a hidden term
["<localleader>pt"] = { "<cmd> Telescope terms <CR>", "Pick hidden term" },
-- theme switcher
["<localleader>th"] = { "<cmd> Telescope themes <CR>", "Nvchad themes" },
["<localleader>ma"] = { "<cmd> Telescope marks <CR>", "telescope bookmarks" },
},
}
M.nvimtree = {
plugin = true,
n = {
-- toggle
["<C-n>"] = { "<cmd> NvimTreeToggle <CR>", "Toggle nvimtree" },
["<F5>"] = { "<cmd> NvimTreeToggle <CR>", "Toggle nvimtree" },
-- focus
["<localleader>e"] = { "<cmd> NvimTreeFocus <CR>", "Focus nvimtree" },
},
}
M.general = {
i = {
-- go to beginning and end
["<C-b>"] = { "<HOME>", "Beginning of line" },
["<C-e>"] = { "<End>", "End of line" },
-- navigate within insert mode
["<C-h>"] = { "<Left>", "Move left" },
["<C-l>"] = { "<Right>", "Move right" },
["<C-j>"] = { "<Down>", "Move down" },
["<C-k>"] = { "<Up>", "Move up" },
},
n = {
--big move
["<A-k>"] = { "<C-u>", "big step down" },
["<A-j>"] = { "<C-d>", "big step down" },
-- easy newline
["OO"] = { "O<ESC>", "insert a line above", opts = { nowait = true } },
["oo"] = { "o<ESC>", "insert a line below", opts = { nowait = true } },
-- go to beginning and end
["H"] = { "<HOME>", "Beginning of line" },
["L"] = { "<End>", "End of line" },
-- do something useful with the arrows
["<Up>"] = { "<cmd>move-2<CR>==", "Move line up", opts = { expr = true } },
["<Down>"] = { "<cmd>move+<CR>==", "Move line down", opts = { expr = true } },
["<LEFT>"] = { "<<", "Less indentation", opts = { expr = true } },
["<RIGHT>"] = { ">>", "More indentation", opts = { expr = true } },
[";"] = { ":", "enter command mode", opts = { nowait = true } },
-- format with conform
["<leader>fm"] = {
["<leader>ff"] = {
function()
require("conform").format()
end,
"formatting",
},
}
["<leader>tw"] = {
function()
vim.opt_local.wrap = not vim.wo.wrap
vim.opt_local.breakindent = not vim.wo.breakindent
if vim.wo.colorcolumn == "" then
vim.opt_local.colorcolumn = tostring(vim.bo.textwidth)
else
vim.opt_local.colorcolumn = ""
end
end,
"toggle wrap",
},
},
v = {
-- go to beginning and end
["H"] = { "<HOME>", "Beginning of line" },
["L"] = { "<End>", "End of line" },
["<LEFT>"] = { "<gv", "Less indentation" },
["<RIGHT>"] = { ">gv", "More indentation" },
},
x = {
["<Up>"] = { "move'<-2<CR>gv=gv", "Move line up", opts = { expr = true } },
["<Down>"] = { "move'<-2<CR>gv=gv", "Move line down", opts = { expr = true } },
[">"] = { ">gv", "indent"},
},
}

View File

@ -1,5 +1,4 @@
local overrides = require "custom.configs.overrides"
local utils = require "core.utils"
---@type NvPluginSpec[]
local plugins = {
@ -13,6 +12,7 @@ local plugins = {
require "custom.configs.lspconfig"
end, -- Override to setup mason-lspconfig
},
-- override plugin configs
{
"williamboman/mason.nvim",
@ -52,22 +52,6 @@ local plugins = {
require("leap").create_default_mappings()
end,
},
{
"kdheepak/lazygit.nvim",
keys = { "<leader>gg" },
cmd = "LazyGit",
-- optional for floating window border decoration
dependencies = {
"nvim-lua/plenary.nvim",
},
init = function()
require("core.utils").load_mappings "lazygit"
end,
},
{
"folke/which-key.nvim",
keys = { "<leader>", "<localleader>", "<c-r>", "<c-w>", '"', "'", "`", "c", "v", "g" },
},
}
return plugins