From b57eaa435a1047b372cf0114f5a3d13e976feb9c Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 3 Mar 2024 13:15:47 +0100 Subject: [PATCH] Add .config/nvim/.luarc.json Update .config/nvim/lazyvim.json Update .config/nvim/lua/config/lazy.lua Update .config/nvim/lua/plugins/copilot.lua Update .config/nvim/lua/plugins/go.lua Update .config/nvim/lua/plugins/nvim-cmp.lua Add .config/nvim/lua/plugins/sourcegraph-copilot.lua --- dot_config/nvim/dot_luarc.json | 77 +++++++++++++++++++ dot_config/nvim/lazyvim.json | 3 +- dot_config/nvim/lua/config/lazy.lua | 3 +- dot_config/nvim/lua/plugins/copilot.lua | 6 +- dot_config/nvim/lua/plugins/go.lua | 9 +-- dot_config/nvim/lua/plugins/nvim-cmp.lua | 7 +- .../nvim/lua/plugins/sourcegraph-copilot.lua | 13 ++++ 7 files changed, 104 insertions(+), 14 deletions(-) create mode 100644 dot_config/nvim/dot_luarc.json create mode 100644 dot_config/nvim/lua/plugins/sourcegraph-copilot.lua diff --git a/dot_config/nvim/dot_luarc.json b/dot_config/nvim/dot_luarc.json new file mode 100644 index 0000000..3462799 --- /dev/null +++ b/dot_config/nvim/dot_luarc.json @@ -0,0 +1,77 @@ +{ + "workspace.library": [ + "/Users/kah/.local/share/nvim/lazy/neodev.nvim/types/stable", + "/opt/homebrew/Cellar/neovim/0.9.5/share/nvim/runtime/lua", + "/Users/kah/.local/share/nvim/lazy/neo-tree.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/indent-blankline.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/cmp_luasnip/lua", + "/Users/kah/.local/share/nvim/lazy/neoconf.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/ranger.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/mini.pairs/lua", + "/Users/kah/.local/share/nvim/lazy/mini.surround/lua", + "/Users/kah/.local/share/nvim/lazy/telescope-fzf-native.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/conform.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/nui.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-ts-context-commentstring/lua", + "/Users/kah/.local/share/nvim/lazy/mini.comment/lua", + "/Users/kah/.local/share/nvim/lazy/gitsigns.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/mini.ai/lua", + "/Users/kah/.local/share/nvim/lazy/mason.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/vim-illuminate/lua", + "/Users/kah/.local/share/nvim/lazy/crates.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/mini.hipatterns/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-ts-autotag/lua", + "/Users/kah/.local/share/nvim/lazy/dashboard-nvim/lua", + "/Users/kah/.local/share/nvim/lazy/trouble.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/todo-comments.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/lazy.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/project.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/noice.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/which-key.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/sg.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-treesitter-textobjects/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-lspconfig/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-treesitter-context/lua", + "/Users/kah/.local/share/nvim/lazy/telescope.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/catppuccin/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-dap/lua", + "/Users/kah/.local/share/nvim/lazy/tokyonight.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/LazyVim/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-dap-ui/lua", + "/Users/kah/.local/share/nvim/lazy/vim-startuptime/lua", + "/Users/kah/.local/share/nvim/lazy/tmux.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-dap-virtual-text/lua", + "/Users/kah/.local/share/nvim/lazy/zen-mode.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/toggleterm.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/rust-tools.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/plenary.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/neorg/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-spectre/lua", + "/Users/kah/.local/share/nvim/lazy/cmp-nvim-lsp/lua", + "/Users/kah/.local/share/nvim/lazy/mason-nvim-dap.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-lint/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-cmp/lua", + "/Users/kah/.local/share/nvim/lazy/persistence.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-notify/lua", + "/Users/kah/.local/share/nvim/lazy/cmp-buffer/lua", + "/Users/kah/.local/share/nvim/lazy/mason-lspconfig.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/flash.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/mini.indentscope/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-treesitter/lua", + "/Users/kah/.local/share/nvim/lazy/mini.bufremove/lua", + "/Users/kah/.local/share/nvim/lazy/cmp-path/lua", + "/Users/kah/.local/share/nvim/lazy/dressing.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/neodev.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/bufferline.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/nvim-web-devicons/lua", + "/Users/kah/.local/share/nvim/lazy/copilot-cmp/lua", + "/Users/kah/.local/share/nvim/lazy/go.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/lualine.nvim/lua", + "/Users/kah/.local/share/nvim/lazy/LuaSnip/lua", + "/Users/kah/.local/share/nvim/lazy/guihua.lua/lua", + "/Users/kah/.config/nvim/lua", + "/Users/kah/.local/share/nvim/lazy/neoconf.nvim/types", + "/Users/kah/.local/share/nvim/lazy/neoconf.nvim/types/lua", + "${3rd}/luv/library" + ] +} \ No newline at end of file diff --git a/dot_config/nvim/lazyvim.json b/dot_config/nvim/lazyvim.json index ff6a139..5a7b76f 100644 --- a/dot_config/nvim/lazyvim.json +++ b/dot_config/nvim/lazyvim.json @@ -1,9 +1,8 @@ { "extras": [ - ], "news": { "NEWS.md": "2123" }, "version": 2 -} \ No newline at end of file +} diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua index 3105002..09b3399 100644 --- a/dot_config/nvim/lua/config/lazy.lua +++ b/dot_config/nvim/lua/config/lazy.lua @@ -10,14 +10,13 @@ vim.opt.rtp:prepend(vim.env.LAZY or lazypath) require("lazy").setup({ spec = { -- add LazyVim and import its plugins - { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, --{ import = "lazyvim.plugins.extras.editor.flash" }, --{ import = "lazyvim.plugins.extras.ui.mini-animate" }, { import = "lazyvim.plugins.extras.util.mini-hipatterns" }, { import = "lazyvim.plugins.extras.util.project" }, { import = "lazyvim.plugins.extras.dap.core" }, - -- import any extras modules here -- { import = "lazyvim.plugins.extras.lang.typescript" }, -- { import = "lazyvim.plugins.extras.lang.json" }, diff --git a/dot_config/nvim/lua/plugins/copilot.lua b/dot_config/nvim/lua/plugins/copilot.lua index fc9c4ca..df60110 100644 --- a/dot_config/nvim/lua/plugins/copilot.lua +++ b/dot_config/nvim/lua/plugins/copilot.lua @@ -1,12 +1,12 @@ return { "zbirenbaum/copilot.lua", - enabled = false, + enabled = true, cmd = "Copilot", event = "InsertEnter", config = function() require("copilot").setup({ - suggestion = { enabled = false }, - panel = { enabled = false }, + suggestion = { enabled = true }, + panel = { enabled = true, auto_refresh = true }, --suggestion = { -- auto_trigger = true, diff --git a/dot_config/nvim/lua/plugins/go.lua b/dot_config/nvim/lua/plugins/go.lua index dff90f6..5189f2d 100644 --- a/dot_config/nvim/lua/plugins/go.lua +++ b/dot_config/nvim/lua/plugins/go.lua @@ -1,6 +1,6 @@ return { "ray-x/go.nvim", - dependencies = { -- optional packages + dependencies = { -- optional packages "ray-x/guihua.lua", "neovim/nvim-lspconfig", "nvim-treesitter/nvim-treesitter", @@ -8,8 +8,7 @@ return { config = function() require("go").setup() end, - event = {"CmdlineEnter"}, - ft = {"go", 'gomod'}, - build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries - + event = { "CmdlineEnter" }, + ft = { "go", "gomod" }, + build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries } diff --git a/dot_config/nvim/lua/plugins/nvim-cmp.lua b/dot_config/nvim/lua/plugins/nvim-cmp.lua index 0cd7947..822049a 100644 --- a/dot_config/nvim/lua/plugins/nvim-cmp.lua +++ b/dot_config/nvim/lua/plugins/nvim-cmp.lua @@ -2,8 +2,11 @@ return { "hrsh7th/nvim-cmp", opts = function(_, opts) local cmp = require("cmp") - opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "copilot", group_index = 2 } })) + opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { + { name = "copilot", group_index = 2 }, + { name = "cody", group_index = 2 }, + })) return opts - end + end, } diff --git a/dot_config/nvim/lua/plugins/sourcegraph-copilot.lua b/dot_config/nvim/lua/plugins/sourcegraph-copilot.lua new file mode 100644 index 0000000..fb798fa --- /dev/null +++ b/dot_config/nvim/lua/plugins/sourcegraph-copilot.lua @@ -0,0 +1,13 @@ +return { + { + "sourcegraph/sg.nvim", + enabled = false, + dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim" }, + + -- If you have a recent version of lazy.nvim, you don't need to add this! + -- build = "nvim -l build/init.lua", + config = function() + require("sg").setup({}) + end, + }, +}