Better modules

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
+}