From 5fdfbf5df53f78b5f9e54df9cdeaae380a01d3c3 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 1 Nov 2022 15:52:02 +0000
Subject: [PATCH] Move plugins from Plug to Packer

---
 init.lua        | 40 +++-------------------------------------
 lua/plugins.lua | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/init.lua b/init.lua
index d468da92..00ad4c37 100644
--- a/init.lua
+++ b/init.lua
@@ -10,40 +10,6 @@ call plug#begin()
 
 " Make sure you use single quotes
 
-Plug 'nvim-lua/plenary.nvim'
-Plug 'neovim/nvim-lspconfig'
-Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-Plug 'j-hui/fidget.nvim'
-Plug 'sonph/onehalf', {'rtp': 'vim/'}
-Plug 'EdenEast/nightfox.nvim'
-Plug 'mileszs/ack.vim'
-Plug 'stevearc/aerial.nvim'
-Plug 'tpope/vim-unimpaired'
-Plug 'tpope/vim-fugitive'
-Plug 'tpope/vim-commentary'
-" Plug 'lewis6991/gitsigns.vim'
-Plug 'https://github.com/lewis6991/gitsigns.nvim.git'
-Plug 'nvim-lualine/lualine.nvim'
-Plug 'nanozuki/tabby.nvim'
-Plug 'kyazdani42/nvim-web-devicons'
-Plug 'kyazdani42/nvim-tree.lua'
-Plug 'christoomey/vim-tmux-navigator'
-Plug 'akinsho/toggleterm.nvim', {'tag' : 'v2.*'}
-Plug 'hrsh7th/cmp-nvim-lsp'
-Plug 'hrsh7th/cmp-buffer'
-Plug 'hrsh7th/cmp-path'
-Plug 'hrsh7th/cmp-cmdline'
-Plug 'hrsh7th/cmp-nvim-lua'
-Plug 'hrsh7th/nvim-cmp'
-Plug 'hrsh7th/cmp-vsnip'
-Plug 'hrsh7th/vim-vsnip'
-Plug 'nvim-telescope/telescope.nvim', { 'tag': '0.1.0' }
-Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' }
-Plug 'rcarriga/nvim-notify'
-Plug 'michaelb/sniprun', {'do': 'bash install.sh'}
-Plug 'phaazon/hop.nvim'
-Plug 'folke/trouble.nvim'
-
 " Initialize plugin system
 call plug#end()
 ]]
@@ -73,13 +39,10 @@ filetype plugin indent on
 
 ]]
 
-vim.notify = require("notify")
-
 vim.cmd("let &t_ut=''")  -- For kitty background colour support
 vim.opt.updatetime=500
 vim.opt.mouse="nv"
 vim.opt.termguicolors=true
-vim.cmd("colorscheme nightfox")  -- TODO
 
 vim.opt.number=true
 vim.opt.relativenumber=true
@@ -99,3 +62,6 @@ vim.opt.splitright=true
 require 'keymaps'
 require 'plugins'
 require 'config_lsp'
+
+vim.notify = require("notify")
+vim.cmd("colorscheme nightfox")  -- TODO
diff --git a/lua/plugins.lua b/lua/plugins.lua
index fb6fcce7..da967cc4 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -1,5 +1,36 @@
 require('packer').startup(function(use)
         use 'wbthomason/packer.nvim'
+        use 'nvim-lua/plenary.nvim'
+        use 'neovim/nvim-lspconfig'
+        use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
+        use 'j-hui/fidget.nvim'
+        use 'EdenEast/nightfox.nvim'
+        use 'mileszs/ack.vim'
+        use { 'stevearc/aerial.nvim', branch = 'nvim-0.5' }
+        use 'tpope/vim-unimpaired'
+        use 'tpope/vim-fugitive'
+        use 'tpope/vim-commentary'
+        use 'https://github.com/lewis6991/gitsigns.nvim.git'
+        use 'nvim-lualine/lualine.nvim'
+        use 'nanozuki/tabby.nvim'
+        use 'kyazdani42/nvim-web-devicons'
+        use 'kyazdani42/nvim-tree.lua'
+        use 'christoomey/vim-tmux-navigator'
+        use { 'akinsho/toggleterm.nvim', tag = 'v2.*' }
+        use 'hrsh7th/cmp-nvim-lsp'
+        use 'hrsh7th/cmp-buffer'
+        use 'hrsh7th/cmp-path'
+        use 'hrsh7th/cmp-cmdline'
+        use 'hrsh7th/cmp-nvim-lua'
+        use 'hrsh7th/nvim-cmp'
+        use 'hrsh7th/cmp-vsnip'
+        use 'hrsh7th/vim-vsnip'
+        use { 'nvim-telescope/telescope.nvim', tag = '0.1.0' }
+        use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' }
+        use 'rcarriga/nvim-notify'
+        use { 'michaelb/sniprun', run = 'bash install.sh' }
+        use 'phaazon/hop.nvim'
+        use 'folke/trouble.nvim'
 end)
 
 require 'config_plugins/config_gitsigns'