From 70436441f84dffaf2946d4b8d5738cf8385255a4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 20 Dec 2022 10:37:09 +0000
Subject: [PATCH] Swap nightfox for improved onedark colourscheme

---
 lua/config_plugins/config_lualine.lua  |  2 +-
 lua/config_plugins/config_nightfox.lua | 17 -----------------
 lua/config_plugins/config_onedark.lua  |  5 +++++
 lua/plugins.lua                        | 20 +++++++-------------
 tmux.conf                              |  4 ++++
 5 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 lua/config_plugins/config_nightfox.lua
 create mode 100644 lua/config_plugins/config_onedark.lua

diff --git a/lua/config_plugins/config_lualine.lua b/lua/config_plugins/config_lualine.lua
index 264d5784..67e0d9f0 100644
--- a/lua/config_plugins/config_lualine.lua
+++ b/lua/config_plugins/config_lualine.lua
@@ -1,7 +1,7 @@
 require('lualine').setup {
     options = {
         icons_enabled = true,
-        theme = 'auto',
+        theme = 'onedark',
     },
     sections = {
         -- lualine_x = {'encoding', 'fileformat', 'filetype'},
diff --git a/lua/config_plugins/config_nightfox.lua b/lua/config_plugins/config_nightfox.lua
deleted file mode 100644
index 206cee23..00000000
--- a/lua/config_plugins/config_nightfox.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-vim.opt.termguicolors = true
-require('nightfox').setup {
-    modules = {
-        aerial = true,
-        cmp = true,
-        diagnostic = true,
-        fidget = true,
-        gitgutter = true,
-        hop = true,
-        lsp_trouble = true,
-        notify = true,
-        nvimtree = true,
-        telescope = true,
-        treesitter = true,
-    },
-}
-vim.cmd("colorscheme nightfox")
diff --git a/lua/config_plugins/config_onedark.lua b/lua/config_plugins/config_onedark.lua
new file mode 100644
index 00000000..9201ab9a
--- /dev/null
+++ b/lua/config_plugins/config_onedark.lua
@@ -0,0 +1,5 @@
+require("onedark").setup {
+    transparent = true,
+    customTelescope = true,
+}
+vim.cmd("colorscheme onedark")
diff --git a/lua/plugins.lua b/lua/plugins.lua
index c34f6d78..0816c199 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -5,15 +5,16 @@ vim.cmd([[
   augroup end
 ]])
 
-if vim.version().minor <= 7 then
-    NIGHTFOXVERSION = '15f3b5837a8d07f45cbe16753fbf13630bc167a3'
-else
-    NIGHTFOXVERSION = '*'
-end
-
 require('packer').startup {
     function(use)
         use 'wbthomason/packer.nvim'
+        use {
+            'monsonjeremy/onedark.nvim',
+            branch = 'treesitter',
+            config = function()
+                require 'config_plugins.config_onedark'
+            end
+        }
         use {
             'rcarriga/nvim-notify',
             config = function()
@@ -39,13 +40,6 @@ require('packer').startup {
             'hrsh7th/cmp-vsnip',
             'hrsh7th/vim-vsnip',
         }
-        use {
-            'EdenEast/nightfox.nvim',
-            tag = NIGHTFOXVERSION,
-            config = function()
-                require 'config_plugins.config_nightfox'
-            end
-        }
         use {
             'nvim-treesitter/nvim-treesitter',
             run = ':TSUpdate',
diff --git a/tmux.conf b/tmux.conf
index a5ecc66d..e7fb646f 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -6,6 +6,10 @@ bind r source-file ~/.tmux.conf\; display "Reloaded conf."
 set -g default-terminal "screen-256color"
 set -ga terminal-overrides ",*256col*,*kitty,alacritty:Tc"
 # set-option -sa terminal-overrides ',*256col*,alacritty:RGB'  # TMUX > 3.2 only
+# Undercurl
+# set -g default-terminal "${TERM}"
+# set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'  # undercurl support
+# set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'  # underscore colours - needs tmux-3.0
 
 # Set escape time to something sensible
 set-option -sg escape-time 10