Better modules

lua/core/bootstrap-plugin-manager.lua

@@ -0,0 +1,15 @@
+-- Install package manager
+--    https://github.com/folke/lazy.nvim
+--    `:help lazy.nvim.txt` for more info
+local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system {
+    'git',
+    'clone',
+    '--filter=blob:none',
+    'https://github.com/folke/lazy.nvim.git',
+    '--branch=stable', -- latest stable release
+    lazypath,
+  }
+end
+vim.opt.rtp:prepend(lazypath)

lua/core/keymaps/async/language-servers.lua

@@ -0,0 +1,38 @@
+return function(buffer)
+  local nmap = require("core.utils").createNmap({
+    buffer = buffer,
+    desc = 'LSP: ',
+  })
+
+  nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
+  nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
+
+  nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
+  nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
+  nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
+  nmap('<leader>D', vim.lsp.buf.type_definition, 'Type [D]efinition')
+  nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
+  nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+
+  -- See `:help K` for why this keymap
+  nmap('M', vim.lsp.buf.hover, 'Hover Documentation')
+  nmap('<C-m>', vim.lsp.buf.signature_help, 'Signature Documentation')
+
+  -- Lesser used LSP functionality
+  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
+  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
+  nmap('<leader>wl', function()
+    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+  end, '[W]orkspace [L]ist Folders')
+
+  -- nvim-ufo mappings
+  nmap("zR", require("ufo").openAllFolds, "Open All Folds")
+  nmap("zM", require("ufo").closeAllFolds, "Close All Folds")
+  nmap("zj", function()
+    local winid = require("ufo").peekFoldedLinesUnderCursor()
+    if not winid then
+      vim.lsp.buf.hover()
+    end
+  end, "Peek At Current Fold")
+end

lua/core/keymaps/async/tsserver.lua

@@ -0,0 +1,8 @@
+return function(buffer, cmds)
+  local nmap = require("core.utils").createNmap({
+    buffer = buffer,
+    desc = 'LSP: ',
+  })
+
+  nmap('<leader>oi', cmds.organize_imports, 'OrganizeImports')
+end

lua/core/keymaps/file-search.lua

@@ -0,0 +1,16 @@
+local function fuzzyFindFiles()
+  require('telescope.builtin').grep_string({
+    path_display = { 'smart' },
+    only_sort_text = true,
+    word_match = "-w",
+    search = '',
+  })
+end
+
+vim.keymap.set('n', '<C-p>', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
+vim.keymap.set('n', 'K', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
+vim.keymap.set('n', '<C-a>', fuzzyFindFiles, { desc = '[S]earch by [G]rep' })
+vim.keymap.set('n', '<C-s>', require('telescope.builtin').live_grep, { desc = '[S]earch Live Exact Match' })
+vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
+vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
+vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })

lua/core/keymaps/general.lua

@@ -0,0 +1,37 @@
+-- [[ General Keymaps ]]
+
+vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
+
+-- Remap for dealing with word wrap
+vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+
+-- Stop yanking on paste
+vim.keymap.set('x', 'p', 'P')
+
+-- [[ Highlight on yank ]]
+-- See `:help vim.highlight.on_yank()`
+local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
+vim.api.nvim_create_autocmd('TextYankPost', {
+  callback = function()
+    vim.highlight.on_yank()
+  end,
+  group = highlight_group,
+  pattern = '*',
+})
+
+-- Esc functionality
+vim.keymap.set("n", "<Esc>", function()
+  -- Clear terminal notification below
+  vim.notify("")
+  -- Removes highlight search
+  vim.cmd.noh()
+
+  vim.cmd(':silent! Neotree cancel<cr>')
+end, { silent = true })
+
+-- Split resize
+vim.keymap.set('n', '<C-j>', ':res +1<cr>', { desc = 'Resize split' })
+vim.keymap.set('n', '<C-k>', ':res -1<cr>', { desc = 'Resize split' })
+vim.keymap.set('n', '<C-h>', ':vertical res -1<cr>', { desc = 'Resize split vertically' })
+vim.keymap.set('n', '<C-l>', ':vertical res +1<cr>', { desc = 'Resize split vertically' })

