fix: resolve merge conflicts

README.md

@@ -3,16 +3,28 @@
 _A modern Neovim port of a deftheme [adaptation][gruber-darker-theme] of an Emacs
 [port][gruber-darker] of a BBEdit [colorscheme][gruber-dark]_
 
-__This is a work in progress, and is not currently stable__
+**This is a work in progress**
 
 ## Installation
 
+### Lazy
+
+```lua
+{ "blazkowolf/gruber-darker.nvim" }
+```
+
 ### Packer
 
 ```lua
 use "blazkowolf/gruber-darker.nvim"
 ```
 
+### Plug
+
+```vim
+Plug 'blazkowolf/gruber-darker.nvim'
+```
+
 Then, somewhere in your `init.lua`, set the colorscheme like this
 
 ```lua
@@ -21,11 +33,11 @@ vim.cmd.colorscheme("GruberDarker")
 
 ## Configuration
 
-Additional settings for gruber-darker are:
+Configuration options can be changed by calling `setup()`
+with your preferences prior to loading the colorscheme.
 
 ```lua
--- setup must be called before loading the colorscheme
--- Default options:
+-- Config defaults
 require("gruber-darker").setup({
   bold = true,
   italic = true,
@@ -34,14 +46,14 @@ require("gruber-darker").setup({
 })
 ```
 
-## Special thanks
+## Credits
 
 These repositories were great knowledge sources and their
 inspiration helped immensely with the development of this plugin.
 
 - [rexim/gruber-darker-theme][gruber-darker-theme]
 - [folke/tokyonight.nvim][tokyonight]
-- [drsooch/gruber-darker-vim][gruber-darker-theme]
+- [drsooch/gruber-darker-vim][gruber-darker-vim]
 
 [gruber-darker-theme]: https://github.com/rexim/gruber-darker-theme
 [gruber-darker]: https://jblevins.org/projects/emacs-color-themes/gruber-darker-theme.el.html

lua/gruber-darker/init.lua

@@ -33,15 +33,6 @@ function M.load()
       require("gruber-darker").on_colorscheme()
     end,
   })
-end
-
----Change colorscheme to GruberDarker
-function M.colorscheme() end
-
----GruberDarker configuration bootstrapper
----@param opts Options
-function M.setup(opts)
-	config.set(opts or {})
 
   -- vim.api.nvim_create_autocmd("FileType", {
   -- 	group = gruber_darker_group,
@@ -52,9 +43,14 @@ function M.setup(opts)
   -- })
 end
 
--- M.setup({
--- 	message = "Test message ensuring when a user calls "
---     .. "`setup` with overrides, their preferences are kept.",
--- })
+---Change colorscheme to GruberDarker
+function M.colorscheme()
+end
+
+---GruberDarker configuration bootstrapper
+---@param opts Options
+function M.setup(opts)
+  config.set(opts or {})
+end
 
 return M