Skip to content

Commit

Permalink
Update(Lsp) lsp and cmp plugins bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Gako358 committed Jan 27, 2025
1 parent 41a1b87 commit f842606
Show file tree
Hide file tree
Showing 4 changed files with 151 additions and 157 deletions.
66 changes: 33 additions & 33 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

122 changes: 60 additions & 62 deletions modules/completion.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
lib,
config,
...
{ lib
, config
, ...
}:
with lib;
with builtins; let
Expand All @@ -10,22 +9,23 @@ with builtins; let

builtSources =
concatMapStringsSep
"\n"
(n: "{ name = '${n}'},")
(attrNames cfg.cmp.sources);
"\n"
(n: "{ name = '${n}'},")
(attrNames cfg.cmp.sources);

builtMaps =
concatStringsSep
"\n"
(mapAttrsToList
(n: v:
if v == null
then ""
else "${n} = '${v}',")
cfg.cmp.sources);
"\n"
(mapAttrsToList
(n: v:
if v == null
then ""
else "${n} = '${v}',")
cfg.cmp.sources);

dagPlacement = nvim.dag.entryAnywhere;
in {
in
{
options.vim = {
autocomplete = {
enable = mkOption {
Expand All @@ -36,7 +36,7 @@ in {
cmp = {
enable = mkEnableOption "enable nvim-cmp";
type = mkOption {
type = types.enum ["nvim-cmp"];
type = types.enum [ "nvim-cmp" ];
default = "nvim-cmp";
description = "Set the autocomplete plugin. Options: [nvim-cmp]";
};
Expand All @@ -52,7 +52,7 @@ in {
Note: only use a single attribute name per attribute set
'';
type = with types; attrsOf (nullOr str);
default = {};
default = { };
example = ''
{nvim-cmp = null; buffer = "[Buffer]";}
'';
Expand Down Expand Up @@ -208,58 +208,56 @@ in {
];
vim.luaConfigRC.copilot =
nvim.dag.entryAnywhere
/*
/*
lua
*/
''
require("copilot").setup({
panel = { enabled = true },
suggestion = {
enabled = true,
auto_trigger = false,
keymap = {
accept = "<C-y>",
next = "<C-j>",
*/
''
require("copilot").setup({
panel = { enabled = true },
suggestion = {
enabled = true,
auto_trigger = false,
keymap = {
accept = "<C-y>",
next = "<C-j>",
},
},
},
})
})
require("CopilotChat").setup({
model = "claude-3.5-sonnet",
context = "files:full",
window = {
layout = "float",
width = 0.8,
height = 0.7,
title = "Copilot Chat",
},
})
require("CopilotChat").setup({
model = "claude-3.5-sonnet",
context = "files:full",
window = {
layout = "vertical",
title = "Copilot Chat",
},
})
vim.keymap.set({ 'n', 'v' }, '<leader>cc', '<cmd>CopilotChatToggle<cr>', { desc = "CopilotChat - Toggle" })
vim.keymap.set({ 'n', 'v' }, '<leader>cce', '<cmd>CopilotChatExplain<cr>', { desc = "CopilotChat - Explain code" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccg', '<cmd>CopilotChatCommit<cr>', { desc = "CopilotChat - Write commit message for the change" })
vim.keymap.set({ 'n', 'v' }, '<leader>cct', '<cmd>CopilotChatTests<cr>', { desc = "CopilotChat - Generate tests" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccf', '<cmd>CopilotChatFixDiagnostic<cr>', { desc = "CopilotChat - Fix diagnostic" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccr', '<cmd>CopilotChatReset<cr>', { desc = "CopilotChat - Reset chat history and clear buffer" })
vim.keymap.set({ 'n', 'v' }, '<leader>cco', '<cmd>CopilotChatOptimize<cr>', { desc = "CopilotChat - Optimize selected code" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccd', '<cmd>CopilotChatDocs<cr>', { desc = "CopilotChat - Add docs on selected code" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccp', '<cmd>CopilotChatReview<cr>', { desc = "CopilotChat - Review selected code" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccs', '<cmd>CopilotChatStop<cr>', { desc = "CopilotChat - Stop current window output" })
vim.keymap.set('n', '<leader>ccp', function()
local actions = require("CopilotChat.actions")
require("CopilotChat.integrations.telescope").pick(actions.prompt_actions())
end, { desc = 'CopilotChat - Prompt actions' })
vim.keymap.set("n", "<leader>ccq", function()
local input = vim.fn.input("Quick Chat: ")
if input ~= "" then
require("CopilotChat").ask(input, { selection = require("CopilotChat.select").buffer })
end
end, { desc = 'CopilotChat - Quick chat' })
'';
vim.keymap.set({ 'n', 'v' }, '<leader>cc', '<cmd>CopilotChatToggle<cr>', { desc = "CopilotChat - Toggle" })
vim.keymap.set({ 'n', 'v' }, '<leader>cce', '<cmd>CopilotChatExplain<cr>', { desc = "CopilotChat - Explain code" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccg', '<cmd>CopilotChatCommit<cr>', { desc = "CopilotChat - Write commit message for the change" })
vim.keymap.set({ 'n', 'v' }, '<leader>cct', '<cmd>CopilotChatTests<cr>', { desc = "CopilotChat - Generate tests" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccf', '<cmd>CopilotChatFix<cr>', { desc = "CopilotChat - Fix diagnostic" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccr', '<cmd>CopilotChatReset<cr>', { desc = "CopilotChat - Reset chat history and clear buffer" })
vim.keymap.set({ 'n', 'v' }, '<leader>cco', '<cmd>CopilotChatOptimize<cr>', { desc = "CopilotChat - Optimize selected code" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccd', '<cmd>CopilotChatDocs<cr>', { desc = "CopilotChat - Add docs on selected code" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccp', '<cmd>CopilotChatReview<cr>', { desc = "CopilotChat - Review selected code" })
vim.keymap.set({ 'n', 'v' }, '<leader>ccs', '<cmd>CopilotChatStop<cr>', { desc = "CopilotChat - Stop current window output" })
vim.keymap.set('n', '<leader>ccp', function()
local actions = require("CopilotChat.actions")
require("CopilotChat.integrations.telescope").pick(actions.prompt_actions())
end, { desc = 'CopilotChat - Prompt actions' })
vim.keymap.set("n", "<leader>ccq", function()
local input = vim.fn.input("Quick Chat: ")
if input ~= "" then
require("CopilotChat").ask(input, { selection = require("CopilotChat.select").buffer })
end
end, { desc = 'CopilotChat - Quick chat' })
'';
})
(mkIf cfg.snippets.enable {
vim.startPlugins = ["vim-vsnip"];
vim.startPlugins = [ "vim-vsnip" ];
})
]);
}
Loading

0 comments on commit f842606

Please sign in to comment.