small refactor for neovim config

11 files changed, 44 insertions, 15 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c7eb768..1dbf9bc 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -8,11 +8,7 @@ local opt = vim.opt
 vim.g.use_lsp_plugins = false
 vim.g.use_mason = false
 
-require("getchoo.plugins")
-if vim.g.use_lsp_plugins then
-	require("getchoo.ftdetect")
-	require("getchoo.lsp")
-end
+require("getchoo")
 
 -- text options
 opt.tabstop = 2
diff --git a/.config/nvim/lua/getchoo/ftdetect.lua b/.config/nvim/lua/getchoo/ftdetect.lua
index 5dd569d..c13bdb6 100644
--- a/.config/nvim/lua/getchoo/ftdetect.lua
+++ b/.config/nvim/lua/getchoo/ftdetect.lua
@@ -1,4 +1,6 @@
+--
 -- load custom file types
+--
 
 local filetypes = {
 	filename = {
diff --git a/.config/nvim/lua/getchoo/config.lua b/.config/nvim/lua/getchoo/init.lua
index a67f734..83233ea 100644
--- a/.config/nvim/lua/getchoo/config.lua
+++ b/.config/nvim/lua/getchoo/init.lua
@@ -1,7 +1,9 @@
 --
--- config for regular plugins
+-- setup plugins
 --
 
+require("getchoo.plugins")
+
 local M = {}
 
 M.bufferline = {
@@ -21,5 +23,15 @@ M.lualine = {
 
 M.tree = {}
 
+require("bufferline").setup(M.bufferline)
+require("lualine").setup(M.lualine)
+require("nvim-tree").setup(M.tree)
+
+if vim.g.use_lsp_plugins then
+	require("getchoo.ftdetect")
+	require("getchoo.lsp")
+end
+
 require("getchoo.keymap")
+
 return M
diff --git a/.config/nvim/lua/getchoo/lsp/config/cmp.lua b/.config/nvim/lua/getchoo/lsp/config/cmp.lua
index 0f0f51f..cef2ad1 100644
--- a/.config/nvim/lua/getchoo/lsp/config/cmp.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/cmp.lua
@@ -1,3 +1,7 @@
+--
+-- config for nvim-cmp
+--
+
 local cmp = require("cmp")
 local mapping = cmp.mapping
 local luasnip = require("luasnip")
diff --git a/.config/nvim/lua/getchoo/lsp/config/init.lua b/.config/nvim/lua/getchoo/lsp/config/init.lua
index 1c928d3..b3e58dd 100644
--- a/.config/nvim/lua/getchoo/lsp/config/init.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/init.lua
@@ -1,4 +1,7 @@
--- wrapper for all configs
+--
+-- load all lsp configs
+--
+
 local cmp = require("getchoo.lsp.config.cmp")
 local lsp_config = require("getchoo.lsp.config.lsp_config")
 local mason = require("getchoo.lsp.config.mason")
diff --git a/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua b/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua
index 4df3fe0..9874820 100644
--- a/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua
@@ -1,3 +1,7 @@
+--
+-- setup lsp_config
+--
+
 local cmp = require("getchoo.lsp.config.cmp")
 local sources = require("getchoo.lsp.config.sources")
 
diff --git a/.config/nvim/lua/getchoo/lsp/config/mason.lua b/.config/nvim/lua/getchoo/lsp/config/mason.lua
index 6814697..24adffb 100644
--- a/.config/nvim/lua/getchoo/lsp/config/mason.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/mason.lua
@@ -1,4 +1,7 @@
+--
 -- config for mason tools
+--
+
 local sources = require("getchoo.lsp.config.sources")
 
 local M = {}
diff --git a/.config/nvim/lua/getchoo/lsp/config/null_ls.lua b/.config/nvim/lua/getchoo/lsp/config/null_ls.lua
index 42cd30e..16b1b3c 100644
--- a/.config/nvim/lua/getchoo/lsp/config/null_ls.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/null_ls.lua
@@ -1,9 +1,12 @@
+--
+-- config for null_ls
+--
+
 local sources = require("getchoo.lsp.config.sources")
 
 local M = {}
 
 -- only use null-ls for formatting
-
 -- for neovim >= 8
 local lsp_formatting = function(bufnr)
 	vim.lsp.buf.format({
@@ -22,8 +25,9 @@ local formatting_on_attach = function(client, bufnr)
 			group = augroup,
 			buffer = bufnr,
 			callback = function()
-				-- local params = require("vim.lsp.util").make_formatting_params({})
-				-- client.request("textDocument/formatting", params, nil, bufnr)
+				-- for neovim < 8
+				---- local params = require("vim.lsp.util").make_formatting_params({})
+				---- client.request("textDocument/formatting", params, nil, bufnr)
 				lsp_formatting(bufnr) -- neovim >= 8
 			end,
 		})
diff --git a/.config/nvim/lua/getchoo/lsp/config/sources.lua b/.config/nvim/lua/getchoo/lsp/config/sources.lua
index 1898870..0aa5c1e 100644
--- a/.config/nvim/lua/getchoo/lsp/config/sources.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/sources.lua
@@ -1,3 +1,7 @@
+--
+-- sources for lsp
+--
+
 local null_ls = require("null-ls")
 local diagnostics = null_ls.builtins.diagnostics
 local formatting = null_ls.builtins.formatting
diff --git a/.config/nvim/lua/getchoo/lsp/init.lua b/.config/nvim/lua/getchoo/lsp/init.lua
index aa3dde5..f354b2a 100644
--- a/.config/nvim/lua/getchoo/lsp/init.lua
+++ b/.config/nvim/lua/getchoo/lsp/init.lua
@@ -1,6 +1,7 @@
 --
 -- setup lsp environment
 --
+
 require("getchoo.lsp.server")
 require("getchoo.lsp.keymap")
 local config = require("getchoo.lsp.config")
diff --git a/.config/nvim/lua/getchoo/plugins.lua b/.config/nvim/lua/getchoo/plugins.lua
index 3c50d54..d3f1863 100644
--- a/.config/nvim/lua/getchoo/plugins.lua
+++ b/.config/nvim/lua/getchoo/plugins.lua
@@ -43,6 +43,7 @@ require("packer").startup(function(use)
 					telescope = true,
 					lsp_trouble = true,
 				},
+				no_italic = true,
 			})
 			vim.api.nvim_command("colorscheme catppuccin")
 		end,
@@ -108,8 +109,3 @@ require("packer").startup(function(use)
 		require("packer").sync()
 	end
 end)
-
-local config = require("getchoo.config")
-require("bufferline").setup(config.bufferline)
-require("lualine").setup(config.lualine)
-require("nvim-tree").setup(config.tree)