feat(core): some clean up

lua/cosmic/core/file-explorer/init.lua

@@ -1,47 +1,42 @@
 local g = vim.g
 local icons = require('cosmic.core.theme.icons')
-local M = {}
 
-function M.init()
+-- settings
-  -- settings
+g.nvim_tree_git_hl = 1
-  g.nvim_tree_git_hl = 1
+g.nvim_tree_refresh_wait = 300
-  g.nvim_tree_refresh_wait = 300
 
-  g.nvim_tree_special_files = {}
+g.nvim_tree_special_files = {}
-  g.nvim_tree_show_icons = {
+g.nvim_tree_show_icons = {
-    git = 1,
+  git = 1,
-    folders = 1,
+  folders = 1,
-    files = 1,
+  files = 1,
-    folder_arrows = 1,
+  folder_arrows = 1,
-  }
+}
 
-  g.nvim_tree_icons = {
+g.nvim_tree_icons = {
-    default = '',
+  default = '',
-    symlink = icons.symlink,
+  symlink = icons.symlink,
-    git = icons.git,
+  git = icons.git,
-    folder = icons.folder,
+  folder = icons.folder,
 
-    lsp = {
+  lsp = {
-      hint = icons.hint,
+    hint = icons.hint,
-      info = icons.info,
+    info = icons.info,
-      warning = icons.warn,
+    warning = icons.warn,
-      error = icons.error,
+    error = icons.error,
-    },
+  },
-  }
+}
 
-  -- set up args
+-- set up args
-  local args = {
+local args = {
-    auto_close = true,
+  auto_close = true,
-    diagnostics = {
+  diagnostics = {
-      enable = true,
+    enable = true,
-    },
+  },
-    update_focused_file = {
+  update_focused_file = {
-      enable = true,
+    enable = true,
-      ignore_list = {},
+    ignore_list = {},
-    },
+  },
-  }
+}
 
-  require('nvim-tree').setup(args)
+require('nvim-tree').setup(args)
-end
-
-return M

lua/cosmic/core/file-explorer/mappings.lua

@@ -1,4 +1,4 @@
 local map = require('cosmic.utils').map
 
-map('n', '<C-n>', ':NvimTreeToggle<CR>', { noremap = true })
+map('n', '<C-n>', ':NvimTreeToggle<CR>')
-map('n', '<leader>r', ':NvimTreeRefresh<CR>', { noremap = true })
+map('n', '<leader>r', ':NvimTreeRefresh<CR>')

lua/cosmic/core/navigation/init.lua

@@ -1,7 +1,18 @@
 local actions = require('telescope.actions')
-local mappings = require('cosmic.core.navigation.mappings').mappings()
 local icons = require('cosmic.core.theme.icons')
 
