docs/release-notes/rl-0.8.md

@@ -1,10 +1,5 @@
 # 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):
 
 [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim

modules/plugins/git/git-conflict/git-conflict.nix

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

modules/wrapper/build/config.nix

@@ -45,7 +45,7 @@
   pluginBuilders = {
     nvim-treesitter = buildTreesitterPlug config.vim.treesitter.grammars;
     flutter-tools-patched = buildPlug {
-      pname = "flutter-tools-nvim";
+      pname = "flutter-tools";
       patches = [./patches/flutter-tools.patch];
 
       # Disable failing require check hook checks