update dotfile (nvim config)

This commit is contained in:
jc 2024-05-24 22:49:40 -04:00
commit 5ff8e1e49f
No known key found for this signature in database
3 changed files with 58 additions and 41 deletions

View file

@ -31,28 +31,28 @@ vim.keymap.set("n", "q", "<nop>", { noremap = true })
vim.keymap.set("n", "<leader>ss", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]]) vim.keymap.set("n", "<leader>ss", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
-- do not copy with x, for god sake, WHY copy something that is being deleted?? -- do not copy with x, for god sake, WHY copy something that is being deleted??
vim.keymap.set("n", "x", "\"_x") vim.keymap.set("n", "x", '"_x')
-- no copy, delete line, for god sake... -- no copy, delete line, for god sake...
vim.keymap.set("n", "dd", "\"_dd") vim.keymap.set("n", "dd", '"_dd')
vim.keymap.set("n", "dx", "dd") -- cut line, under my control vim.keymap.set("n", "dx", "dd") -- cut line, under my control
vim.keymap.set("v", "d", "\"_d") vim.keymap.set("v", "d", '"_d')
-- copy/paste to/from system clipboard -- copy/paste to/from system clipboard
vim.keymap.set({ "n", "v" }, "<leader>y", "\"+y") vim.keymap.set({ "n", "v" }, "<leader>y", '"+y')
vim.keymap.set({ "n", "v" }, "<leader>p", "\"+p") vim.keymap.set({ "n", "v" }, "<leader>p", '"+p')
-- increment/decrement a count, helpful for changing indeces -- increment/decrement a count, helpful for changing indeces
vim.keymap.set("n", "+", "<C-a>") vim.keymap.set("n", "+", "<C-a>")
vim.keymap.set("n", "-", "<C-x>") vim.keymap.set("n", "-", "<C-x>")
-- do not copy when deleting word -- do not copy when deleting word
vim.keymap.set("n", "dw", "\"_dw") vim.keymap.set("n", "dw", '"_dw')
vim.keymap.set("n", "db", "vb\"_d") -- delete in backwards vim.keymap.set("n", "db", 'vb"_d') -- delete in backwards
vim.keymap.set("n", "<C-a>", "gg<S-v>G") -- select all vim.keymap.set("n", "<C-a>", "gg<S-v>G") -- select all
-- split pane -- split pane
vim.keymap.set("n", "ss", ":split<Return><C-w>w", { silent = true }) -- horizontal vim.keymap.set("n", "ss", ":split<Return><C-w>w", { silent = true }) -- horizontal
vim.keymap.set("n", "sv", ":vsplit<Return><C-w>w", { silent = true }) -- vertical vim.keymap.set("n", "sv", ":vsplit<Return><C-w>w", { silent = true }) -- vertical
-- pane movement -- pane movement
@ -75,9 +75,12 @@ vim.keymap.set("i", "<C-k>", "<Up>", { noremap = true })
vim.keymap.set("i", "<C-l>", "<Right>", { noremap = true }) vim.keymap.set("i", "<C-l>", "<Right>", { noremap = true })
-- terminal keymaps -- terminal keymaps
vim.keymap.set("t", "<C-t>", "<C-\\><C-n>", { noremap = true }) -- exit insert mode in terminal vim.keymap.set("t", "<C-t>", "<C-\\><C-n>", { noremap = true }) -- exit insert mode in terminal
vim.keymap.set("t", "<C-x>", "<cmd>bd!<CR>", { noremap = true }) -- terminate terminal session vim.keymap.set("t", "<C-x>", "<cmd>bd!<CR>", { noremap = true }) -- terminate terminal session
vim.keymap.set("n", "<C-t>", "<cmd>term<CR>i", { noremap = true }) -- create new terminal session vim.keymap.set("n", "<C-t>", "<cmd>term<CR>i", { noremap = true }) -- create new terminal session
-- lazygit on floaterm -- lazygit on floaterm
vim.keymap.set("n", "<leader>g", "<cmd>FloatermNew lazygit<CR>", { noremap = true }) vim.keymap.set("n", "<leader>g", "<cmd>FloatermNew lazygit<CR>", { noremap = true })
-- quick way to handle errors in Go
vim.keymap.set("n", "<leader>ee", "oif err != nil {<CR>}<ESC>Oreturn err<ESC>")

View file

@ -29,23 +29,37 @@ return {
-- formatting -- formatting
{ {
"stevearc/conform.nvim", "stevearc/conform.nvim",
opts = { config = function()
formatters_by_ft = { require("conform").setup({
lua = { "stylua" }, formatters_by_ft = {
javascript = { "prettierd" }, lua = { "stylua" },
typescript = { "prettierd" }, javascript = { "prettierd" },
javascriptreact = { "prettierd" }, typescript = { "prettierd" },
typescriptreact = { "prettierd" }, javascriptreact = { "prettierd" },
go = { "gofumpt" }, typescriptreact = { "prettierd" },
python = { "autopep8" }, go = { "gofumpt" },
}, python = { "autopep8" },
format_on_save = function(bufnr) },
if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then format_on_save = function(bufnr)
return if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
end return
return { timeout_ms = 500, lsp_fallback = true } end
end, return { timeout_ms = 500, lsp_fallback = true }
}, end,
})
vim.api.nvim_create_user_command("FormatDisable", function()
vim.g.disable_autoformat = true
end, {
desc = "Disable autoformat on save",
})
vim.api.nvim_create_user_command("FormatEnable", function()
vim.g.disable_autoformat = false
end, {
desc = "Enable autoformat on save",
})
end,
}, },
}, },
config = function() config = function()

View file

@ -1,15 +1,15 @@
return { return {
"jose-elias-alvarez/null-ls.nvim", "jose-elias-alvarez/null-ls.nvim",
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
}, },
config = function() config = function()
local null_ls = require("null-ls") local null_ls = require("null-ls")
null_ls.setup({ null_ls.setup({
sources = { sources = {
null_ls.builtins.formatting.prettierd, null_ls.builtins.formatting.prettierd,
null_ls.builtins.diagnostics.eslint, null_ls.builtins.diagnostics.eslint,
}, },
}) })
end end,
} }