lua/core/keymaps/init.lua

@@ -0,0 +1,6 @@
+local import = require('core.utils').createImporter("core.keymaps")
+
+import('general')
+import('project-tree')
+import('file-search')
+import('diagnostics')

lua/core/keymaps/project-tree.lua

@@ -0,0 +1,4 @@
+-- Neotree mappings
+
+vim.keymap.set('n', '<leader><space>', ':Neotree toggle<cr>', { desc = 'File tree' })
+vim.keymap.set('n', '<leader>nf', ':Neotree filesystem reveal<cr>', { desc = 'Reveal in file tree' })

lua/core/plugins/init.lua

@@ -0,0 +1,141 @@
+-- Plugin declarations
+
+local plugins = {
+  -- :Git/:G
+  'tpope/vim-fugitive',
+  -- :GBrowse on github
+  'tpope/vim-rhubarb',
+
+  -- Detect tabstop and shiftwidth automatically (Editor Config taken into account)
+  'tpope/vim-sleuth',
+
+  -- This is where plugins related to LSP can be installed.
+  -- The configuration is done below. Search for lspconfig to find it below.
+  {
+    -- LSP Configuration & Plugins
+    'neovim/nvim-lspconfig',
+    dependencies = {
+      -- Automatically install LSPs to stdpath for neovim
+      { 'williamboman/mason.nvim', config = true },
+      'williamboman/mason-lspconfig.nvim',
+
+      -- Useful status updates for LSP
+      {
+        'j-hui/fidget.nvim',
+        tag = 'legacy',
+        opts = {}
+      },
+
+      -- Additional lua configuration, makes nvim stuff amazing!
+      'folke/neodev.nvim',
+    },
+  },
+
+  {
+    -- Autocompletion
+    'hrsh7th/nvim-cmp',
+    dependencies = {
+      -- Snippet Engine & its associated nvim-cmp source
+      'L3MON4D3/LuaSnip',
+      'saadparwaiz1/cmp_luasnip',
+
+      -- Adds LSP completion capabilities
+      'hrsh7th/cmp-nvim-lsp',
+
+      -- Adds a number of user-friendly snippets
+      'rafamadriz/friendly-snippets',
+    },
+  },
+
+  -- Useful plugin to show you pending keybinds.
+  {
+    'folke/which-key.nvim',
+    opts = {}
+  },
+
+  {
+    -- Theme inspired by Atom
+    'Mofiqul/dracula.nvim',
+    priority = 1000,
+    lazy = false,
+    config = function()
+      vim.cmd.colorscheme 'dracula'
+    end,
+  },
+
+  {
+    -- Set lualine as statusline
+    'nvim-lualine/lualine.nvim',
+    -- See `:help lualine.txt`
+    opts = {
+      options = {
+        icons_enabled = true,
+        theme = 'dracula',
+        component_separators = '|',
+        section_separators = { left = '', right = '' },
+      },
+    },
+  },
+
+  {
+    -- Add indentation guides even on blank lines
+    'lukas-reineke/indent-blankline.nvim',
+    -- Enable `lukas-reineke/indent-blankline.nvim`
+    -- See `:help indent_blankline.txt`
+    opts = {
+      char = '┊',
+      show_trailing_blankline_indent = false,
+    },
+  },
+
+  -- "gc" to comment visual regions/lines
+  {
+    'numToStr/Comment.nvim',
+    opts = {}
+  },
+
+  -- Fuzzy Finder (files, lsp, etc)
+  { 'nvim-telescope/telescope.nvim', branch = '0.1.x', dependencies = { 'nvim-lua/plenary.nvim' } },
+
+  -- Fuzzy Finder Algorithm which requires local dependencies to be built.
+  -- Only load if `make` is available. Make sure you have the system
+  -- requirements installed.
+  {
+    'nvim-telescope/telescope-fzf-native.nvim',
+    -- NOTE: If you are having trouble with this installation,
+    --       refer to the README for telescope-fzf-native for more instructions.
+    build = 'make',
+    cond = function()
+      return vim.fn.executable 'make' == 1
+    end,
+  },
+
+  {
+    -- Highlight, edit, and navigate code
+    'nvim-treesitter/nvim-treesitter',
+    dependencies = {
+      'nvim-treesitter/nvim-treesitter-textobjects',
+    },
+    build = ':TSUpdate',
+  },
+
+  -- Multiple cursors
+  {
+    "mg979/vim-visual-multi",
+    branch = "master"
+  },
+
+  -- require plugins with more complex config
+
+  require 'core.plugins.todo-comments',
+
+  require 'core.plugins.neo-tree',
+
+  require 'core.plugins.nvim-ufo',
+
+  require 'kickstart.plugins.autoformat',
+}
+
+local pluginOptions = {}
+
+require('lazy').setup(plugins, pluginOptions)

