From fafe70eb36e800f839ef5af32e4749d3db80d805 Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Sun, 6 Feb 2022 19:19:22 -0800
Subject: [PATCH] feat: clean up a bit

---
 lua/cosmic/core/user.lua                  |  4 +--
 lua/cosmic/lsp/diagnostics.lua            |  4 +--
 lua/cosmic/lsp/providers/init.lua         | 10 ++++----
 lua/cosmic/lsp/providers/null_ls.lua      |  2 +-
 lua/cosmic/lsp/providers/tsserver.lua     |  4 +--
 lua/cosmic/plugins/auto-session/init.lua  |  4 +--
 lua/cosmic/plugins/comments/init.lua      |  4 +--
 lua/cosmic/plugins/cosmic-ui/init.lua     |  4 +--
 lua/cosmic/plugins/galaxyline/init.lua    |  8 +++---
 lua/cosmic/plugins/gitsigns/init.lua      |  4 +--
 lua/cosmic/plugins/lsp-signature/init.lua |  4 +--
 lua/cosmic/plugins/luasnip/init.lua       |  4 +--
 lua/cosmic/plugins/notify/init.lua        |  4 +--
 lua/cosmic/plugins/nvim-cmp/init.lua      |  4 +--
 lua/cosmic/plugins/nvim-tree/init.lua     |  4 +--
 lua/cosmic/plugins/telescope/init.lua     | 30 +++++++++++------------
 lua/cosmic/plugins/todo-comments/init.lua |  4 +--
 lua/cosmic/plugins/treesitter/init.lua    |  4 +--
 18 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/lua/cosmic/core/user.lua b/lua/cosmic/core/user.lua
index 52de848..038dcea 100644
--- a/lua/cosmic/core/user.lua
+++ b/lua/cosmic/core/user.lua
@@ -39,8 +39,8 @@ local default_config = {
   },
 }
 
-local utils = require('cosmic.utils')
-local config = utils.merge(default_config, user_config)
+local u = require('cosmic.utils')
+local config = u.merge(default_config, user_config)
 local user_servers = vim.tbl_keys(config.lsp.servers)
 
 function config.lsp.can_client_format(client_name)
diff --git a/lua/cosmic/lsp/diagnostics.lua b/lua/cosmic/lsp/diagnostics.lua
index 50ab015..57183c8 100644
--- a/lua/cosmic/lsp/diagnostics.lua
+++ b/lua/cosmic/lsp/diagnostics.lua
@@ -1,4 +1,4 @@
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 local icons = require('cosmic.theme.icons')
 local config = require('cosmic.core.user')
 
@@ -17,7 +17,7 @@ end
 
 -- set up vim.diagnostics
 -- vim.diagnostic.config opts
