merge vim.g & vim.opt again + play with them

3 files changed, 20 insertions, 16 deletions

diff --git a/lua/getchoo/globals.lua b/lua/getchoo/globals.lua
deleted file mode 100644
index a9ff734..0000000
--- a/lua/getchoo/globals.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.g.mapleader = ","
-vim.g.do_filetype_lua = 1
diff --git a/lua/getchoo/init.lua b/lua/getchoo/init.lua
index 25f6baf..82c57f3 100644
--- a/lua/getchoo/init.lua
+++ b/lua/getchoo/init.lua
@@ -1,2 +1,20 @@
-require("getchoo.options")
-require("getchoo.globals")
+local g = vim.g
+local opt = vim.opt
+
+g.mapleader = ","
+
+-- indent shenanigans
+opt.shiftwidth = 2
+opt.tabstop = 2
+opt.expandtab = false
+---- https://www.reddit.com/r/neovim/comments/14n6iiy/if_you_have_treesitter_make_sure_to_disable
+---- TLDR: this breaks things with treesitter indent
+opt.smartindent = false
+
+-- line stuff
+opt.number = true
+opt.wrap = true
+
+-- ui
+opt.mouse = "a"
+opt.showmode = false -- status line does this
diff --git a/lua/getchoo/options.lua b/lua/getchoo/options.lua
deleted file mode 100644
index 5ddf964..0000000
--- a/lua/getchoo/options.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local opt = vim.opt
-
-opt.shiftwidth = 2
-opt.tabstop = 2
--- https://www.reddit.com/r/neovim/comments/14n6iiy/if_you_have_treesitter_make_sure_to_disable
--- TLDR: this breaks things with treesitter indent
-opt.smartindent = false
-opt.number = true
-opt.wrap = true
-opt.syntax = "on"
-opt.termguicolors = true
-opt.mouse = "a"