lua/core/plugins/neo-tree.lua

@@ -0,0 +1,20 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  branch = "v3.x",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+    "MunifTanjim/nui.nvim",
+  },
+  config = function()
+    require('neo-tree').setup {
+      filesystem = {
+        filtered_items = {
+          visible = true,
+          hide_hidden = false,
+          hide_gitignored = true,
+        }
+      },
+    }
+  end,
+}

lua/core/plugins/nvim-ufo.lua

@@ -0,0 +1,88 @@
+local handler = function(virtText, lnum, endLnum, width, truncate)
+  local newVirtText = {}
+  local suffix = (' 󰁂 %d '):format(endLnum - lnum)
+  local sufWidth = vim.fn.strdisplaywidth(suffix)
+  local targetWidth = width - sufWidth
+  local curWidth = 0
+  for _, chunk in ipairs(virtText) do
+    local chunkText = chunk[1]
+    local chunkWidth = vim.fn.strdisplaywidth(chunkText)
+    if targetWidth > curWidth + chunkWidth then
+      table.insert(newVirtText, chunk)
+    else
+      chunkText = truncate(chunkText, targetWidth - curWidth)
+      local hlGroup = chunk[2]
+      table.insert(newVirtText, { chunkText, hlGroup })
+      chunkWidth = vim.fn.strdisplaywidth(chunkText)
+      -- str width returned from truncate() may less than 2nd argument, need padding
+      if curWidth + chunkWidth < targetWidth then
+        suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
+      end
+      break
+    end
+    curWidth = curWidth + chunkWidth
+  end
+  table.insert(newVirtText, { suffix, 'MoreMsg' })
+  return newVirtText
+end
+
+local function applyFoldsAndThenCloseAllFolds(bufnr, providerName)
+  require('async')(function()
+    bufnr = bufnr or vim.api.nvim_get_current_buf()
+    -- make sure buffer is attached
+    require('ufo').attach(bufnr)
+    -- getFolds return Promise if providerName == 'lsp'
+    local ok, ranges = pcall(await, require('ufo').getFolds(bufnr, providerName))
+    if ok and ranges then
+      ok = require('ufo').applyFolds(bufnr, ranges)
+      if ok then
+        require('ufo').closeFoldsWith(1)
+      end
+    end
+  end)
+end
+
+return {
+  "kevinhwang91/nvim-ufo",
+  dependencies = {
+    "kevinhwang91/promise-async",
+    {
+      "luukvbaal/statuscol.nvim",
+      config = function()
+        local builtin = require("statuscol.builtin")
+        require("statuscol").setup({
+          relculright = true,
+          segments = {
+            { text = { builtin.foldfunc },      click = "v:lua.ScFa" },
+            { text = { "%s" },                  click = "v:lua.ScSa" },
+            { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
+          },
+        })
+      end,
+    },
+  },
+  event = "VeryLazy",
+  init = function()
+    vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
+    vim.o.foldcolumn = '1'
+    vim.o.foldlevel = 99
+    vim.o.foldlevelstart = 99
+    vim.o.foldenable = true
+  end,
+  config = function(_, opts)
+    local newOpts = {
+      fold_virt_text_handler = handler
+    }
+
+    for k, v in pairs(newOpts) do opts[k] = v end
+
+    require("ufo").setup(newOpts)
+
+    vim.api.nvim_create_autocmd('BufWinEnter', {
+      pattern = '*',
+      callback = function(e)
+        applyFoldsAndThenCloseAllFolds(e.buf, 'lsp')
+      end
+    })
+  end,
+}

lua/core/plugins/todo-comments.lua

@@ -0,0 +1,76 @@
+-- Highlight comment keywords like:
+
+-- PERF
+-- HACK
+-- TODO
+-- NOTE
+-- FIX
+-- WARNING
+-- TEST
+
+return {
+  "folke/todo-comments.nvim",
+  dependencies = { "nvim-lua/plenary.nvim" },
+  lazy = false,
+  config = function()
+    local colors = require('dracula').colors()
+
+    require('todo-comments').setup({
+      signs = true,      -- show icons in the signs column
+      sign_priority = 8, -- sign priority
+
+      TODO = { icon = " ", color = "info" },
+      PERF = { icon = " ", color = "default", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE" } },
+      HACK = { icon = "✇ ", color = "warning" },
+      WARN = { icon = " ", color = "warning", alt = { "WARNING", "XXX" } },
+      NOTE = { icon = "✐", color = "hint", alt = { "INFO" } },
+      TEST = { icon = "⏲ ", color = "test", alt = { "TESTING", "PASSED", "FAILED" } },
+      FIX = { icon = " ", color = "error", alt = { "FIXME", "BUG", "FIXIT", "ISSUE" } },
+
+      gui_style = {
+        fg = "NONE",         -- The gui style to use for the fg highlight group.
+        bg = "BOLD",         -- The gui style to use for the bg highlight group.
+      },
+      merge_keywords = true, -- when true, custom keywords will be merged with the defaults
+
+      highlight = {
+        multiline = true,         -- enable multine todo comments
+        multiline_pattern = "^.", -- lua pattern to match the next multiline from the start of the matched keyword
+        multiline_context = 10,   -- extra lines that will be re-evaluated when changing a line
+        before = "",              -- "fg" or "bg" or empty
+        keyword = "bg",           -- "fg", "bg", "wide", "wide_bg", "wide_fg" or empty. (wide and wide_bg is the same as bg, but will also highlight surrounding characters, wide_fg acts accordingly but with fg)
+        after = "fg",             -- "fg" or "bg" or empty
+        pattern = [[(KEYWORDS)]], -- pattern or table of patterns, used for highlighting (vim regex)
+        comments_only = true,     -- uses treesitter to match keywords in comments only
+        max_line_len = 400,       -- ignore lines longer than this
+        exclude = {},             -- list of file types to exclude highlighting
+      },
+
+      -- list of named colors where we try to extract the guifg from the
+      -- list of highlight groups or use the hex color if hl not found as a fallback
+      colors = {
+        error = colors.red,
+        warning = colors.yellow,
+        info = colors.cyan,
+        hint = colors.purple,
+        default = colors.pink,
+        test = colors.green,
+      },
+
+      search = {
+        command = "rg",
+        args = {
+          "--color=never",
+          "--no-heading",
+          "--with-filename",
+          "--line-number",
+          "--column",
+        },
+        -- regex that will be used to match keywords.
+        -- don't replace the (KEYWORDS) placeholder
+        pattern = [[(KEYWORDS)]], -- ripgrep regex
+        -- pattern = [[\b(KEYWORDS)\b]], -- match without the extra colon. You'll likely get false positives
+      },
+    })
+  end
+}

lua/core/settings/init.lua

@@ -0,0 +1,44 @@
+-- [[ Setting options ]]
+
+-- Sets <space> as the <leader> key
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+
+-- Disale Swap Files
+vim.opt.swapfile = false
+
+-- Set highlight on search
+vim.o.hlsearch = true
+
+-- Make line numbers default
+vim.wo.number = true
+
+-- Enable mouse mode
+vim.o.mouse = 'a'
+
+-- Sync clipboard between OS and Neovim.
+vim.o.clipboard = 'unnamedplus'
+
+-- Enable break indent
+vim.o.breakindent = true
+
+-- Save undo history
+vim.o.undofile = true
+
+-- Case-insensitive searching UNLESS \C or capital in search
+-- vim.o.ignorecase = true
+vim.o.smartcase = true
+
+-- Keep signcolumn on by default
+vim.wo.signcolumn = 'yes'
+
+-- Decrease update time
+vim.o.updatetime = 250
+vim.o.timeout = true
+vim.o.timeoutlen = 300
+
+-- Set completeopt to have a better completion experience
+vim.o.completeopt = 'menuone,noselect'
+
+-- NOTE: You should make sure your terminal supports this
+vim.o.termguicolors = true

lua/core/setup/completion-engine.lua

@@ -0,0 +1,48 @@
+-- [[ Configure nvim-cmp ]]
+
+-- See `:help cmp`
+local cmp = require 'cmp'
+local luasnip = require 'luasnip'
+require('luasnip.loaders.from_vscode').lazy_load()
+luasnip.config.setup {}
+
+cmp.setup {
+  snippet = {
+    expand = function(args)
+      luasnip.lsp_expand(args.body)
+    end,
+  },
+  mapping = cmp.mapping.preset.insert {
+    ['<C-n>'] = cmp.mapping.select_next_item(),
+    ['<C-p>'] = cmp.mapping.select_prev_item(),
+    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ['<C-Space>'] = cmp.mapping.complete {},
+    ['<CR>'] = cmp.mapping.confirm {
+      behavior = cmp.ConfirmBehavior.Replace,
+      select = true,
+    },
+    ['<Tab>'] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif luasnip.expand_or_locally_jumpable() then
+        luasnip.expand_or_jump()
+      else
+        fallback()
+      end
+    end, { 'i', 's' }),
+    ['<S-Tab>'] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_prev_item()
+      elseif luasnip.locally_jumpable(-1) then
+        luasnip.jump(-1)
+      else
+        fallback()
+      end
+    end, { 'i', 's' }),
+  },
+  sources = {
+    { name = 'nvim_lsp' },
+    { name = 'luasnip' },
+  },
+}

