From e3416f0e727500f2e35a823b917f52106a6db902 Mon Sep 17 00:00:00 2001
From: Ian Griffin <migriffin@disroot.org>
Date: Thu, 17 Nov 2022 21:40:26 +0800
Subject: [PATCH] some updates

---
 ginit.vim    | 10 ++++++++++
 init.lua     |  8 ++++++--
 lua/ide.lua  | 18 +++++++++++++++---
 lua/misc.lua |  1 +
 lua/ui.lua   | 39 +++++----------------------------------
 5 files changed, 37 insertions(+), 39 deletions(-)
 create mode 100644 ginit.vim

diff --git a/ginit.vim b/ginit.vim
new file mode 100644
index 0000000..2d7cca3
--- /dev/null
+++ b/ginit.vim
@@ -0,0 +1,10 @@
+""
+"" Font Setup
+""
+Guifont Source\ Code\ Pro:h10
+
+""
+"" Colorscheme
+""
+set background=light
+colo github
diff --git a/init.lua b/init.lua
index f1ab8ab..4694d23 100644
--- a/init.lua
+++ b/init.lua
@@ -12,10 +12,14 @@
 local fn = vim.fn
 local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
 if fn.empty(fn.glob(install_path)) > 0 then
-  Packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+  Packer_bootstrap = fn.system({
+	  'git', 'clone', '--depth', '1',
+	  'https://github.com/wbthomason/packer.nvim',
+	  install_path
+  })
 end
 
-packer = require 'packer'
+local packer = require 'packer'
 packer.reset()
 packer.init()
 local pk_use = packer.use
diff --git a/lua/ide.lua b/lua/ide.lua
index a887747..5cea9f6 100644
--- a/lua/ide.lua
+++ b/lua/ide.lua
@@ -80,7 +80,12 @@ pk_use 'nanotee/nvim-lsp-basics'
 pk_use {
 	'stevearc/aerial.nvim',
 	config = function()
-		require('aerial').setup()
+		require('aerial').setup({
+			backends = {'lsp', 'markdown', 'man'},
+			layout = {
+				max_width = {25, 0.2}
+			}
+		})
 	end
 }
 
@@ -88,7 +93,15 @@ pk_use {
 pk_use {
 	'williamboman/mason.nvim',
 	config = function()
-		require('mason').setup()
+		require('mason').setup {
+			ui = {
+				icons = {
+					package_installed = "i",
+					package_pending = "p",
+					package_uninstalled = "u"
+				}
+			}
+		}
 	end
 }
 pk_use { 
@@ -114,7 +127,6 @@ pk_use {
 						local basics = require('lsp_basics')
 						basics.make_lsp_commands(client, bufnr)
 						basics.make_lsp_mappings(client, bufnr)
-						require('aerial').on_attach(client, bufnr)
 					end
 		})
 			end
diff --git a/lua/misc.lua b/lua/misc.lua
index d5bcb51..c2b88e9 100644
--- a/lua/misc.lua
+++ b/lua/misc.lua
@@ -59,6 +59,7 @@ vim.g.netrw_chgwin = 1
 --
 vim.opt.compatible = false
 vim.opt.autowrite = true
+vim.opt.foldmethod = "marker"
 -- auto cd to the current file's location
 vim.cmd('autocmd BufEnter * silent! lcd %:p:h')
 -- highlighting for other langs in markdown docs
diff --git a/lua/ui.lua b/lua/ui.lua
index ccbe3e0..036bb70 100644
--- a/lua/ui.lua
+++ b/lua/ui.lua
@@ -5,44 +5,15 @@ local ct = require 'conftool'
 -- Theme
 --
 vim.cmd('syntax on')
---[[
 pk_use {
-	'ellisonleao/gruvbox.nvim',
+	'cormacrelf/vim-colors-github',
+	setup = function()
+		require('conftool').set({'background', 'dark'})
+	end,
 	config = function()
-		require('conftool').set({'background', "light"})
-		require('gruvbox').setup({
-			italic = true,
-			bold = true,
-			contrast = "hard"
-		})
-		vim.cmd [[colo gruvbox]]
---	end
---}
---]]
-pk_use {
-	'Shatur/neovim-ayu',
-	config = function()
-		local ct = require('conftool')
-		local hr = os.date('*t').hour
-
-		--[[
-		if hr >= 21 then
-			ct.set({'background', 'dark'})
-		elseif hr >= 7 then
-			ct.set({'background', 'light'})
-		elseif hr >= 0 then
-			ct.set({'background', 'light'})
-		end
-		]]--
-		ct.set({'background', 'light'})
-
-		require('ayu').setup {
-			mirage = false,
-		}
-		vim.cmd [[colorscheme ayu]]
+		vim.cmd [[colo github]]
 	end
 }
-
 --
 -- Indentation
 --