+local default_mappings = {
+  n = {
+    ['Q'] = actions.smart_add_to_qflist + actions.open_qflist,
+    ['q'] = actions.smart_send_to_qflist + actions.open_qflist,
+    ['<tab>'] = actions.toggle_selection + actions.move_selection_next,
+    ['<s-tab>'] = actions.toggle_selection + actions.move_selection_previous,
+    ['v'] = actions.file_vsplit,
+    ['s'] = actions.file_split,
+    ['<cr>'] = actions.file_edit,
+  },
+}
+
 local opts_cursor = {
   initial_mode = 'normal',
   sorting_strategy = 'ascending',
@@ -58,11 +69,11 @@ require('telescope').setup({
   pickers = {
     buffers = {
       prompt_title = '✨ Search Buffers ✨',
-      mappings = vim.tbl_deep_extend('force', {
+      default_mappings = vim.tbl_deep_extend('force', {
         n = {
           ['d'] = actions.delete_buffer,
         },
-      }, mappings),
+      }, default_mappings),
       sort_mru = true,
       preview_title = false,
     },
@@ -74,33 +85,33 @@ require('telescope').setup({
     }),
     lsp_document_diagnostics = vim.tbl_deep_extend('force', opts_vertical, {
       prompt_title = 'Document Diagnostics',
-      mappings = mappings,
+      default_mappings = default_mappings,
     }),
     lsp_implementations = vim.tbl_deep_extend('force', opts_cursor, {
       prompt_title = 'Implementations',
-      mappings = mappings,
+      default_mappings = default_mappings,
     }),
     lsp_definitions = vim.tbl_deep_extend('force', opts_cursor, {
       prompt_title = 'Definitions',
-      mappings = mappings,
+      default_mappings = default_mappings,
     }),
     lsp_references = vim.tbl_deep_extend('force', opts_cursor, {
       prompt_title = 'References',
-      mappings = mappings,
+      default_mappings = default_mappings,
     }),
     find_files = {
       prompt_title = '✨ Search Project ✨',
-      mappings = mappings,
+      default_mappings = default_mappings,
       hidden = true,
     },
     git_files = {
       prompt_title = '✨ Search Git Project ✨',
-      mappings = mappings,
+      default_mappings = default_mappings,
       hidden = true,
     },
     live_grep = {
       prompt_title = '✨ Live Grep ✨',
-      mappings = mappings,
+      default_mappings = default_mappings,
     },
   },
 })

lua/cosmic/core/navigation/mappings.lua

@@ -1,30 +1,8 @@
 local map = require('cosmic.utils').map
-local M = {}
 
-function M.init()
+map('n', '<leader>p', ':Telescope find_files<CR>')
-  map('n', '<leader>p', ':Telescope find_files<CR>', { noremap = true })
+map('n', '<leader>f', ':Telescope git_files<CR>')
-  map('n', '<leader>f', ':Telescope git_files<CR>', { noremap = true })
+map('n', '<leader>k', ':Telescope buffers<CR>')
-  map('n', '<leader>k', ':Telescope buffers<CR>', { noremap = true })
+map('n', '<leader>s', ':Telescope live_grep<CR>')
-  map('n', '<leader>s', ':Telescope live_grep<CR>', { noremap = true })
+map('n', '<leader>gc', ':Telescope git_commits<CR>')
-  map('n', '<leader>gc', ':Telescope git_commits<CR>', { noremap = true })
+map('n', '<leader>gs', ':Telescope git_status<CR>')
-  map('n', '<leader>gs', ':Telescope git_status<CR>', { noremap = true })
-end
-
-function M.mappings()
-  local actions = require('telescope.actions')
-  local normal = {
-    n = {
-      ['Q'] = actions.smart_add_to_qflist + actions.open_qflist,
-      ['q'] = actions.smart_send_to_qflist + actions.open_qflist,
-      ['<tab>'] = actions.toggle_selection + actions.move_selection_next,
-      ['<s-tab>'] = actions.toggle_selection + actions.move_selection_previous,
-      ['v'] = actions.file_vsplit,
-      ['s'] = actions.file_split,
-      ['<cr>'] = actions.file_edit,
-    },
-  }
-
-  return normal
-end
-
-return M

lua/cosmic/core/terminal/mappings.lua

@@ -1,8 +1,8 @@
 local map = require('cosmic.utils').map
 
-map('n', '<C-l>', ':FloatermToggle<CR>', { noremap = true })
+map('n', '<C-l>', ':FloatermToggle<CR>')
-map('t', '<C-l>', [[<C-\><C-n>]], { noremap = true })
+map('t', '<C-l>', [[<C-\><C-n>]])
-map('t', '<C-w>l', [[<C-\><C-n>:FloatermNext<CR>]], { noremap = true })
+map('t', '<C-w>l', [[<C-\><C-n>:FloatermNext<CR>]])
-map('t', '<C-w>h', [[<C-\><C-n>:FloatermPrev<CR>]], { noremap = true })
+map('t', '<C-w>h', [[<C-\><C-n>:FloatermPrev<CR>]])
-map('t', '<C-w>n', [[<C-\><C-n>:FloatermNew<CR>]], { noremap = true })
+map('t', '<C-w>n', [[<C-\><C-n>:FloatermNew<CR>]])
-map('t', '<C-w>c', [[<C-\><C-n>:FloatermKill<CR>]], { noremap = true })
+map('t', '<C-w>c', [[<C-\><C-n>:FloatermKill<CR>]])

lua/cosmic/editor.lua

@@ -32,7 +32,7 @@ opt.expandtab = true
 opt.wildmenu = true
 opt.ignorecase = true
 opt.smartcase = true
-opt.wildignore = opt.wildignore + { '*/node_modules/*', '*/wp-includes/*', '*/wp-admin/*', '*/vendor/*' }
+opt.wildignore = opt.wildignore + { '*/node_modules/*', '*/.git/*', '*/vendor/*' }
 opt.hlsearch = false
 
 -- ui

lua/cosmic/lsp/mappings.lua

@@ -1,33 +1,32 @@
 local map = require('cosmic.utils').map
 
 -- Mappings.
-local opts = { noremap = true, silent = true }
 
 -- See `:help vim.lsp.*` for documentation on any of the below functions
-map('n', 'gd', '<cmd>lua require("telescope.builtin").lsp_definitions()<cr>', opts)
+map('n', 'gd', '<cmd>lua require("telescope.builtin").lsp_definitions()<cr>')
-map('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
+map('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
-map('n', 'gi', '<cmd>lua require("telescope.builtin").lsp_implementations()<cr>', opts)
+map('n', 'gi', '<cmd>lua require("telescope.builtin").lsp_implementations()<cr>')
-map('n', 'gt', '<cmd>lua require("telescope.builtin").lsp_type_definitions()<cr>', opts)
+map('n', 'gt', '<cmd>lua require("telescope.builtin").lsp_type_definitions()<cr>')
-map('n', 'gr', '<cmd>lua require("telescope.builtin").lsp_references()<cr>', opts)
+map('n', 'gr', '<cmd>lua require("telescope.builtin").lsp_references()<cr>')
-map('n', 'gn', '<cmd>lua require("cosmic.core.theme.ui").rename()<cr>', opts)
+map('n', 'gn', '<cmd>lua require("cosmic.core.theme.ui").rename()<cr>')
 
 -- diagnostics
-map('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<cr>', opts)
+map('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
-map('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<cr>', opts)
+map('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<cr>')
-map('n', 'ge', '<cmd>lua vim.diagnostic.open_float(0, { scope = "line", })<cr>', opts)
+map('n', 'ge', '<cmd>lua vim.diagnostic.open_float(0, { scope = "line", })<cr>')
-map('n', '<leader>ge', '<cmd>lua require("telescope.builtin").lsp_document_diagnostics()<cr>', opts)
+map('n', '<leader>ge', '<cmd>lua require("telescope.builtin").lsp_document_diagnostics()<cr>')
-map('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
+map('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>')
-map('n', '<leader>ga', '<cmd>lua require("telescope.builtin").lsp_code_actions()<cr>', opts)
+map('n', '<leader>ga', '<cmd>lua require("telescope.builtin").lsp_code_actions()<cr>')
-map('v', '<leader>ga', '<cmd>lua require("telescope.builtin").lsp_range_code_actions()<cr>', opts)
+map('v', '<leader>ga', '<cmd>lua require("telescope.builtin").lsp_range_code_actions()<cr>')
-map('n', '<leader>gf', '<cmd>lua vim.lsp.buf.formatting()<cr>', opts)
+map('n', '<leader>gf', '<cmd>lua vim.lsp.buf.formatting()<cr>')
-map('n', '<C-K>', '<cmd>lua require("lsp_signature").signature()<cr>', opts)
+map('n', '<C-K>', '<cmd>lua require("lsp_signature").signature()<cr>')
 
 -- lsp workspace
-map('n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<cr>', opts)
+map('n', '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<cr>')
-map('n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<cr>', opts)
+map('n', '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<cr>')
-map('n', '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<cr>', opts)
+map('n', '<leader>wl', '<cmd>lua vim.notify(vim.inspect(vim.lsp.buf.list_workspace_folders()))<cr>')
 
 -- typescript helpers
-map('n', '<leader>gr', ':TSLspRenameFile<CR>', opts)
+map('n', '<leader>gr', ':TSLspRenameFile<CR>')
-map('n', '<leader>go', ':TSLspOrganize<CR>', opts)
+map('n', '<leader>go', ':TSLspOrganize<CR>')
-map('n', '<leader>gi', ':TSLspImportAll<CR>', opts)
+map('n', '<leader>gi', ':TSLspImportAll<CR>')

lua/cosmic/mappings.lua

@@ -1,12 +1,18 @@
 local map = require('cosmic.utils').map
 
 -- Quickfix
-map('n', '<leader>ck', ':cexpr []<CR>', { noremap = true })
+map('n', '<leader>ck', ':cexpr []<cr>')
-map('n', '<leader>cc', ':cclose <CR>', { noremap = true })
+map('n', '<leader>cc', ':cclose <cr>')
-map('n', '<leader>co', ':copen <CR>', { noremap = true })
+map('n', '<leader>co', ':copen <cr>')
-map('n', '<leader>cf', ':cfdo %s/', { noremap = true })
+map('n', '<leader>cf', ':cfdo %s/')
 
-require('cosmic.core.navigation.mappings').init()
+map('n', '<leader>cp', ':cprev <cr>')
+map('n', '<leader>cn', ':cnext <cr>')
+
+map('n', '<leader>bp', ':bprev <cr>')
+map('n', '<leader>bn', ':bnext <cr>')
+
+require('cosmic.core.navigation.mappings')
 require('cosmic.core.file-explorer.mappings')
 require('cosmic.core.terminal.mappings')
 require('cosmic.lsp.mappings')

lua/cosmic/pluginsInit.lua

@@ -89,7 +89,7 @@ return packer.startup(function()
   use({
     'kyazdani42/nvim-tree.lua',
     config = function()
-      require('cosmic.core.file-explorer').init()
+      require('cosmic.core.file-explorer')
     end,
     opt = true,
     cmd = {

lua/cosmic/utils.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 function M.map(mode, lhs, rhs, opts)
-  local options = { noremap = true }
+  local options = { noremap = true, silent = true }
   if opts then
     options = vim.tbl_extend('force', options, opts)
   end