lua/core/setup/file-search.lua

@@ -0,0 +1,18 @@
+-- [[ Configure Telescope ]]
+
+-- See `:help telescope` and `:help telescope.setup()`
+require('telescope').setup {
+  defaults = {
+    mappings = {
+      i = {
+        ['<C-u>'] = false,
+        ['<C-d>'] = false,
+      },
+    },
+  },
+}
+
+-- Enable telescope fzf native, if installed
+pcall(require('telescope').load_extension, 'fzf')
+
+-- See `:help telescope.builtin`

lua/core/setup/init.lua

@@ -0,0 +1,6 @@
+local import = require('core.utils').createImporter("core.setup")
+
+import('file-search')
+import('syntax-highlight')
+import('language-servers')
+import('completion-engine')

lua/core/setup/language-servers.lua

@@ -0,0 +1,81 @@
+local servers = {
+  -- clangd = {},
+  -- gopls = {},
+  -- pyright = {},
+  -- rust_analyzer = {},
+  tsserver = {},
+
+  lua_ls = {
+    Lua = {
+      workspace = { checkThirdParty = false },
+      telemetry = { enable = false },
+    },
+  },
+}
+
+-- Setup neovim lua configuration
+require('neodev').setup()
+
+-- nvim-cmp supports additional completion capabilities,
+-- so broadcast that to servers
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
+
+-- Ensure the servers above are installed
+local mason_lspconfig = require 'mason-lspconfig'
+
+mason_lspconfig.setup {
+  ensure_installed = vim.tbl_keys(servers),
+}
+
+local lspKeymaps = require('core.keymaps.async.language-servers')
+
+local on_attach = function(_, bufnr)
+  lspKeymaps(bufnr)
+end
+
+mason_lspconfig.setup_handlers {
+  function(server_name)
+    require('lspconfig')[server_name].setup {
+      capabilities = capabilities,
+      on_attach = on_attach,
+      settings = servers[server_name],
+    }
+  end,
+}
+
+-- Tsserver run organize imports command
+local function organize_imports()
+  local params = {
+    command = "_typescript.organizeImports",
+    arguments = { vim.api.nvim_buf_get_name(0) },
+    title = ""
+  }
+  vim.lsp.buf.execute_command(params)
+end
+
+local tsserverKeymaps = require('core.keymaps.async.tsserver')
+
+local tsserver_on_attach = function(_, bufnr)
+  lspKeymaps(bufnr)
+
+  tsserverKeymaps(bufnr, {
+    organize_imports = organize_imports
+  })
+end
+
+require('lspconfig').tsserver.setup {
+  on_attach = tsserver_on_attach,
+  capabilities = capabilities,
+  init_options = {
+    preferences = {
+      disableSuggestions = true
+    }
+  },
+  commands = {
+    OrganizeImports = {
+      organize_imports,
+      description = "Organize Imports"
+    }
+  }
+}

