Fixed Discord Bridge and neovim stupid stuff
This commit is contained in:
@@ -108,7 +108,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
extraPackages = with pkgs; [ curl ];
|
||||
#extraPackages = with pkgs; [ curl ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,12 +2,32 @@ _: {
|
||||
programs.nixvim = {
|
||||
plugins.diffview = {
|
||||
enable = true;
|
||||
keymaps = {
|
||||
"]x" = "<cmd>DiffviewConflictNext<CR>";
|
||||
"[x" = "<cmd>DiffviewConflictPrev<CR>";
|
||||
"do" = "<cmd>DiffviewFocusOurs<CR>";
|
||||
"dt" = "<cmd>DiffviewFocusTheirs<CR>";
|
||||
};
|
||||
settings.keymaps.view = [
|
||||
{
|
||||
mode = "n";
|
||||
key = "]x";
|
||||
action = "<cmd>DiffviewConflictNext<CR>";
|
||||
description = "Next conflict";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "[x";
|
||||
action = "<cmd>DiffviewConflictPrev<CR>";
|
||||
description = "Previous conflict";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "do";
|
||||
action = "<cmd>DiffviewFocusOurs<CR>";
|
||||
description = "Focus ours";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "dt";
|
||||
action = "<cmd>DiffviewFocusTheirs<CR>";
|
||||
description = "Focus theirs";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user