From 496efe4f1255592e1f040c200cb9c1820a5b2fde Mon Sep 17 00:00:00 2001
From: Olaf Alexander <oalexander@sdf.org>
Date: Fri, 10 Jan 2025 16:14:57 -0600
Subject: [PATCH] feat(nvim): Refactor vim option loading

---
 dot-config/nvim/init.lua                   |  1 -
 dot-config/nvim/lua/config/lazy.lua        | 11 +++++------
 dot-config/nvim/lua/config/vim-options.lua |  2 ++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dot-config/nvim/init.lua b/dot-config/nvim/init.lua
index c648f63..55b8979 100644
--- a/dot-config/nvim/init.lua
+++ b/dot-config/nvim/init.lua
@@ -1,2 +1 @@
-require("config.vim-options")
 require("config.lazy")
diff --git a/dot-config/nvim/lua/config/lazy.lua b/dot-config/nvim/lua/config/lazy.lua
index 7a1ecad..932e0f4 100644
--- a/dot-config/nvim/lua/config/lazy.lua
+++ b/dot-config/nvim/lua/config/lazy.lua
@@ -1,6 +1,6 @@
 -- Bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
   local lazyrepo = "https://github.com/folke/lazy.nvim.git"
   local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
   if vim.v.shell_error ~= 0 then
@@ -15,11 +15,10 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
--- Make sure to setup `mapleader` and `maplocalleader` before
--- loading lazy.nvim so that mappings are correct.
--- This is also a good place to setup other settings (vim.opt)
-vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
+-- Make sure to setup vim options before loading lazy.nvim. 
+-- This should remap `mapleader` and `maplocalleader` and 
+-- set other vim configurations
+require("config.vim-options")
 
 -- Setup lazy.nvim
 require("lazy").setup({
diff --git a/dot-config/nvim/lua/config/vim-options.lua b/dot-config/nvim/lua/config/vim-options.lua
index 278126c..90b0af1 100644
--- a/dot-config/nvim/lua/config/vim-options.lua
+++ b/dot-config/nvim/lua/config/vim-options.lua
@@ -5,4 +5,6 @@ vim.cmd.set("shiftwidth=2")
 
 vim.opt.swapfile = false
 vim.wo.number = true
+vim.g.mapleader = " "
+vim.g.maplocalleader = "\\"
 vim.keymap.set("i", "jj", "<Esc>", { noremap = false })