lua/core/setup/syntax-highlight.lua

@@ -0,0 +1,67 @@
+-- [[ Configure Treesitter ]]
+
+-- See `:help nvim-treesitter`
+require('nvim-treesitter.configs').setup {
+  -- Add languages to be installed here that you want installed for treesitter
+  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'javascript', 'vimdoc', 'vim' },
+
+  -- Autoinstall languages that are not installed.
+  -- Defaults to false (but you can change for yourself!)
+  auto_install = false,
+
+  highlight = { enable = true },
+  indent = { enable = true },
+  incremental_selection = {
+    enable = true,
+    keymaps = {
+      init_selection = '<c-space>',
+      node_incremental = '<c-space>',
+      scope_incremental = '<c-s>',
+      node_decremental = '<M-space>',
+    },
+  },
+  textobjects = {
+    select = {
+      enable = true,
+      lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
+      keymaps = {
+        -- You can use the capture groups defined in textobjects.scm
+        ['aa'] = '@parameter.outer',
+        ['ia'] = '@parameter.inner',
+        ['af'] = '@function.outer',
+        ['if'] = '@function.inner',
+        ['ac'] = '@class.outer',
+        ['ic'] = '@class.inner',
+      },
+    },
+    move = {
+      enable = true,
+      set_jumps = true, -- whether to set jumps in the jumplist
+      goto_next_start = {
+        [']m'] = '@function.outer',
+        [']]'] = '@class.outer',
+      },
+      goto_next_end = {
+        [']M'] = '@function.outer',
+        [']['] = '@class.outer',
+      },
+      goto_previous_start = {
+        ['[m'] = '@function.outer',
+        ['[['] = '@class.outer',
+      },
+      goto_previous_end = {
+        ['[M'] = '@function.outer',
+        ['[]'] = '@class.outer',
+      },
+    },
+    swap = {
+      enable = true,
+      swap_next = {
+        ['<leader>a'] = '@parameter.inner',
+      },
+      swap_previous = {
+        ['<leader>A'] = '@parameter.inner',
+      },
+    },
+  },
+}

lua/core/utils.lua

@@ -0,0 +1,24 @@
+local createImporter = function(path)
+  return function(module)
+    require(path .. "." .. module)
+  end
+end
+
+local createNmap = function(opts)
+  return function(keys, func, _desc)
+    if opts.desc then
+      _desc = opts.desc .. _desc
+    end
+
+    local newOpts = { desc = _desc }
+
+    for k, v in pairs(newOpts) do opts[k] = v end
+
+    vim.keymap.set('n', keys, func, newOpts)
+  end
+end
+
+return {
+  createImporter = createImporter,
+  createNmap = createNmap,
+}