NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-02-23 03:48:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

git/git-conflict: avoid shadowing builtin keybinds (#651)
Some checks are pending
Set up binary cache / cachix (default) (push) Waiting to run
Details
Set up binary cache / cachix (maximal) (push) Waiting to run
Details
Set up binary cache / cachix (nix) (push) Waiting to run
Details
Validate flake & check documentation / Validate Flake Documentation (push) Waiting to run
Details
Validate flake & check documentation / Validate hyperlinks in documentation sources (push) Waiting to run
Details
Validate flake & check formatting / Validate Flake (push) Waiting to run
Details
Validate flake & check formatting / Formatting via Alejandra (push) Waiting to run
Details
Build and deploy documentation / Check latest commit (push) Waiting to run
Details
Build and deploy documentation / publish (push) Blocked by required conditions
Details
Check for typos in the source tree / check-typos (push) Waiting to run
Details

Browse source 
* git/git-conflict: avoid shadowing builtin keybinds

* docs: update release notes

---------

Co-authored-by: raf <me@notashelf.dev>
This commit is contained in:
Ching Pei Yang 2025-02-21 14:44:05 +01:00 • committed by GitHub
parent 4aac51ec19
commit 5fbc72d697
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/release-notes/rl-0.8.md
View file

@ -1,5 +1,10 @@
# Release 0.8 {#sec-release-0.8} # Release 0.8 {#sec-release-0.8}
## Breaking changes
- `git-conflict` keybinds are now prefixed with `<leader>` to avoid conflicting
with builtins
[NotAShelf](https://github.com/notashelf): [NotAShelf](https://github.com/notashelf):
[typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim

8
modules/plugins/git/git-conflict/git-conflict.nix
View file

@ -12,10 +12,10 @@ in {
setupOpts = mkPluginSetupOption "git-conflict" {}; setupOpts = mkPluginSetupOption "git-conflict" {};
mappings = { mappings = {
ours = mkMappingOption "Choose Ours [Git-Conflict]" "co"; ours = mkMappingOption "Choose Ours [Git-Conflict]" "<leader>co";
theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "ct"; theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "<leader>ct";
both = mkMappingOption "Choose Both [Git-Conflict]" "cb"; both = mkMappingOption "Choose Both [Git-Conflict]" "<leader>cb";
none = mkMappingOption "Choose None [Git-Conflict]" "c0"; none = mkMappingOption "Choose None [Git-Conflict]" "<leader>c0";
prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x"; prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x"; nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
}; };