cschmatzler/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

diffconflicts

Browse Source
This commit is contained in:
Christoph Schmatzler
2025-12-15 22:05:23 +00:00
parent ed651788b4
commit cb6a6f9f46
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
profiles/neovim/default.nix
View File

@@ -9,6 +9,7 @@
./plugins/grug-far.nix ./plugins/grug-far.nix
./plugins/harpoon.nix ./plugins/harpoon.nix
./plugins/hunk.nix ./plugins/hunk.nix
./plugins/jj-diffconflicts.nix
./plugins/lsp.nix ./plugins/lsp.nix
./plugins/mini.nix ./plugins/mini.nix
./plugins/oil.nix ./plugins/oil.nix

6
profiles/neovim/mappings.nix
View File

@@ -118,6 +118,12 @@
options.desc = "Visit paths (cwd)"; options.desc = "Visit paths (cwd)";
} }
# g - git # g - git
{
mode = "n";
key = "<leader>gc";
action = ":JJDiffConflicts<CR>";
options.desc = "Resolve conflicts";
}
{ {
mode = "n"; mode = "n";
key = "<leader>gg"; key = "<leader>gg";

13
profiles/neovim/plugins/jj-diffconflicts.nix Normal file
View File

@@ -0,0 +1,13 @@
{pkgs, ...}: {
programs.nixvim.extraPlugins = [
(pkgs.vimUtils.buildVimPlugin {
name = "jj-diffconflicts";
src = pkgs.fetchFromGitHub {
owner = "rafikdraoui";
repo = "jj-diffconflicts";
rev = "main";
hash = "sha256-FXsLSYy+eli8VArUL8ZOiPtyOk4Q8TUYwobEefZPRII=";
};
})
];
}