Compare commits

...

10 Commits

16 changed files with 45 additions and 44 deletions

5
after/ftplugin/lua.lua Normal file
View File

@@ -0,0 +1,5 @@
vim.keymap.set("n", "<leader><leader>x", "<cmd>source %<CR>")
vim.keymap.set("n", "<leader>x", ":.lua<CR>")
vim.keymap.set("v", "<leader>x", ":lua<CR>")
vim.opt_local.colorcolumn = { 81 }

View File

@@ -0,0 +1 @@
vim.opt_local.colorcolumn = { 80, 81, 89 }

1
after/ftplugin/rust.lua Normal file
View File

@@ -0,0 +1 @@
vim.opt_local.colorcolumn = { 80, 100 }

View File

@@ -5,6 +5,12 @@ vim.keymap.set("n", "N", "Nzz", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float)
vim.keymap.set("n", "<M-j>", "<cmd>cnext<CR>")
vim.keymap.set("n", "<M-k>", "<cmd>cprev<CR>")
vim.keymap.set("v", "<M-k>", ":m '<-2<cr>gv=gv")
vim.keymap.set("v", "<M-j>", ":m '>+1<cr>gv=gv")
vim.keymap.set(
"t",
"<C-x>",

View File

@@ -36,3 +36,9 @@ vim.o.completeopt = "menuone,noselect,fuzzy,nosort"
-- default plus added dash
vim.o.iskeyword = "@,48-57,_,192-255,-"
vim.api.nvim_create_autocmd("TextYankPost", {
desc = "highlight when yanking text",
group = vim.api.nvim_create_augroup("CustomHighlightYank", { clear = true }),
callback = function() vim.highlight.on_yank() end,
})

View File

@@ -17,26 +17,6 @@ end
-- set up 'mini.deps' immediately to have its `now()` and `later()` helpers
require("mini.deps").setup()
-- also setup this user command to always save a new lockfile after update
vim.api.nvim_create_user_command("DepsUpdateSnapSave", function(opts)
local name = opts.args ~= "" and opts.args or nil
MiniDeps.update(name)
MiniDeps.snap_save()
end, {
desc = "Update MiniDeps plugins and save snapshot",
nargs = "?",
complete = function(arg, _, _)
local session_names = vim.tbl_map(
function(s) return s.name end,
MiniDeps.get_session()
)
return vim.tbl_filter(
function(n) return vim.startswith(n, arg) end,
session_names
)
end,
})
-- define main config table to be able to use it in scripts
_G.Config = {}

View File

@@ -1,7 +1,5 @@
add, now, later = MiniDeps.add, MiniDeps.now, MiniDeps.later
now(function()
add("sainnhe/gruvbox-material")
MiniDeps.now(function()
MiniDeps.add("sainnhe/gruvbox-material")
vim.o.background = "dark"
vim.g.gruvbox_material_background = "light"

View File

@@ -1,7 +1,5 @@
add, now, later = MiniDeps.add, MiniDeps.now, MiniDeps.later
later(function()
add("ibhagwan/fzf-lua")
MiniDeps.later(function()
MiniDeps.add("ibhagwan/fzf-lua")
local fzf = require("fzf-lua")
fzf.setup({

View File

@@ -1,7 +1,7 @@
MiniDeps.later(function()
MiniDeps.add("f-person/git-blame.nvim")
require("gitblame").setup({
enabled = true,
enabled = false,
message_template = " <sha>: <author> <date> <summary>",
date_format = "%Y-%m-%d",
})

View File

@@ -1,7 +1,5 @@
add, now, later = MiniDeps.add, MiniDeps.now, MiniDeps.later
later(function()
add("neovim/nvim-lspconfig")
MiniDeps.later(function()
MiniDeps.add("neovim/nvim-lspconfig")
vim.lsp.enable({
"pyright",

View File

@@ -1,6 +1,4 @@
add, now, later = MiniDeps.add, MiniDeps.now, MiniDeps.later
now(function()
MiniDeps.now(function()
require("mini.notify").setup()
vim.notify = MiniNotify.make_notify()
end)

View File

@@ -0,0 +1,7 @@
MiniDeps.now(
function()
require("mini.starter").setup({
query_updaters = "abcdefghijklmnopqrstuvwxyz0123456789_.",
})
end
)

View File

@@ -1,7 +1,5 @@
add, now, later = MiniDeps.add, MiniDeps.now, MiniDeps.later
later(function()
add("stevearc/oil.nvim")
MiniDeps.later(function()
MiniDeps.add("stevearc/oil.nvim")
require("oil").setup({ view_options = { show_hidden = true } })
vim.keymap.set("n", "-", require("oil").open, { desc = "Open parent directory" })
end)

View File

@@ -0,0 +1,5 @@
MiniDeps.now(function()
MiniDeps.add("folke/todo-comments.nvim")
MiniDeps.add("nvim-lua/plenary.nvim")
require("todo-comments").setup()
end)

View File

@@ -1,8 +1,7 @@
local add, now, later = MiniDeps.add, MiniDeps.now, MiniDeps.later
local now_if_args = vim.fn.argc(-1) > 0 and now or later
local now_if_args = vim.fn.argc(-1) > 0 and MiniDeps.now or MiniDeps.later
now_if_args(function()
add({
MiniDeps.add({
source = "nvim-treesitter/nvim-treesitter",
checkout = "main",
hooks = { post_checkout = function() vim.cmd("TSUpdate") end },

View File

@@ -10,5 +10,6 @@ return {
["nvim-treesitter"] = "3ab4f2d2d20be55874e2eb575145c6928d7d7d0e",
["oil.nvim"] = "919e155fdf38e9148cdb5304faaaf53c20d703ea",
["plenary.nvim"] = "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
["rainbow-delimiters.nvim"] = "3277ad5f96eb03c9d618c88e24f683e4364e578c"
["rainbow-delimiters.nvim"] = "3277ad5f96eb03c9d618c88e24f683e4364e578c",
["todo-comments.nvim"] = "304a8d204ee787d2544d8bc23cd38d2f929e7cc5"
}