From 9eed37f83e311b66daa7c5ea1f07ccac6caf9652 Mon Sep 17 00:00:00 2001
From: Leslie Kerman <kerman255@icloud.com>
Date: Fri, 11 Aug 2023 22:07:04 +0800
Subject: [PATCH] Load theme.lua after other configs

---
 lua/configs/bufferline.lua | 4 ++--
 lua/core/init.lua          | 9 +++------
 lua/core/plugins.lua       | 5 +----
 lua/core/theme.lua         | 6 +++---
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/lua/configs/bufferline.lua b/lua/configs/bufferline.lua
index 9249f14..9da436b 100644
--- a/lua/configs/bufferline.lua
+++ b/lua/configs/bufferline.lua
@@ -16,9 +16,9 @@ function M.config()
                 icon = '▎',
                 style = 'icon'
             },
-            buffer_close_icon = '',
+            buffer_close_icon = '',
             modified_icon = '●',
-            close_icon = '',
+            close_icon = '',
             left_trunc_marker = '|',
             right_trunc_marker = '|',
             --- name_formatter can be used to change the buffer's label in the bufferline.
diff --git a/lua/core/init.lua b/lua/core/init.lua
index 871ceb2..9904ccf 100644
--- a/lua/core/init.lua
+++ b/lua/core/init.lua
@@ -21,6 +21,7 @@ vim.opt.expandtab     = true
 vim.opt.autowrite     = false
 vim.opt.wrap          = false
 vim.opt.formatoptions = ''
+vim.opt.signcolumn = "yes" -- prevent sign column flickering
 
 require("core.plugins")
 require("core.gui")
@@ -40,17 +41,11 @@ vim.g.loaded_netrw             = 1
 vim.g.loaded_netrwPlugin       = 1
 vim.g.loaded_tutor_mode_plugin = 1
 vim.g.loaded_remote_plugins    = 1
-require("core.theme")
 
 -- Load plugin configs
 -- plugins without extra configs are configured directly here
 require("impatient")
 
--- duck lol
-local duck = require("duck")
-vim.keymap.set('n', '<leader>dd', function() duck.hatch("🦆", 1) end, {})
-vim.keymap.set('n', '<leader>dk', function() duck.cook() end, {})
-
 require("indent_blankline").setup {
     space_char_blankline = " ",
     show_current_context = true,
@@ -73,3 +68,5 @@ require("configs.leetcode").config()
 require("configs.lang.rust").config()
 
 require("core.keymaps")
+
+require("core.theme")
diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua
index f8f5ef2..9e658c0 100644
--- a/lua/core/plugins.lua
+++ b/lua/core/plugins.lua
@@ -32,7 +32,7 @@ return require('packer').startup(function()
     use 'NLKNguyen/papercolor-theme'
     -- use 'liuchengxu/space-vim-dark'
     use 'sainnhe/edge'
-    use 'B4mbus/oxocarbon-lua.nvim'
+    use 'nyoom-engineering/oxocarbon.nvim'
     -- use 'Th3Whit3Wolf/one-nvim'
 
     -- language
@@ -85,9 +85,6 @@ return require('packer').startup(function()
     -- scroll bar
     use 'petertriho/nvim-scrollbar'
 
-    -- AI completion!
-    use 'aduros/ai.vim'
-
     -- duck lol
     use 'tamton-aquib/duck.nvim'
 
diff --git a/lua/core/theme.lua b/lua/core/theme.lua
index 5a25d14..13ad118 100644
--- a/lua/core/theme.lua
+++ b/lua/core/theme.lua
@@ -48,12 +48,12 @@
 -- edge
 vim.g.edge_style = 'aura' -- neon, aura
 vim.g.edge_better_performance = 1
-vim.cmd("colorscheme edge")
+-- vim.cmd("colorscheme edge")
 
 -- github
--- vim.cmd("colorscheme github_dark_default")
+-- vim.cmd("colorscheme github_dark_high_contrast")
 
 -- oxocarbon
--- vim.cmd("colorscheme oxocarbon-lua")
+vim.cmd("colorscheme oxocarbon")
 
 vim.cmd("set background=dark")