From 026f2be3791231db3b70150e180c7d0078f0f77c Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 30 Oct 2024 12:16:21 +0000 Subject: [PATCH 1/5] Bootstrap packer --- config/packages/neovim/init.lua | 41 ++++++++++++++++++++++++-- config/packages/neovim/lua/plugins.lua | 25 ---------------- 2 files changed, 39 insertions(+), 27 deletions(-) delete mode 100644 config/packages/neovim/lua/plugins.lua diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua index 06cbfd7..bf89820 100644 --- a/config/packages/neovim/init.lua +++ b/config/packages/neovim/init.lua @@ -1,5 +1,3 @@ -lua require("plugins") - -- Leader key vim.g.mapleader = " " @@ -205,3 +203,42 @@ vim.api.nvim_set_keymap('v', 'pf', ':CopilotChatFix', { noremap = tr vim.api.nvim_set_keymap('v', 'po', ':CopilotChatOptimize', { noremap = true, silent = true }) vim.api.nvim_set_keymap('v', 'pd', ':CopilotChatDocs', { noremap = true, silent = true }) vim.api.nvim_set_keymap('v', 'pt', ':CopilotChatTests', { noremap = true, silent = true }) + +local ensure_packer = function() + local fn = vim.fn + local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' + if fn.empty(fn.glob(install_path)) > 0 then + fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) + vim.cmd [[packadd packer.nvim]] + return true + end + return false +end + +local packer_bootstrap = ensure_packer() + +vim.cmd [[packadd packer.nvim]] + +return require('packer').startup(function(use) + -- Packer can manage itself + use 'wbthomason/packer.nvim' + + -- Plugins + use 'dracula/vim' + use 'ryanoasis/vim-devicons' + -- use 'SirVer/ultisnips' + use 'honza/vim-snippets' + use 'scrooloose/nerdtree' + use 'preservim/nerdcommenter' + use 'mhinz/vim-startify' + use {'neoclide/coc.nvim', branch = 'release'} + use 'nvim-lua/plenary.nvim' + use 'ThePrimeagen/harpoon' + use {'junegunn/fzf', run = function() vim.fn['fzf#install']() end} + use 'junegunn/fzf.vim' + use 'neovim/nvim-lspconfig' + use 'jose-elias-alvarez/null-ls.nvim' + use 'MunifTanjim/prettier.nvim' + use 'github/copilot.vim' + use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'} +end) diff --git a/config/packages/neovim/lua/plugins.lua b/config/packages/neovim/lua/plugins.lua deleted file mode 100644 index 6660012..0000000 --- a/config/packages/neovim/lua/plugins.lua +++ /dev/null @@ -1,25 +0,0 @@ -vim.cmd [[packadd packer.nvim]] - -return require('packer').startup(function(use) - -- Packer can manage itself - use 'wbthomason/packer.nvim' - - -- Plugins - use 'dracula/vim' - use 'ryanoasis/vim-devicons' - -- use 'SirVer/ultisnips' - use 'honza/vim-snippets' - use 'scrooloose/nerdtree' - use 'preservim/nerdcommenter' - use 'mhinz/vim-startify' - use {'neoclide/coc.nvim', branch = 'release'} - use 'nvim-lua/plenary.nvim' - use 'ThePrimeagen/harpoon' - use {'junegunn/fzf', run = function() vim.fn['fzf#install']() end} - use 'junegunn/fzf.vim' - use 'neovim/nvim-lspconfig' - use 'jose-elias-alvarez/null-ls.nvim' - use 'MunifTanjim/prettier.nvim' - use 'github/copilot.vim' - use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'} -end) From 9f8fce9599ca5fc0a6abc614c3d75729f1e7cf0e Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 30 Oct 2024 12:16:49 +0000 Subject: [PATCH 2/5] Remove plugins.lua --- config/packages/neovim/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/config/packages/neovim/default.nix b/config/packages/neovim/default.nix index 4eb8d90..dc0b484 100644 --- a/config/packages/neovim/default.nix +++ b/config/packages/neovim/default.nix @@ -1,5 +1,4 @@ { home.file."/home/vylpes/.config/nvim/init.lua".source = ./init.lua; home.file."/home/vylpes/.config/nvim/coc-settings.json".source = ./coc-settings.json; - home.file."/home/vylpes/.config/nvim/lua/plugins.lua".source = ./lua/plugins.lua; } From 50541208e65b08a1d7656fd08dab5ab5bbadd6e7 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 30 Oct 2024 12:17:54 +0000 Subject: [PATCH 3/5] Move copilot chat --- config/packages/neovim/init.lua | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua index bf89820..3efa67b 100644 --- a/config/packages/neovim/init.lua +++ b/config/packages/neovim/init.lua @@ -50,27 +50,6 @@ vim.opt.ttyfast = true -- Do not add a newline at the end of the file vim.opt.fixeol = false --- Copilot Chat -local prompts = require('CopilotChat.prompts') -local select = require('CopilotChat.select') - -require("CopilotChat").setup { - debug = false, - - question_header = '## User ', - answer_header = '## Copilot ', - error_header = '## Error ', - separator = '---', - - selection = function(source) - return select.visual(source) or select.line(source) - end, - - window = { - layout = 'float', - }, -} - if vim.fn.has("termguicolors") == 1 then vim.opt.termguicolors = true end @@ -242,3 +221,24 @@ return require('packer').startup(function(use) use 'github/copilot.vim' use {'CopilotC-Nvim/CopilotChat.nvim', branch = 'canary'} end) + +-- Copilot Chat +local prompts = require('CopilotChat.prompts') +local select = require('CopilotChat.select') + +require("CopilotChat").setup { + debug = false, + + question_header = '## User ', + answer_header = '## Copilot ', + error_header = '## Error ', + separator = '---', + + selection = function(source) + return select.visual(source) or select.line(source) + end, + + window = { + layout = 'float', + }, +} From bb44f0de331fb281f77ccb4de3848f4372d36671 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 30 Oct 2024 12:18:43 +0000 Subject: [PATCH 4/5] Remove return --- config/packages/neovim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua index 3efa67b..b589ae8 100644 --- a/config/packages/neovim/init.lua +++ b/config/packages/neovim/init.lua @@ -198,7 +198,7 @@ local packer_bootstrap = ensure_packer() vim.cmd [[packadd packer.nvim]] -return require('packer').startup(function(use) +require('packer').startup(function(use) -- Packer can manage itself use 'wbthomason/packer.nvim' From da5cdc5220107de11bf68cd838446830a6f90afb Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 30 Oct 2024 12:19:56 +0000 Subject: [PATCH 5/5] Termgui colours --- config/packages/neovim/init.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/packages/neovim/init.lua b/config/packages/neovim/init.lua index b589ae8..cfbb39d 100644 --- a/config/packages/neovim/init.lua +++ b/config/packages/neovim/init.lua @@ -50,10 +50,6 @@ vim.opt.ttyfast = true -- Do not add a newline at the end of the file vim.opt.fixeol = false -if vim.fn.has("termguicolors") == 1 then - vim.opt.termguicolors = true -end - -- Enable syntax highlighting vim.cmd("syntax enable") @@ -242,3 +238,8 @@ require("CopilotChat").setup { layout = 'float', }, } + +if vim.fn.has("termguicolors") == 1 then + vim.opt.termguicolors = true +end +