Skip to content

assistant/codecompanion-nvim: add mappings #740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sc3l3t0n wants to merge 1 commit into
base: main
Choose a base branch
from
Open

assistant/codecompanion-nvim: add mappings #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/release-notes/rl-0.8.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,3 +276,7 @@
[rice-cracker-dev](https://github.com/rice-cracker-dev):

- `eslint_d` now checks for configuration files to load.

[Sc3l3t0n](https://github.com/Sc3l3t0n):

- Add some mappings to [codecompanion-nvim]
12 changes: 12 additions & 0 deletions modules/plugins/assistant/codecompanion/codecompanion-nvim.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{lib, ...}: let
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.types) int str enum nullOr attrs;
inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.nvim.types) mkPluginSetupOption luaInline;
in {
options.vim.assistant = {
Expand Down Expand Up @@ -273,6 +274,17 @@ in {
'';
};
};

mappings = {
inlineAssistant.open = mkMappingOption "[CodeCompanion] Open inline Assistant" "<leader>aa";
chat = {
open = mkMappingOption "[CodeCompanion] Open chat" "<leader>ao";
toggle = mkMappingOption "[CodeCompanion] Toggle chat" "<leader>ac";
addToChatBuffer = mkMappingOption "[CodeCompanion] Add selection to chat" "<leader>ab";
};
actions.open = mkMappingOption "[CodeCompanion] Open actions" "<C-a>";
command.open = mkMappingOption "[CodeCompanion] Open cli command generation prompt" "<leader>ag";
};
};
};
}
22 changes: 21 additions & 1 deletion modules/plugins/assistant/codecompanion/config.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,21 @@
lib,
...

@horriblename horriblename Apr 4, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
...
options,
...

then you can access the mappings option as options.vim.assistant.codecompanion-nvim.mappings

see run-nvim for a full example

}: let
inherit (lib.modules) mkIf;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding mkSetLuaBinding;

self = import ./codecompanion-nvim.nix {inherit lib;};

@horriblename horriblename Apr 4, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't do this, this is leftover code that we haven't refactored yet. you can get the options definition from the "top-level" function args (see above)

cfg = config.vim.assistant.codecompanion-nvim;

mappingDefinitions = self.options.vim.assistant.codecompanion-nvim.mappings;
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
maps = mkMerge [
(mkSetBinding mappings.inlineAssistant.open "<cmd>CodeCompanion<CR>")
(mkSetBinding mappings.chat.open "<cmd>CodeCompanionChat<CR>")
(mkSetBinding mappings.chat.toggle "<cmd>CodeCompanionChat Toggle<CR>")
(mkSetBinding mappings.actions.open "<cmd>CodeCompanionActions<CR>")
(mkSetLuaBinding mappings.command.open "function() vim.fn.feedkeys(\":CodeCompanionCmd \") end")
];
in {
config = mkIf cfg.enable {
vim = {
Expand All @@ -21,6 +33,14 @@ in {
};
};

maps = {
visual = mkMerge [
(mkSetBinding mappings.chat.addToChatBuffer "<cmd>CodeCompanionChat Add<CR>")
maps
];
normal = maps;
};

treesitter.enable = true;
};
};
Expand Down