git: ignore the spell directory

Co-Authored-by: iGor milhit <igor@milhit.ch>

.gitignore

@@ -6,7 +6,7 @@ autoload
 .netrwhist
 
 # spell *.spl
-spell/fr.utf-8.add.spl
+spell/
 
 tags
 test.sh

after/ftplugin/json.lua

@@ -0,0 +1,8 @@
+-- Specific settings for JSON files
+--   Use treesitter for folding
+--   Disable the color column
+
+vim.opt.foldmethod="expr"
+vim.opt.foldexpr="nvim_treesitter#foldexpr()"
+vim.opt.foldlevel=3
+vim.opt.colorcolumn=""

init.lua

@@ -87,7 +87,7 @@ require('lazy').setup({
 
       -- Useful status updates for LSP
       -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim', opts = {} },
+      { 'j-hui/fidget.nvim', tag = "legacy", opts = {} },
 
       -- Additional lua configuration, makes nvim stuff amazing!
       'folke/neodev.nvim',
@@ -106,6 +106,9 @@ require('lazy').setup({
       -- Adds LSP completion capabilities
       'hrsh7th/cmp-nvim-lsp',
 
+      -- Adds completion capabilities for text in buffers
+      'hrsh7th/cmp-buffer',
+
       -- Adds path completion capabilities
       'hrsh7th/cmp-path',
 
@@ -195,8 +198,13 @@ require('lazy').setup({
     end,
   },
 
+  -- Extension to telescope to use Ag (or ripgrep) to filter results
   {
+    'kelly-lin/telescope-ag'
+  },
+
   -- Allow to search for snippets
+  {
     'benfowler/telescope-luasnip.nvim'
   },
 
@@ -234,6 +242,10 @@ vim.opt.rtp:append (vim.fn.stdpath ('data') .. '/site')
 -- Set highlight on search
 vim.o.hlsearch = true
 
+-- Preview changes when searching and substituing
+--   nosplit avoid to display the preview in a separate split
+vim.o.inccommand = "nosplit"
+
 -- Make line numbers default
 vim.wo.number = true
 
@@ -242,10 +254,6 @@ vim.opt.textwidth = 79
 -- Display the cusor column at 79+1 column
 vim.opt.colorcolumn:append('+1')
 
--- Set text formatting options
---   'a' is for autoformat
--- vim.opt.formatoptions:append('a')
-
 -- Enable mouse mode
 vim.o.mouse = 'a'
 
@@ -325,7 +333,10 @@ require('telescope').setup {
 
 -- Enable telescope fzf native, if installed
 pcall(require('telescope').load_extension, 'fzf')
+-- Enable telescope luasnip extension, if installed
 pcall(require('telescope').load_extension, 'luasnip')
+-- Enable telescope-ag extension, if installed
+pcall(require('telescope').load_extension, 'ag')
 
 -- See `:help telescope.builtin`
 vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
@@ -351,7 +362,7 @@ vim.keymap.set('n', '<leader>ss', require'telescope'.extensions.luasnip.luasnip
 -- 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', 'vimdoc', 'vim' },
+  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim', 'json' },
 
   -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
   auto_install = false,
@@ -505,6 +516,11 @@ local servers = {
       }
     }
   },
+
+  -- Require vscode-langservers-extracted
+  --   https://github.com/hrsh7th/vscode-langservers-extracted
+  jsonls = {
+  },
 }
 
 -- Setup neovim lua configuration
@@ -531,7 +547,7 @@ mason_lspconfig.setup_handlers {
   end,
 }
 
--- [[ Configure nvim-cmp ]]
+-- [[ Configure nvim-cmp, and LuaSnip ]]
 -- See `:help cmp`
 local cmp = require 'cmp'
 local luasnip = require 'luasnip'
@@ -548,6 +564,14 @@ luasnip.config.setup {
 -- Load snippets from ~/.config/nvim/LuaSnip/
 require("luasnip.loaders.from_lua").load({paths = "~/.config/nvim/my_snippets/"})
 
+-- Keymap to reload snippets
+--   https://www.ejmastnak.com/tutorials/vim-latex/luasnip/#refreshing-snippets-from-a-separate-vim-instance
+vim.keymap.set('n', '<Leader>L', '<Cmd>lua require("luasnip.loaders.from_lua").load({paths = "~/.config/nvim/my_snippets/"})<CR>', { desc = 'Reload [L]uaSnippets' })
+
+-- [[ Configure nvim-cmp ]]
+-- See `:help cmp`
+local cmp = require 'cmp'
+
 cmp.setup {
   snippet = {
     expand = function(args)
@@ -585,6 +609,13 @@ cmp.setup {
   },
   sources = {
     { name = 'nvim_lsp' },
+    {
+      name = 'buffer',
+      option = {
+        keyword_length = 4,
+        keyword_pattern = [[\k\+]],
+      },
+    },
     { name = 'luasnip' },
     { name = 'path' },
   },

lua/custom/plugins/grammalecte.lua

@@ -0,0 +1,14 @@
+-- Plugin to get Grammalecte checks in (neo)vim.
+
+-- Set the path to the grammalecte-cli executable
+vim.cmd([[ let g:grammalecte_cli_py = "/usr/bin/grammalecte-cli" ]])
+
+return {
+  "dpelle/vim-Grammalecte",
+  ft = {
+    "pandoc",
+    "markdown",
+    "text",
+    "gitcommit"
+  }
+}

lua/custom/plugins/markdownpreview.lua

@@ -1,9 +1,6 @@
 -- makdown-preview.nvim
 -- installed with code found at https://github.com/iamcco/markdown-preview.nvim/issues/558#issuecomment-1514701537
 
--- Force the light theme, no matter the system option is.
-vim.cmd([[ let g:mkdp_theme = 'light' ]])
-
 return {
   {
     "iamcco/markdown-preview.nvim",
@@ -12,6 +9,6 @@ return {
       'markdown'
     },
     lazy = true,
-    build = "cd app && yarn install",
+    build = "cd app && npm install && git reset --hard",
   },
 }

lua/custom/plugins/mkdnflow.lua

@@ -22,6 +22,10 @@ return {
           markdown = true,
           pandoc = true
         },
+        perspective = {
+          -- Ensure that paths are relative to the current file
+          priority = "current"
+        },
         links = {
           conceal = true,
         },

lua/custom/plugins/toggleterm.lua

@@ -0,0 +1,16 @@
+-- A neovim lua plugin to help easily manage multiple terminal windows
+--   https://github.com/akinsho/toggleterm.nvim
+
+-- Set ZSH as shell to get it in a terminal buffer
+vim.opt.shell = "/usr/bin/zsh"
+
+return {
+  {
+    'akinsho/toggleterm.nvim',
+    version = "*",
+    opts = {
+      -- Avoid terminal to be darker than the Nord colorscheme
+      shade_terminals = false
+    }
+  }
+}

lua/custom/plugins/zen-mode.lua

@@ -22,7 +22,7 @@ return {
       width = 85,
       height = .8,
       options = {
-        -- Disable line numbering.
+        -- Disable line numbering, signcolumn and colorcolumn.
         number = false,
         signcolumn = "no",
       },

my_snippets/gitcommit.lua

@@ -0,0 +1,48 @@
+local ls = require("luasnip")
+local s = ls.snippet
+local t = ls.text_node
+local f = ls.function_node
+local fmt = require("luasnip.extras.fmt").fmt
+
+-- Function to get the current date
+local get_date = function()
+  return os.date("%Y-%m-%d")
+end
+
+return {
+  s(
+    {
+      trig = "hr",
+      name = "Heures",
+      dscr = "Insert a commit message for saving the worked hours."
+    },
+    {
+      t("organisation: enregistre les heures")
+    }
+  ),
+  s(
+    {
+      trig = "ic",
+      name = "Incremental note commit message",
+      dscr = "Insert a commit message for my incremental notes commits."
+    },
+    fmt(
+      [[
+      Incrémente la note du {1}
+      ]],
+      {
+        f(get_date, {})
+      }
+    )
+  ),
+  s(
+    {
+      trig = "aou",
+      name = "AoU stats commit message",
+      dscr = "Commit message for an increment of AoU validation statistics."
+    },
+    {
+      t("r+e: incrémente les stats de validation de l'AoU")
+    }
+  )
+}

my_snippets/html.lua

@@ -0,0 +1,111 @@
+-- My HTML snippets
+--   Below, the duplicate of brackets, for instance in the CSS code, is for
+--   escaping delimiters.
+
+-- Set the local variables (shortcuts)
+local ls = require("luasnip")
+local s = ls.snippet
+local i = ls.insert_node
+local fmt = require("luasnip.extras.fmt").fmt
+
+return {
+  -- A main snippet setting the outer structure, with the style tag.
+  --   Should be completed with the nested article item below.
+  s(
+    {
+      trig = "mcim",
+      name = "Main article structure for MC portal",
+      dscr = "Insert an HTML structure to add bibliographic description on the clinical medicine portal."
+    },
+    fmt(
+      [[
+        <article class="mc-{1}-main">
+          {2}  
+          <style>
+            .mc-{1}-item > ul > li {{
+              padding: 0 !important;
+            }}
+            .mc-{1}-item li:not([class])::before,
+            .mc-{1}-item li::before {{
+            content: none;
+            }}
+          </style>
+        </article>
+      ]],
+      {
+        i(1, "Class identifier"),
+        i(0)
+      },
+      {
+        repeat_duplicates = true
+      }
+    )
+  ),
+  -- Snippet that inserts an article with bibliographic metatada, to be nested
+  -- in the upper main structure.
+  s(
+    {
+      trig = "mcii",
+      name = "Item article structure for MC portal",
+      dscr = "Insert an HTML structure to add an item bibliographic description on the clinical medicine portal."
+    },
+    fmt(
+      [[
+          <article class="mc-{1}-item">
+            <ul>
+              <li>Dorland W. Dorland’s illustrated medical dictionary. 4th ed.</li>
+              <li>Philadelphia: Elsevier, 2020.</li>
+              <li>Cote : W 13 ed 4</li>
+              <li>
+                <a lang="fr"
+                   dir="ltr"
+                   type="html/text"
+                   href="https://slsp-unige.primo.exlibrisgroup.com/articleermalink/41SLSP_UGE/l0hvjc/alma991008098789705502"
+                   hreflang="français"
+                   rel="nofollow"
+                   target="_blank">
+                  Le document dans le catalogue Swisscovery
+                </a>.
+              </li>
+            </ul>
+            <span placeholder="coins metadata"></span>
+          </article>{2}
+      ]],
+      {
+        i(1, "Class identifier"),
+        i(0)
+      },
+      {
+        repeat_duplicates = true
+      }
+    )
+  ),
+  -- Snippet that insert a list item with a link to an ebook online.
+  s(
+    {
+      trig = "eli",
+      name = "List item for an ebook link",
+      dscr = "Insert a link for an ebook nested in a list item. Designed for the medicine portal HTML structure."
+    },
+    fmt(
+      [[
+      <li>
+        <a dir="ltr"
+           type="html/text"
+           href="{1}"
+           lang="{2}"
+           hreflang="{3}"
+           ref="nofollow"
+           target="_blank">
+          Livre électronique en ligne
+        </a>.
+      </li>
+      ]],
+      {
+        i(1, "Ebook URL"),
+        i(2, "Language code (2 chars)"),
+        i(3, "Language name")
+      }
+    )
+  )
+}

my_snippets/markdown.lua

@@ -40,7 +40,7 @@ end
 return {
   s(
     {
-      trig = "datetime",
+      trig = "dt",
       name = "Datetime",
       dscr = "Insert the current datetime with locale daylight saving."
     },
@@ -48,16 +48,6 @@ return {
       f(get_datetime, {})
     }
   ),
-  s(
-    {
-      trig = "date",
-      name = "Date",
-      dscr = "Insert the current date."
-    },
-    {
-      f(get_date, {})
-    }
-  ),
   s(
     {
       trig = "id",
@@ -78,6 +68,23 @@ return {
       f(get_day, {})
     }
   ),
+  s(
+    {
+      trig = "ie",
+      Name = "Inc entry",
+      dscr = "Insert an Inc entry for today (heading level 2)."
+    },
+    fmt(
+      [[
+      ## {}
+
+
+      ]],
+      {
+        f(get_day, {})
+      }
+    )
+  ),
   s(
     {
       trig = "fm",
@@ -112,9 +119,8 @@ return {
       [[
         ---
         title: {1}
-        creation_date: {2}
+        date: {2}
-        author: iGor milhit
+        id: {4}
-        categories: [inc]
         tags: [notes, quotidien, {3}]
         ---
 
@@ -122,7 +128,8 @@ return {
       {
         f(get_month_year, {}),
         f(get_datetime, {}),
-        f(get_month, {})
+        f(get_month, {}),
+        f(get_id, {})
       }
     )
   ),
@@ -137,15 +144,29 @@ return {
       [[
         [{1}][{2}]
 
-        [{2}]: {3} "{4}"
+        [{2}]: {3}
       ]],
       {
         i(1, "Link text"),
         i(2, "Reference"),
-        i(3, "Link target"),
+        i(3, "Link target")
-        i(4, "Title")
       },
       { repeat_duplicates = true }
     )
+  ),
+  s(
+    {
+      trig = "tags",
+      name = "Tags",
+      dscr = "Insert a one-line tags array, in a text file (markdown)."
+    },
+    fmt(
+      [[
+      tags: [{}]
+      ]],
+      {
+        i(1, "tags")
+      }
+    )
   )
 }

spell/en.utf-8.add

@@ -4,3 +4,10 @@ Séverine
 HEG
 neovim
 lua
+InfoBiblio
+Réaménagement
+biodiversité
+hyperindustrialisés
+lacto-fermentation
+d'engrain
+écorcheuse