-vim.diagnostic.config(utils.merge({
+vim.diagnostic.config(u.merge({
   underline = true,
   signs = true,
   update_in_insert = false,
diff --git a/lua/cosmic/lsp/providers/init.lua b/lua/cosmic/lsp/providers/init.lua
index ed9c3f8..e26b0c9 100644
--- a/lua/cosmic/lsp/providers/init.lua
+++ b/lua/cosmic/lsp/providers/init.lua
@@ -1,4 +1,4 @@
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 local default_config = require('cosmic.lsp.providers.defaults')
 local config = require('cosmic.core.user')
 local lsp_installer = require('nvim-lsp-installer')
@@ -55,17 +55,17 @@ lsp_installer.on_server_ready(function(server)
 
   -- set up default cosmic options
   if server.name == 'tsserver' then
-    opts = utils.merge(opts, require('cosmic.lsp.providers.tsserver'))
+    opts = u.merge(opts, require('cosmic.lsp.providers.tsserver'))
   elseif server.name == 'jsonls' then
-    opts = utils.merge(opts, require('cosmic.lsp.providers.jsonls'))
+    opts = u.merge(opts, require('cosmic.lsp.providers.jsonls'))
   elseif server.name == 'sumneko_lua' then
-    opts = utils.merge(opts, require('cosmic.lsp.providers.sumneko_lua'))
+    opts = u.merge(opts, require('cosmic.lsp.providers.sumneko_lua'))
   end
 
   -- override options if user definds them
   if type(config.lsp.servers[server.name]) == 'table' then
     if config.lsp.servers[server.name].opts ~= nil then
-      opts = utils.merge(opts, config.lsp.servers[server.name].opts)
+      opts = u.merge(opts, config.lsp.servers[server.name].opts)
     end
   end
 
diff --git a/lua/cosmic/lsp/providers/null_ls.lua b/lua/cosmic/lsp/providers/null_ls.lua
index 096b64b..caaa335 100644
--- a/lua/cosmic/lsp/providers/null_ls.lua
+++ b/lua/cosmic/lsp/providers/null_ls.lua
@@ -25,7 +25,7 @@ if not config_opts.default_cosmic_sources then
     }),
     null_ls.builtins.formatting.stylua,
     null_ls.builtins.code_actions.gitsigns,
-  }, config_opts.sources)
+  }, config_opts.sources or {})
 end
 
 require('null-ls').setup(u.merge(defaults, config_opts))
diff --git a/lua/cosmic/lsp/providers/tsserver.lua b/lua/cosmic/lsp/providers/tsserver.lua
index acf4e30..8abba44 100644
--- a/lua/cosmic/lsp/providers/tsserver.lua
+++ b/lua/cosmic/lsp/providers/tsserver.lua
@@ -1,4 +1,4 @@
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 local default_on_attach = require('cosmic.lsp.providers.defaults').on_attach
 local config = require('cosmic.core.user')
 local M = {}
@@ -9,7 +9,7 @@ function M.on_attach(client, bufnr)
   local ts_utils = require('nvim-lsp-ts-utils')
 
   -- defaults
-  ts_utils.setup(utils.merge({
+  ts_utils.setup(u.merge({
     debug = false,
     disable_commands = false,
     enable_import_on_completion = true,
diff --git a/lua/cosmic/plugins/auto-session/init.lua b/lua/cosmic/plugins/auto-session/init.lua
index 5a10576..4275df4 100644
--- a/lua/cosmic/plugins/auto-session/init.lua
+++ b/lua/cosmic/plugins/auto-session/init.lua
@@ -1,5 +1,5 @@
 local config = require('cosmic.core.user')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
 local defaults = {
   pre_save_cmds = { 'NvimTreeClose', 'cclose', 'lua vim.notify.dismiss()' },
@@ -9,4 +9,4 @@ local defaults = {
   auto_restore_enabled = false,
 }
 
-require('auto-session').setup(utils.merge(defaults, config.auto_session or {}))
+require('auto-session').setup(u.merge(defaults, config.auto_session or {}))
diff --git a/lua/cosmic/plugins/comments/init.lua b/lua/cosmic/plugins/comments/init.lua
index e25e1d8..c7474f0 100644
--- a/lua/cosmic/plugins/comments/init.lua
+++ b/lua/cosmic/plugins/comments/init.lua
@@ -1,7 +1,7 @@
 local config = require('cosmic.core.user')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
-require('Comment').setup(utils.merge({
+require('Comment').setup(u.merge({
   pre_hook = function(ctx)
     local U = require('Comment.utils')
     local location = nil
diff --git a/lua/cosmic/plugins/cosmic-ui/init.lua b/lua/cosmic/plugins/cosmic-ui/init.lua
index 70ec2dd..57570fc 100644
--- a/lua/cosmic/plugins/cosmic-ui/init.lua
+++ b/lua/cosmic/plugins/cosmic-ui/init.lua
@@ -1,8 +1,8 @@
 local config = require('cosmic.core.user')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
 local defaults = {
   border_style = 'rounded',
 }
 
-require('cosmic-ui').setup(utils.merge(defaults, config.cosmic_ui or {}))
+require('cosmic-ui').setup(u.merge(defaults, config.cosmic_ui or {}))
diff --git a/lua/cosmic/plugins/galaxyline/init.lua b/lua/cosmic/plugins/galaxyline/init.lua
index 7369569..3d7354b 100644
--- a/lua/cosmic/plugins/galaxyline/init.lua
+++ b/lua/cosmic/plugins/galaxyline/init.lua
@@ -3,7 +3,7 @@ local gls = galaxy.section
 local diag = require('galaxyline.providers.diagnostic')
 local condition = require('galaxyline.condition')
 local fileinfo = require('galaxyline.providers.fileinfo')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 local colors = require('cosmic.theme.colors')
 local set_highlight = require('cosmic.theme.utils').set_highlight
 local icons = require('cosmic.theme.icons')
@@ -11,7 +11,7 @@ local config = require('cosmic.core.user')
 local get_highlight = require('cosmic.theme.utils').get_highlight
 local statusline_colors = get_highlight('StatusLine')
 
-local defaults = utils.merge({
+local defaults = u.merge({
   main_icon = icons.cosmic,
 }, config.statusline or {})
 local main_icon = defaults.main_icon
@@ -60,7 +60,7 @@ end
 
 local FilePathShortProvider = function()
   local fp = vim.fn.fnamemodify(vim.fn.expand('%'), ':~:.:h')
-  local tbl = utils.split(fp, '/')
+  local tbl = u.split(fp, '/')
   local len = #tbl
 
   if len > 2 and tbl[1] ~= '~' then
@@ -365,7 +365,7 @@ gls.right = {
   {
     LSPStatus = {
       provider = function()
-        local clients = utils.get_active_lsp_client_names()
+        local clients = u.get_active_lsp_client_names()
         local client_str = ''
 
         if #clients < 1 then
diff --git a/lua/cosmic/plugins/gitsigns/init.lua b/lua/cosmic/plugins/gitsigns/init.lua
index 5ae8cfe..b2672e0 100644
--- a/lua/cosmic/plugins/gitsigns/init.lua
+++ b/lua/cosmic/plugins/gitsigns/init.lua
@@ -1,7 +1,7 @@
 local config = require('cosmic.core.user')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
-require('gitsigns').setup(utils.merge({
+require('gitsigns').setup(u.merge({
   signs = {
     add = { hl = 'GitSignsAdd', text = '│', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
     change = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
diff --git a/lua/cosmic/plugins/lsp-signature/init.lua b/lua/cosmic/plugins/lsp-signature/init.lua
index 0b50821..980c7b1 100644
--- a/lua/cosmic/plugins/lsp-signature/init.lua
+++ b/lua/cosmic/plugins/lsp-signature/init.lua
@@ -1,7 +1,7 @@
 local config = require('cosmic.core.user')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
-require('lsp_signature').setup(utils.merge({
+require('lsp_signature').setup(u.merge({
   bind = true, -- This is mandatory, otherwise border config won't get registered.
   handler_opts = {
     border = config.border,
diff --git a/lua/cosmic/plugins/luasnip/init.lua b/lua/cosmic/plugins/luasnip/init.lua
index 5eff13e..fcb47a6 100644
--- a/lua/cosmic/plugins/luasnip/init.lua
+++ b/lua/cosmic/plugins/luasnip/init.lua
@@ -1,6 +1,6 @@
 local config = require('cosmic.core.user')
 local ls = require('luasnip')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
 -- some shorthands...
 --[[ local s = ls.snippet
@@ -12,7 +12,7 @@ local c = ls.choice_node
 local d = ls.dynamic_node ]]
 
 -- Every unspecified option will be set to the default.
-ls.config.set_config(utils.merge({
+ls.config.set_config(u.merge({
   history = true,
   -- Update more often, :h events for more info.
   updateevents = 'TextChanged,TextChangedI',
diff --git a/lua/cosmic/plugins/notify/init.lua b/lua/cosmic/plugins/notify/init.lua
index 8361df0..a8dad1b 100644
--- a/lua/cosmic/plugins/notify/init.lua
+++ b/lua/cosmic/plugins/notify/init.lua
@@ -1,8 +1,8 @@
 local config = require('cosmic.core.user')
 local icons = require('cosmic.theme.icons')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
-require('notify').setup(utils.merge({
+require('notify').setup(u.merge({
   icons = {
     ERROR = icons.error,
     WARN = icons.warn,
diff --git a/lua/cosmic/plugins/nvim-cmp/init.lua b/lua/cosmic/plugins/nvim-cmp/init.lua
index d0805e6..ee05517 100644
--- a/lua/cosmic/plugins/nvim-cmp/init.lua
+++ b/lua/cosmic/plugins/nvim-cmp/init.lua
@@ -1,5 +1,5 @@
 local cmp = require('cmp')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 local luasnip = require('luasnip')
 local user_config = require('cosmic.core.user')
 local icons = require('cosmic.theme.icons')
@@ -89,7 +89,7 @@ vim.cmd([[
   autocmd FileType TelescopePrompt lua require('cmp').setup.buffer { enabled = false }
 ]])
 
-local opts = utils.merge(default_cmp_opts, user_config.nvim_cmp or {})
+local opts = u.merge(default_cmp_opts, user_config.nvim_cmp or {})
 
 cmp.setup(opts)
 
diff --git a/lua/cosmic/plugins/nvim-tree/init.lua b/lua/cosmic/plugins/nvim-tree/init.lua
index 375ec57..530b634 100644
--- a/lua/cosmic/plugins/nvim-tree/init.lua
+++ b/lua/cosmic/plugins/nvim-tree/init.lua
@@ -1,7 +1,7 @@
 local config = require('cosmic.core.user')
 local g = vim.g
 local icons = require('cosmic.theme.icons')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
 -- settings
 g.nvim_tree_git_hl = 1
@@ -49,4 +49,4 @@ local args = {
   },
 }
 
-require('nvim-tree').setup(utils.merge(args, config.nvim_tree or {}))
+require('nvim-tree').setup(u.merge(args, config.nvim_tree or {}))
diff --git a/lua/cosmic/plugins/telescope/init.lua b/lua/cosmic/plugins/telescope/init.lua
index 59ef14d..514d058 100644
--- a/lua/cosmic/plugins/telescope/init.lua
+++ b/lua/cosmic/plugins/telescope/init.lua
@@ -1,7 +1,7 @@
 local actions = require('telescope.actions')
 local config = require('cosmic.core.user')
 local icons = require('cosmic.theme.icons')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
 local default_mappings = {
   n = {
@@ -48,7 +48,7 @@ local opts_flex = {
   },
 }
 
-require('telescope').setup(utils.merge({
+require('telescope').setup(u.merge({
   defaults = {
     prompt_prefix = '🔍 ',
     selection_caret = icons.folder.arrow_closed,
@@ -79,9 +79,9 @@ require('telescope').setup(utils.merge({
     },
   },
   pickers = {
-    buffers = utils.merge(opts_flex, {
+    buffers = u.merge(opts_flex, {
       prompt_title = '✨ Search Buffers ✨',
-      mappings = utils.merge({
+      mappings = u.merge({
         n = {
           ['d'] = actions.delete_buffer,
         },
@@ -89,46 +89,46 @@ require('telescope').setup(utils.merge({
       sort_mru = true,
       preview_title = false,
     }),
-    lsp_code_actions = utils.merge(opts_cursor, {
+    lsp_code_actions = u.merge(opts_cursor, {
       prompt_title = 'Code Actions',
     }),
-    lsp_range_code_actions = utils.merge(opts_vertical, {
+    lsp_range_code_actions = u.merge(opts_vertical, {
       prompt_title = 'Code Actions',
     }),
-    lsp_document_diagnostics = utils.merge(opts_vertical, {
+    lsp_document_diagnostics = u.merge(opts_vertical, {
       prompt_title = 'Document Diagnostics',
       mappings = default_mappings,
     }),
-    lsp_implementations = utils.merge(opts_cursor, {
+    lsp_implementations = u.merge(opts_cursor, {
       prompt_title = 'Implementations',
       mappings = default_mappings,
     }),
-    lsp_definitions = utils.merge(opts_cursor, {
+    lsp_definitions = u.merge(opts_cursor, {
       prompt_title = 'Definitions',
       mappings = default_mappings,
     }),
-    lsp_references = utils.merge(opts_vertical, {
+    lsp_references = u.merge(opts_vertical, {
       prompt_title = 'References',
       mappings = default_mappings,
     }),
-    find_files = utils.merge(opts_flex, {
+    find_files = u.merge(opts_flex, {
       prompt_title = '✨ Search Project ✨',
       mappings = default_mappings,
       hidden = true,
     }),
-    diagnostics = utils.merge(opts_vertical, {
+    diagnostics = u.merge(opts_vertical, {
       mappings = default_mappings,
     }),
-    git_files = utils.merge(opts_flex, {
+    git_files = u.merge(opts_flex, {
       prompt_title = '✨ Search Git Project ✨',
       mappings = default_mappings,
       hidden = true,
     }),
-    live_grep = utils.merge(opts_flex, {
+    live_grep = u.merge(opts_flex, {
       prompt_title = '✨ Live Grep ✨',
       mappings = default_mappings,
     }),
-    grep_string = utils.merge(opts_vertical, {
+    grep_string = u.merge(opts_vertical, {
       prompt_title = '✨ Grep String ✨',
       mappings = default_mappings,
     }),
diff --git a/lua/cosmic/plugins/todo-comments/init.lua b/lua/cosmic/plugins/todo-comments/init.lua
index 5d3fdc6..7a4dec4 100644
--- a/lua/cosmic/plugins/todo-comments/init.lua
+++ b/lua/cosmic/plugins/todo-comments/init.lua
@@ -1,8 +1,8 @@
 local config = require('cosmic.core.user')
 local icons = require('cosmic.theme.icons')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
-require('todo-comments').setup(utils.merge({
+require('todo-comments').setup(u.merge({
   keywords = {
     FIX = {
       icon = icons.debug, -- icon used for the sign, and in search results
diff --git a/lua/cosmic/plugins/treesitter/init.lua b/lua/cosmic/plugins/treesitter/init.lua
index 6dd981b..2b1b34d 100644
--- a/lua/cosmic/plugins/treesitter/init.lua
+++ b/lua/cosmic/plugins/treesitter/init.lua
@@ -1,5 +1,5 @@
 local config = require('cosmic.core.user')
-local utils = require('cosmic.utils')
+local u = require('cosmic.utils')
 
 local defaults = {
   ensure_installed = {
@@ -36,4 +36,4 @@ local defaults = {
   },
 }
 
-require('nvim-treesitter.configs').setup(utils.merge(defaults, config.treesitter or {}))
+require('nvim-treesitter.configs').setup(u.merge(defaults, config.treesitter or {}))