Switch to onedark colourscheme

2 files changed, 25 insertions, 12 deletions

diff --git a/neovim/.config/nvim/lua/config/colourscheme.lua b/neovim/.config/nvim/lua/config/colourscheme.lua
index edba16f..56ae5b6 100644
--- a/neovim/.config/nvim/lua/config/colourscheme.lua
+++ b/neovim/.config/nvim/lua/config/colourscheme.lua
@@ -1,4 +1,4 @@
-local colorscheme = "xcode"
+local colorscheme = "onedark"
 vim.o.background = "light"
 local ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
 if not ok then
diff --git a/neovim/.config/nvim/lua/plugins/galaxyline.lua b/neovim/.config/nvim/lua/plugins/galaxyline.lua
index 9da6cb3..2c15f40 100644
--- a/neovim/.config/nvim/lua/plugins/galaxyline.lua
+++ b/neovim/.config/nvim/lua/plugins/galaxyline.lua
@@ -7,28 +7,40 @@ return {
         'nvim-tree/nvim-web-devicons',
       },
       {
-        'arzg/vim-colors-xcode',
+        --'lunacookies/vim-colors-xcode',
+        --lazy = false,
+        --priority = 1000,
+        --config = function ()
+          --local colorscheme_rules_augroup = vim.api.nvim_create_augroup('Colors', {})
+          --vim.api.nvim_create_autocmd( { 'ColorScheme' }, {
+            --pattern = { '*' },
+            --group = colorscheme_rules_augroup,
+            --callback = function()
+              --vim.api.nvim_set_hl(0, 'WinSeparator', { link='VertSplit', force=1, default=1 })
+            --end,
+          --})
+        --end,
+        'navarasu/onedark.nvim',
         lazy = false,
         priority = 1000,
-        config = function ()
-          local colorscheme_rules_augroup = vim.api.nvim_create_augroup('Colors', {})
-          vim.api.nvim_create_autocmd( { 'ColorScheme' }, {
-            pattern = { '*' },
-            group = colorscheme_rules_augroup,
-            callback = function()
-              vim.api.nvim_set_hl(0, 'WinSeparator', { link='VertSplit', force=1, default=1 })
-            end,
-          })
-        end,
+        opts = {
+          style = 'light',
+        },
         dependencies = {
           {
             'f-person/auto-dark-mode.nvim',
             opts = {
               update_interval = 1000,
               set_dark_mode = function ()
+                require('onedark').setup {
+                  style = 'dark',
+                }
                 vim.api.nvim_set_option('background', 'dark')
               end,
               set_light_mode = function ()
+                require('onedark').setup {
+                  style = 'light',
+                }
                 vim.api.nvim_set_option('background', 'light')
               end
             }
@@ -38,6 +50,7 @@ return {
     },
     event = 'VimEnter',
     config = function()
+      require('onedark').load()
       local gl = require('galaxyline')
       local colors = {
         yellow = vim.g.terminal_color_11,