From cbbee45c48e4c50b8a904679a15fa479dac56b9c Mon Sep 17 00:00:00 2001 From: Zacharias-Brohn Date: Tue, 14 Jan 2025 22:15:15 +0100 Subject: [PATCH] copilot fix --- init.lua | 2 +- lazy-lock.json | 22 +++++++++++----------- lua/configs/copilot.lua | 40 ++++++++++++++++++++-------------------- lua/mappings.lua | 36 ++++++------------------------------ lua/plugins/init.lua | 1 + 5 files changed, 39 insertions(+), 62 deletions(-) diff --git a/init.lua b/init.lua index 2ab4cc9..28fe6ce 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,6 @@ vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46/" vim.g.mapleader = " " -vim.cmd("source test.vim") +vim.cmd("source ~/.config/nvim/test.vim") -- bootstrap lazy and all plugins local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" diff --git a/lazy-lock.json b/lazy-lock.json index 5efcac9..cac5630 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,9 +1,9 @@ { "CopilotChat.nvim": { "branch": "main", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" }, "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, - "NvChad": { "branch": "v2.5", "commit": "bbc3d43db088c141b142a40cd5f717635833a54e" }, + "NvChad": { "branch": "v2.5", "commit": "6f25b2739684389ca69ea8229386c098c566c408" }, "auto-session": { "branch": "main", "commit": "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c" }, - "base46": { "branch": "v2.5", "commit": "5009bc479de4f53ec98e9dd1692beb1f39ff3a82" }, + "base46": { "branch": "v2.5", "commit": "20bd6a59fbd2a0f70bc4f56902952ab7a4254604" }, "bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, @@ -17,26 +17,26 @@ "fidget.nvim": { "branch": "main", "commit": "a0abbf18084b77d28bc70e24752e4f4fd54aea17" }, "focus.nvim": { "branch": "master", "commit": "d76338e58e49f844e8f6a7aff16a74a2a55a80ef" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "abcd00a7d5bc1a9470cb21b023c575acade3e4db" }, - "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, + "gitsigns.nvim": { "branch": "main", "commit": "76d88f3b584e1f83b2aa51663a32cc6ee8d97eff" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7a698a1d7ed755af9f5a88733b23ca246ce2df28" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "menu": { "branch": "main", "commit": "bea08e6f8772cb4d362795b0c7ae6343d0b229df" }, "minty": { "branch": "main", "commit": "6dce9f097667862537823d515a0250ce58faab05" }, - "nvim-autopairs": { "branch": "master", "commit": "d2f791ceeb26d04d87aa54343bc94e8ad8d7be1c" }, + "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, - "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" }, - "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" }, - "nvim-treesitter": { "branch": "master", "commit": "e1e2ad1448f67a2ffc4bf8f6a315cf08a179d71e" }, + "nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" }, + "nvim-tree.lua": { "branch": "master", "commit": "d529a99f88e0dff02e0aa275db2f595cd252a2c8" }, + "nvim-treesitter": { "branch": "master", "commit": "984214ef8e4ca18d77639663319aabdfba89632f" }, "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, "ui": { "branch": "v3.0", "commit": "474199ac96e898be73905c2009d74690a0a6738e" }, "undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" }, "vim-suda": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, - "volt": { "branch": "main", "commit": "b7582c8e2ab3a411a72ab058251ba22d24e70f4a" }, + "volt": { "branch": "main", "commit": "f02b065caf0327bf4d443ff6d91cb0edd6948ddb" }, "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } } diff --git a/lua/configs/copilot.lua b/lua/configs/copilot.lua index ed487ee..ee713a5 100644 --- a/lua/configs/copilot.lua +++ b/lua/configs/copilot.lua @@ -20,7 +20,7 @@ hide_during_completion = true, debounce = 75, keymap = { - accept = "", + accept = "", accept_word = false, accept_line = false, next = "", @@ -29,25 +29,25 @@ }, }, filetypes = { - yaml = false, - markdown = false, - help = false, - gitcommit = false, - gitrebase = false, - hgcommit = false, - svn = false, - cvs = false, - python = false, - html = false, - css = false, - sh = false, - tex = false, - typescript = false, - java = false, - swift = false, - cpp = false, - hypr = false, - ["."] = false, + -- yaml = false, + -- markdown = false, + -- help = false, + -- gitcommit = false, + -- gitrebase = false, + -- hgcommit = false, + -- svn = false, + -- cvs = false, + -- python = false, + -- html = false, + -- css = false, + -- sh = false, + -- tex = false, + -- typescript = false, + -- java = false, + -- swift = false, + -- cpp = false, + -- hypr = false, + -- ["."] = false, }, copilot_node_command = 'node', -- Node.js version must be > 18.x server_opts_overrides = {}, diff --git a/lua/mappings.lua b/lua/mappings.lua index a809c7e..63bdda8 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -1,29 +1,3 @@ --- local function resize_left() --- local cur_win = vim.api.nvim_get_current_win() --- vim.cmd('wincmd h') --- local new_win = vim.api.nvim_get_current_win() --- if cur_win == new_win then --- vim.cmd('vertical resize -10') --- elseif vim.bo[new_win].filetype == 'NvimTree' then --- --- else --- vim.cmd('vertical resize -10') --- vim.cmd('wincmd l') --- end --- end --- --- local function resize_right() --- local cur_win = vim.api.nvim_get_current_win() --- vim.cmd('wincmd l') --- local new_win = vim.api.nvim_get_current_win() --- if cur_win == new_win then --- vim.cmd('vertical resize -10') --- else --- vim.cmd('vertical resize -10') --- vim.cmd('wincmd h') --- end --- end - require "nvchad.mappings" -- add yours here @@ -31,7 +5,6 @@ require "nvchad.mappings" local map = vim.keymap.set map("n", ";", ":", { desc = "CMD enter command mode" }) -map("i", "jk", "") -- Alt + Arrow Key to change buffer map("n", "", "h", { desc = "Move to left split" }) @@ -39,10 +12,13 @@ map("n", "", "j", { desc = "Move to bottom split" }) map("n", "", "k", { desc = "Move to top split" }) map("n", "", "l", { desc = "Move to right split" }) +-- Copilot suggestion +-- map("i", "jk", vim.cmd("Copilot suggestion accept_word"), { expr = true }) + -- Copilot Chat buffer -map("n", "", vim.cmd.CopilotChatToggle) -map("i", "", vim.cmd.CopilotChatToggle) -map("v", "", vim.cmd.CopilotChatToggle) +map("n", "", vim.cmd.CopilotChatToggle) +map("i", "", vim.cmd.CopilotChatToggle) +map("v", "", vim.cmd.CopilotChatToggle) map('n', 'u', vim.cmd.UndotreeToggle) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 5ae44a3..69ce841 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -59,6 +59,7 @@ return { { "zbirenbaum/copilot.lua", + lazy = true, cmd = "Copilot", event = "InsertEnter", config = function()