From aa8223b7a10f4e0e6ab099f8a0a81ea60b894ba6 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Sun, 20 Aug 2023 22:12:51 +0200
Subject: [PATCH] Modifing config

Signed-off-by: Taken <taken@mairimashita.org>
---
 lua/taken/{ => core}/autocmd.lua | 14 ++++++++------
 lua/taken/core/init.lua          |  4 ++++
 lua/taken/{ => core}/neovide.lua |  0
 lua/taken/{ => core}/opts.lua    | 27 +++++----------------------
 lua/taken/{ => core}/remaps.lua  |  0
 lua/taken/init.lua               |  6 ++----
 6 files changed, 19 insertions(+), 32 deletions(-)
 rename lua/taken/{ => core}/autocmd.lua (66%)
 create mode 100644 lua/taken/core/init.lua
 rename lua/taken/{ => core}/neovide.lua (100%)
 rename lua/taken/{ => core}/opts.lua (62%)
 rename lua/taken/{ => core}/remaps.lua (100%)

diff --git a/lua/taken/autocmd.lua b/lua/taken/core/autocmd.lua
similarity index 66%
rename from lua/taken/autocmd.lua
rename to lua/taken/core/autocmd.lua
index 5c1937c..f258853 100644
--- a/lua/taken/autocmd.lua
+++ b/lua/taken/core/autocmd.lua
@@ -1,23 +1,25 @@
+local autocmd = vim.api.nvim_create_autocmd
+local augroup = vim.api.nvim_create_augroup
 -- Groups
-local neogitCmds = vim.api.nvim_create_augroup('MyCustomNeogitEvents', { clear = true })
-local nvimhelp = vim.api.nvim_create_augroup("help_window_right", {})
+local neogitCmds = augroup('MyCustomNeogitEvents', { clear = true })
+local nvimhelp = augroup("help_window_right", {})
 
 -- Neogit nvim tree refresh
-vim.api.nvim_create_autocmd('User', {
+autocmd('User', {
     pattern = 'NeogitPushComplete',
     group = neogitCmds,
     callback = function()
         require('nvim-tree.api').tree.reload()
     end,
 })
-vim.api.nvim_create_autocmd('User', {
+autocmd('User', {
     pattern = 'NeogitPullComplete',
     group = neogitCmds,
     callback = function()
         require('nvim-tree.api').tree.reload()
     end,
 })
-vim.api.nvim_create_autocmd('User', {
+autocmd('User', {
     pattern = 'NeogitFetchComplete',
     group = neogitCmds,
     callback = function()
@@ -25,7 +27,7 @@ vim.api.nvim_create_autocmd('User', {
     end,
 })
 
-vim.api.nvim_create_autocmd("BufWinEnter", {
+autocmd("BufWinEnter", {
     group = nvimhelp,
     pattern = { "*.txt" },
     callback = function()
diff --git a/lua/taken/core/init.lua b/lua/taken/core/init.lua
new file mode 100644
index 0000000..6b57e66
--- /dev/null
+++ b/lua/taken/core/init.lua
@@ -0,0 +1,4 @@
+require("taken.core.autocmd")
+require("taken.core.opts")
+require("taken.core.neovide")
+require("taken.core.remaps")
diff --git a/lua/taken/neovide.lua b/lua/taken/core/neovide.lua
similarity index 100%
rename from lua/taken/neovide.lua
rename to lua/taken/core/neovide.lua
diff --git a/lua/taken/opts.lua b/lua/taken/core/opts.lua
similarity index 62%
rename from lua/taken/opts.lua
rename to lua/taken/core/opts.lua
index 2f963fe..2057026 100644
--- a/lua/taken/opts.lua
+++ b/lua/taken/core/opts.lua
@@ -1,13 +1,13 @@
-local status, prefs = pcall(require, "taken.prefs")
-if not status then
-  prefs = {}
-end
-
 local g = vim.g
 local o = vim.o
 local opt = vim.opt
 local cmd = vim.cmd
 
+local status, prefs = pcall(require, "taken.prefs")
+if not status then
+  prefs = {}
+end
+
 if prefs.colorscheme == nil then
     cmd("colorscheme default")
 else
@@ -15,25 +15,8 @@ else
 end
 
 local cursorcolumncolor = vim.fn.synIDattr(vim.fn.hlID("CursorColumn"), "bg")
-
 cmd("hi CursorLine guibg=" .. cursorcolumncolor)
 
--- cmd[[
---     hi Normal guibg=none ctermbg=none
---     hi NormalNC guibg=none ctermbg=none
---     hi NormalSB guibg=none ctermbg=none
---     hi NvimTreeNormal guibg=none ctermbg=none
---     hi NvimTreeNormalNC guibg=none ctermbg=none
---     hi NvimTreeNormalSB guibg=none ctermbg=none
---     hi LineNr guibg=none ctermbg=none
---     hi Folded guibg=none ctermbg=none
---     hi NonText guibg=none ctermbg=none
---     hi SpecialKey guibg=none ctermbg=none
---     hi VertSplit guibg=none ctermbg=none
---     hi SignColumn guibg=none ctermbg=none
---     hi EndOfBuffer guibg=none ctermbg=none
--- ]]
-
 g.mapleader = " "
 g.maplocalleader = "."
 
diff --git a/lua/taken/remaps.lua b/lua/taken/core/remaps.lua
similarity index 100%
rename from lua/taken/remaps.lua
rename to lua/taken/core/remaps.lua
diff --git a/lua/taken/init.lua b/lua/taken/init.lua
index d0f0a1f..27a112d 100644
--- a/lua/taken/init.lua
+++ b/lua/taken/init.lua
@@ -1,7 +1,5 @@
+require("taken.core")
+
 require("taken.packer")
-require("taken.opts")
-require("taken.remaps")
-require("taken.neovide")
-require("taken.autocmd")
 
 vim.notify = require("notify")