nvim: update

vim/.config/nvim/init.lua

@@ -3,15 +3,22 @@
 -- Description: Personal neovim configuration
 
 local cmd, fn, opt, g = vim.cmd, vim.fn, vim.opt, vim.g
-local command = vim.api.nvim_create_user_command
 
 require('impatient') -- Should be at the top
 require('filetypes').config()
 
 cmd [[packadd packer.nvim]]
-local packer = require 'packer'
+local packer = require('packer')
 local use = packer.use
 
+-- NB: Difference between config and setup (https://github.com/wbthomason/packer.nvim#specifying-plugins)
+--
+-- `config` - Specifies code to run after this plugin is loaded.
+--
+-- The setup key implies opt = true
+-- `setup` - Specifies code to run before this plugin is loaded. The code is ran even if
+--           the plugin is waiting for other conditions (ft, cond...) to be met.
+
 packer.startup(function()
   -- Lua
   use { 'wbthomason/packer.nvim', opt = true }
@@ -19,10 +26,10 @@ packer.startup(function()
   use 'nvim-lua/plenary.nvim'
   use { 'shaunsingh/nord.nvim',
     config = function()
-      require('plugins/nord').config()
+      require('plugins.nord').config()
     end,
     setup = function()
-      require('plugins/nord').setup()
+      require('plugins.nord').setup()
     end
   }
   use {
@@ -31,7 +38,17 @@ packer.startup(function()
       event = { 'BufRead', 'BufNewFile' },
       config = function()
         require('plugins/treesitter').config()
-      end
+      end,
+      requires = {
+        {
+          'nvim-treesitter/nvim-treesitter-textobjects',
+          after = 'nvim-treesitter'
+        },
+        {
+          'nvim-treesitter/playground',
+          cmd = 'TSPlaygroundToggle',
+        }
+      }
   }
   use 'nvim-tree/nvim-tree.lua'
   use 'numtostr/comment.nvim'
@@ -49,13 +66,13 @@ packer.startup(function()
     end
   }
 
-  use "jose-elias-alvarez/null-ls.nvim"
-
+  -- TODO: make sense of it
+  -- use "jose-elias-alvarez/null-ls.nvim"
 
   -- Vimscript
   use 'junegunn/vim-easy-align'
   use 'christoomey/vim-tmux-navigator'
-  use 'airblade/vim-gitgutter'
+  use 'lewis6991/gitsigns.nvim'
 
   -- tpope
   use 'tpope/vim-surround'
@@ -68,12 +85,13 @@ packer.startup(function()
   use 'vim-test/vim-test'
   use 'benmills/vimux'
 
+  -- TODO: find lua replacement / or learn :grep / cfdo
   use 'dyng/ctrlsf.vim'
 
-  use 'AndrewRadev/splitjoin.vim'
+  use 'andrewradev/splitjoin.vim'
 
   use {
-    'VonHeikemen/lsp-zero.nvim',
+    'vonheikemen/lsp-zero.nvim',
     requires = {
       -- LSP Support
       {'neovim/nvim-lspconfig'},
@@ -95,125 +113,20 @@ packer.startup(function()
   }
 
   use { "dstein64/vim-startuptime", cmd = "StartupTime" }
+
+  -- EXPERIMENTAL: trying out different plugins
+  use { 'phaazon/hop.nvim' }
 end)
 
 require('builtins')
-require 'plugins/gitgutter'
-require 'plugins/lsp'
-require 'plugins/nord'
-require 'plugins/nvim-tree'
-require 'plugins/comment'
-require 'plugins/mason'
-require 'plugins/null-ls'
-require 'plugins/telescope'
-
-cmd('au TextYankPost * lua vim.highlight.on_yank { timeout = 250 }')
-
-g.ruby_host_prog = 'asdf exec neovim-ruby-host'
-
-opt.smartindent   = true            -- Autoindenting when starting a new line
-opt.completeopt = {'menu', 'menuone', 'noselect'}
-opt.tabstop       = 2               -- Tab counts as 2 columns
-opt.shiftwidth    = 2               -- Numbers of spaces to (auto)indent
-opt.expandtab     = true            -- Tabs to spaces
-opt.clipboard     = 'unnamedplus'   -- Share clipboard with the OS
-opt.number        = true            -- Display line numbers
-opt.fillchars = {
-  vert = '▕',   -- alternatives │
-  eob = ' ',    -- suppress ~ at EndOfBuffer
-  msgsep = '‾',
-  diff = '⣿',
-  fold = ' ',
-  foldopen = '▾',
-  foldsep = '│',
-  foldclose = '▸',
-}
-opt.synmaxcol     = 500             -- Do not try to highlight lines longer than 500 characters
-opt.lazyredraw    = true            -- Do not redraw while running macros
-opt.showmatch     = true            -- Show matching braces
-opt.matchtime     = 2               -- Show matching braces for 2 tenths of second
-opt.showmode      = true            -- Shows when you are in insert mode
-opt.title         = true            -- Show title in console status bar
-opt.laststatus    = 3               -- Single status line
-opt.wrap          = false           -- Dont wrap lines
-opt.scrolloff     = 5               -- Keep 5 rows on the screen when scrolling
-opt.sidescrolloff = 15              -- Horizontal scrolloff
-opt.visualbell    = false           -- No visual bell
-opt.backup        = false           -- No backups
-opt.writebackup   = false           -- No backups
-opt.swapfile      = false           -- No backups
-opt.mouse         = 'a'             -- Support mouse (for proper mouse highlight)
-opt.list          = true            -- List mode
-opt.listchars     = { trail = '·', tab = '->' }
-opt.timeoutlen    = 1000            -- Delay for mappings
-opt.ttimeoutlen   = 0               -- Delay between modes
-opt.shellcmdflag  = '-ilc'          -- Enables aliases from .bashrc in :! commands
-opt.termguicolors = true            -- 24-bit RGB color
-
-
-if vim.fn.executable('rg') > 0 then
-  vim.o.grepprg = [[rg --glob "!.git" --no-heading --vimgrep --follow $*]]
-end
-
--- Use in vertical diff mode, blank lines to keep sides aligned, Ignore whitespace changes
-opt.diffopt = vim.opt.diffopt
-  + {
-    'vertical',
-    'iwhite',
-    'hiddenoff',
-    'foldcolumn:0',
-    'context:4',
-    'algorithm:histogram',
-    'indent-heuristic',
-  }
-
-opt.shortmess = {
-  t = true, -- truncate file messages at start
-  A = true, -- ignore annoying swap file messages
-  o = true, -- file-read message overwrites previous
-  O = true, -- file-read message overwrites previous
-  T = true, -- truncate non-file messages in middle
-  f = true, -- (file x of x) instead of just (x of x
-  F = true, -- Don't give file info when editing a file, NOTE: this breaks autocommand messages
-  s = true,
-  I = true, -- disable welcome message (:intro)
-  a = true, -- shortmess for everything
-  c = true,
-  W = true, -- Don't show [w] or written when writing
-}
-
--- ignore when autocompleting
-opt.wildignore = {
-  '*.aux', '*.out', '*.toc', '*.o', '*.obj',
-  '*.dll', '*.jar', '*.pyc', '*.rbc', '*.class',
-  '*.gif', '*.ico', '*.jpg', '*.jpeg', '*.png',
-  '*.avi', '*.wav', '*.*~', '*~ ', '*.swp',
-  '.lock', '.DS_Store', 'tags.lock'
-}
-
--- vim-test
-g['test#strategy'] = 'neovim'
-
--- CtrlSF
-g.ctrlsf_ackprg         = 'rg'
-g.ctrlsf_regex_pattern  = 1
-g.ctrlsf_case_sensitive = 'smart'
-g.ctrlsf_default_root   = 'project'
-g.ctrlsf_context        = '-B 1 -A 1'
-g.ctrlsf_position       = 'bottom'
-g.ctrlsf_winsize        = '40%'
-g.ctrlsf_mapping        = {
-  next = 'n',
-  prev = 'N',
-}
-
-local function trim_trailing_whitespace()
-    local pos = vim.api.nvim_win_get_cursor(0)
-    vim.cmd [[silent keepjumps keeppatterns %s/\s\+$//e]]
-    vim.api.nvim_win_set_cursor(0, pos)
-end
-command('TrimWhitespace', trim_trailing_whitespace, {})
-
--- vim.cmd("set shell='bash -l'")
-
+require('plugins.gitgutter')
+require('plugins.lsp')
+require('plugins.nvim-tree')
+require('plugins.comment')
+require('plugins.gitsigns')
+-- require('plugins.mason')
+-- require('plugins.null-ls')
+require('plugins.hop')
+require('util')
+require('settings')
 require('mappings')