diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 8d6e2de..f80d834 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -15,9 +15,9 @@ require('options')
 -- WARNING: not sure why it was in schedule but that caused issues
 -- WARNING: so I removed it
 -- vim.schedule(function()
-    require('keymaps')
-    require('usrcmds')
-    require('extra')
+require('keymaps')
+require('usrcmds')
+require('extra')
 -- end)
 
 -- Enable all LSPs
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index fd0cbe4..cab51c3 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -1,12 +1,15 @@
 -- System
 vim.g.have_nerd_font = true
 vim.opt.mouse = 'a' -- enable mouse
-vim.opt.clipboard = 'unnamedplus' -- use system clipboard
 vim.opt.undofile = true -- persist undo history by saving it to a file
 vim.opt.undolevels = 10000
 vim.opt.exrc = false -- WARNING: runs .nvim.lua in cwd, which may execute arbitrary code
 vim.opt.updatetime = 200 -- save swap file and trigger CursorHold
 
+vim.schedule(function()
+    vim.opt.clipboard = 'unnamedplus'
+end)
+
 -- Tab
 vim.opt.expandtab = true -- convert tabs to spaces
 vim.opt.tabstop = 2 -- number of visual spaces per TAB
@@ -52,7 +55,8 @@ vim.opt.scrolloff = 8
 vim.opt.sidescrolloff = 0 -- TODO(kyren): do I like this as 0? (was 8)
 vim.opt.termguicolors = true
 vim.opt.splitkeep = 'screen'
-vim.opt.sessionoptions = 'blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions'
+-- vim.opt.sessionoptions = 'blank,buffers,curdir,folds,help,tabpages,winsize,winpos,localoptions'
+vim.opt.sessionoptions = 'blank,buffers,curdir,help,tabpages,winsize,winpos'
 
 -- Disable warnings for missing language providers
 vim.g.loaded_node_provider = 0
@@ -61,8 +65,13 @@ vim.g.loaded_ruby_provider = 0
 vim.g.loaded_python3_provider = 0
 
 -- LSP
-vim.lsp.inlay_hint.enable()
 vim.diagnostic.config({ virtual_text = false, update_in_insert = true })
+vim.lsp.inlay_hint.enable()
+-- vim.api.nvim_create_autocmd({ 'LspAttach' }, {
+--     callback = function()
+--         vim.lsp.inlay_hint.enable()
+--     end,
+-- })
 
 -- Add support for mdx files
 vim.filetype.add({
@@ -74,3 +83,7 @@ vim.filetype.add({
 -- Zig LSP settings
 vim.g.zig_fmt_parse_errors = 0
 vim.g.zig_fmt_autosave = 0
+
+-- Disable folds, might not need
+vim.o.foldmethod = 'manual'
+vim.o.foldenable = false