henrik/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvim

Browse Source
This commit is contained in:
Henrik Bakken
2025-02-11 16:18:04 +01:00
parent 1a17c76dd2
commit 984de7f987
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvim/init.lua
+9 -6
View File
@@ -433,7 +433,10 @@ require("lazy").setup({
"DiffviewFocusFiles", "DiffviewFocusFiles",
"DiffviewRefresh", "DiffviewRefresh",
}, },
keys = { { "<leader>gD", "<cmd>DiffviewOpen<cr>" } }, keys = {
{ "<leader>gd", "<cmd>DiffviewOpen<cr>", noremap = true },
{ "<leader>gh", "<cmd>DiffviewFileHistory<cr>", noremap = true },
},
}, },
{ {
"tpope/vim-fugitive", "tpope/vim-fugitive",
@@ -478,7 +481,7 @@ require("lazy").setup({
word_diff = false, word_diff = false,
signs_staged_enable = false, signs_staged_enable = false,
on_attach = function(bufnr) on_attach = function(bufnr)
local gs = package.loaded.gitsigns local gs = require("gitsigns")
local function map(mode, l, r, opts) local function map(mode, l, r, opts)
opts = opts or {} opts = opts or {}
@@ -500,12 +503,11 @@ require("lazy").setup({
end, { expr = true }) end, { expr = true })
-- Actions -- Actions
map({ "n", "v" }, "<leader>gs", "<cmd>Gitsigns stage_hunk<CR>") map({ "n", "v" }, "<leader>gs", gs.stage_hunk)
map({ "n", "v" }, "<leader>gx", "<cmd>Gitsigns reset_hunk<CR>") map({ "n", "v" }, "<leader>gx", gs.reset_hunk)
map("n", "<leader>gu", gs.undo_stage_hunk) map("n", "<leader>gu", gs.undo_stage_hunk)
map("n", "<leader>gi", gs.preview_hunk) map("n", "<leader>gi", gs.preview_hunk_inline)
map("n", "<leader>gb", function() gs.blame_line({ full = true }) end) map("n", "<leader>gb", function() gs.blame_line({ full = true }) end)
map("n", "<leader>gd", gs.diffthis)
map("n", "<leader>gS", gs.stage_buffer) map("n", "<leader>gS", gs.stage_buffer)
map("n", "<leader>gX", gs.reset_buffer) map("n", "<leader>gX", gs.reset_buffer)
map("n", "<leader>td", gs.toggle_deleted) map("n", "<leader>td", gs.toggle_deleted)
@@ -740,6 +742,7 @@ require("lazy").setup({
-- package manager + lsp stuff -- package manager + lsp stuff
{ {
"williamboman/mason.nvim", "williamboman/mason.nvim",
lazy = false,
opts = {}, opts = {},
keys = { { "<F2>", "<cmd>Mason<cr>", noremap = true } }, keys = { { "<F2>", "<cmd>Mason<cr>", noremap = true } },
}, },