From 119395bf3d990db84ebba2a960fd5a08e4f81275 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <edward.litherland-smith@ukaea.uk>
Date: Fri, 28 Oct 2022 09:28:49 +0100
Subject: [PATCH] Add some new plugins

---
 init.lua | 42 +++++++++++++++++++++++++++++++++++++-----
 init.vim | 17 ++++++++++++-----
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/init.lua b/init.lua
index fae365d1..45043c01 100644
--- a/init.lua
+++ b/init.lua
@@ -1,3 +1,10 @@
+vim.o.showtabline = 2
+-- require('gitsigns').setup()
+require('tabby.tabline').use_preset('active_wins_at_tail')  -- , { nerdfont = false })
+require('trouble').setup()
+require('fidget').setup()
+require('hop').setup()
+
 -- lualine config
 require('lualine').setup{
         options = {
@@ -8,17 +15,30 @@ require('lualine').setup{
                 -- lualine_x = {'encoding', 'fileformat', 'filetype'},
                 lualine_x = {'aerial', 'filetype'}
         },
-        extensions = {'aerial', 'fugitive', 'fzf', 'nerdtree', 'toggleterm'}
+        extensions = {'aerial', 'fugitive', 'fzf', 'nvim-tree', 'toggleterm'}
 }
 
--- nvim-tree setup
+-- nightfox setup
+require('nightfox').setup{
+        modules = {
+                aerial = true,
+                cmp = true,
+                diagnostic = true,
+                fidget = true,
+                gitgutter = true,
+                hop = true,
+                lsp_trouble = true,
+                nvimtree = true,
+                telescope = true,
+                treesitter = true,
+        },
+}
+
+-- nvim-tree config
 require('nvim-tree').setup{
         filters = { custom = { "^.git$" } }
 }
 
--- hop setup
-require('hop').setup()
-
 -- toggleterm config
 require('toggleterm').setup{
         open_mapping = [[\t]],
@@ -56,6 +76,18 @@ vim.api.nvim_set_keymap("n", "<leader>r", "<cmd>lua _ranger_toggle()<CR>", {nore
 require('telescope').load_extension('aerial')
 require('telescope').load_extension('notify')
 
+local actions = require('telescope.actions')
+local trouble = require('trouble.providers.telescope')
+
+require('telescope').setup{
+        defaults = {
+                mappings = {
+                        i = { ["<c-t>"] = trouble.open_with_trouble },
+                        n = { ["<c-t>"] = trouble.open_with_trouble },
+                },
+        },
+}
+
 -- Set nvim-notify as default for notifications
 vim.notify = require("notify")
 
diff --git a/init.vim b/init.vim
index 66d5dd7e..8cfd3186 100644
--- a/init.vim
+++ b/init.vim
@@ -16,14 +16,19 @@ call plug#begin()
 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 'airblade/vim-gitgutter'
+" Plug 'lewis6991/gitsigns.vim'
 Plug 'nvim-lualine/lualine.nvim'
+Plug 'nanozuki/tabby.nvim'
+" Plug 'feline-nvim/feline.vim'
 Plug 'kyazdani42/nvim-web-devicons'
 Plug 'kyazdani42/nvim-tree.lua'
 Plug 'christoomey/vim-tmux-navigator'
@@ -32,6 +37,7 @@ 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'
@@ -40,6 +46,7 @@ Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'cmake -S. -Bbuild -DCM
 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()
@@ -53,6 +60,11 @@ set updatetime=500
 set mouse=nv
 let g:python3_host_prog = '~/.pyenv/versions/neovim3/bin/python'
 
+if exists('+termguicolors')
+  set termguicolors
+endif
+colorscheme nightfox
+
 luafile ~/.vim/init.lua
 luafile ~/.vim/lsp_config.lua
 
@@ -60,11 +72,6 @@ if executable('ag')
   let g:ackprg = 'ag --vimgrep'
 endif
 
-if exists('+termguicolors')
-  set termguicolors
-endif
-colorscheme onehalfdark
-
 set cursorline
 
 set number