snippets: search luasnip with telescope

- Adds a keymap to search for snippets with telescope.
- Improves the markdown snippets.

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

README.md

@@ -10,7 +10,7 @@ tags: [neovim, editor, configuration, README]
 This new configuration is written with the help of:
 
 - [`kickstart.nvim`][4]. This is a good project to kickstart a configuration,
-  but then it takes time to understand what it makes, how to use it, and how to
+  but then it takes time to understand what it does, how to use it, and how to
   modify it.
 - *[Tutoriel : configurer Neovim comme IDE/éditeur de code à partir de
   zéro][5]*. This blog post, in French, helped me a lot to understand better my
@@ -41,12 +41,12 @@ I'm using a virtual environment for the python provider, as the
 
 ## Plugins
 
-I won't provide links for each of these plugins as they are easily to be found.
+I don't provide links for each of these plugins as they are easy to be found.
 
-- `lazy.nvim` as plugins manager.
+- `lazy.nvim` as plugin manager.
 - `plenary` to get lua functions used by many plugins.
 - Adwaita for the colorscheme.
-- `which-key.nvim` to find out shortkeys.
+- `which-key.nvim` to find out keybindings.
 - `nvim-tree` as file explorer.
 - `telescope.nvim` for the fuzzy finder interface. It has some specific
   dependencies:
@@ -76,11 +76,9 @@ I won't provide links for each of these plugins as they are easily to be found.
   - `cmp-emoji` for emoji completion after ':'.
   - `lspkind.nvim` to add text symbols to spot the type of source completion.
 - Language servers:
-  - `lsp-zero.nvim` to ease LSP configuration.
   - `nvim-lspconfig` to configure LSP support and completion, with
     dependencies:
     - `cmp-nvim-lsp` to get LSP results in completion.
-    - `nvim-lsp-file-operations` to add some code actions.
     - `fidget.nvim` for LSP progress message and neovim notifications.
   - `mason.nvim` with `mason-lspconfig.nvim` to install automatically the
     needed LSP. And also with `mason-tool-installer` to extend it's package

after/ftplugin/json.lua

@@ -2,7 +2,7 @@
 --   Use treesitter for folding
 --   Disable the color column
 
-vim.opt.foldmethod="expr"
+vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
-vim.opt.foldexpr="nvim_treesitter#foldexpr()"
+vim.wo[0][0].foldmethod = 'expr'
 vim.opt.foldlevel=3
 vim.opt.colorcolumn=""

lua/core/keymaps.lua

@@ -33,7 +33,7 @@ local highlight_group = vim.api.nvim_create_augroup(
 )
 vim.api.nvim_create_autocmd('TextYankPost', {
   callback = function()
-    vim.highlight.on_yank()
+    vim.hl.on_yank()
   end,
   group = highlight_group,
   pattern = '*',

lua/plugins/lsp/lsp-zero.lua

@@ -1,10 +0,0 @@
--- Install lsp-zero, to ease LSP support configuration
---  https://lsp-zero.netlify.app
---  https://github.com/VonHeikemen/lsp-zero.nvim/
-
-return {
-  "VonHeikemen/lsp-zero.nvim",
-  branch = "v4.x",
-  lazy = true,
-  config = false,
-}

lua/plugins/lsp/lspconfig.lua

@@ -6,155 +6,21 @@ return {
   dependencies = {
     -- Send LSP results to autocompletion nvim-cmp
     "hrsh7th/cmp-nvim-lsp",
-    -- Adds code actions, such as smart file renaming, etc
-    { "antosha417/nvim-lsp-file-operations", config = true },
     -- 💫 Extensible UI for Neovim notifications and LSP progress messages
     { 'j-hui/fidget.nvim', tag = "legacy", opts = {} },
   },
   config = function()
-    -- Import lsp-zero
-    local lsp_zero = require("lsp-zero")
 
-    -- Activate some functionalities when a LSP is activated to the current
+  vim.diagnostic.config({
-    -- file
+      signs = {
-    local lsp_attach = function(_, bufnr)
+        text = {
-      local opts = { buffer = bufnr, silent = true }
+          [vim.diagnostic.severity.ERROR] = " ",
-
+          [vim.diagnostic.severity.WARN] = " ",
-      -- Keymaps
+          [vim.diagnostic.severity.HINT] = "󰠠 ",
-
+          [vim.diagnostic.severity.INFO] = " ",
-      opts.desc = "[LSP] Show LSP references"
+        }
-      vim.keymap.set(
+      }
-        "n",
-        "gR",
-        "<cmd>Telescope lsp_references<CR>",
-        opts
-      )
-
-      opts.desc = "[LSP] Go to declaration"
-      vim.keymap.set(
-        "n",
-        "gD",
-        vim.lsp.buf.declaration,
-        opts
-      )
-
-      opts.desc = "[LSP] Show LSP definitions"
-      vim.keymap.set(
-        "n",
-        "gd",
-        "<cmd>Telescope lsp_definitions<CR>",
-        opts
-      )
-
-      opts.desc = "[LSP] Show LSP implementations"
-      vim.keymap.set(
-        "n",
-        "gi",
-        "<cmd>Telescope lsp_implementations<CR>",
-        opts
-      )
-
-      opts.desc = "[LSP] Show LSP type definitions"
-      vim.keymap.set(
-        "n",
-        "gt",
-        "<cmd>Telescope lsp_type_definitions<CR>",
-        opts
-      )
-
-      opts.desc = "[LSP] Show LSP signature help"
-      vim.keymap.set(
-        "n",
-        "gs",
-        vim.lsp.buf.signature_help,
-        opts
-      )
-
-      opts.desc = "[LSP] See available code actions"
-      vim.keymap.set(
-        { "n", "v" },
-        "<leader>ca",
-        vim.lsp.buf.code_action,
-        opts
-      )
-
-      opts.desc = "[LSP] Smart rename"
-      vim.keymap.set(
-        "n",
-        "<leader>rn",
-        vim.lsp.buf.rename,
-        opts
-      )
-
-      opts.desc = "[LSP] Show buffer diagnostics"
-      vim.keymap.set(
-        "n",
-        "<leader>D",
-        "<cmd>Telescope diagnostics bufnr=0<CR>",
-        opts
-      )
-
-      opts.desc = "[LSP] Show line diagnostics"
-      vim.keymap.set(
-        "n",
-        "<leader>d",
-        vim.diagnostic.open_float,
-        opts
-      )
-
-      opts.desc = "[LSP] Go to previous diagnostic"
-      vim.keymap.set("n", "[d", function()
-        vim.diagnostic.jump({ count = -1, float = true })
-      end, opts) -- jump to previous diagnostic in buffer
-
-      opts.desc = "[LSP] Go to next diagnostic"
-      vim.keymap.set("n", "]d", function()
-        vim.diagnostic.jump({ count = 1, float = true })
-      end, opts) -- jump to next diagnostic in buffer
-
-      opts.desc = "[LSP] Show documentation for what is under cursor"
-      vim.keymap.set(
-        "n",
-        "K",
-        vim.lsp.buf.hover,
-        opts
-      )
-
-      opts.desc = "[LSP] Format buffer"
-      vim.keymap.set(
-        { "n", "x" },
-        "F",
-        "<cmd>lua vim.lsp.buf.format({async = true})<cr>",
-        opts
-      )
-
-      opts.desc = "[LSP] Restart LSP"
-      vim.keymap.set(
-        "n",
-        "<leader>rs",
-        ":LspRestart<CR>",
-        opts
-      )
-    end
-
-    lsp_zero.extend_lspconfig({
-      -- Display diagnostic signs in the sign column
-      sign_text = true,
-      -- Attach the keymap function
-      lsp_attach = lsp_attach,
-      -- Extend the default completion capabilities by LSP suggestions
-      capabilities = require("cmp_nvim_lsp").default_capabilities(),
     })
 
-    -- Use lsp_zero to configure interface
-    lsp_zero.ui({
-      float_border = "rounded",
-      sign_text = {
-        error = " ",
-        warn = " ",
-        hint = "󰠠 ",
-        info = " ",
-      },
-    })
   end,
 }

lua/plugins/lsp/mason.lua

@@ -1,139 +1,67 @@
--- Install and configure mason.nvim which will install automatically the needed
+-- New LSP configuration (since neovim 0.11+)
--- LSP
 
 return {
-  "williamboman/mason.nvim",
+  'mason-org/mason-lspconfig.nvim',
   dependencies = {
-    "williamboman/mason-lspconfig.nvim",
+    'mason-org/mason.nvim',
-    "WhoIsSethDaniel/mason-tool-installer.nvim",
+    'neovim/nvim-lspconfig',
+    'WhoIsSethDaniel/mason-tool-installer.nvim',
   },
   config = function()
-    -- Import mason
-    local mason = require("mason")
 
-    -- Import mason-lspconfig
+    require("mason").setup({
-    local mason_lspconfig = require("mason-lspconfig")
-
-    -- Import lspconfig
-    local lspconfig = require("lspconfig")
-
-    local util = require("lspconfig.util")
-
-    -- Import mason-tool-installer 
-    local mason_tool_installer = require("mason-tool-installer")
-
-    -- Activate mason and set icones
-    mason.setup({
       ui = {
         icons = {
           package_installed = "✓",
           package_pending = "➜",
           package_uninstalled = "✗",
-        },
+        }
-      },
+      }
     })
 
-    mason_tool_installer.setup({
+    require("mason-tool-installer").setup({
       ensure_installed = {
-        "black",
-        "isort",
         "prettier",
+        "ruff",
         "stylua",
         "tree-sitter-cli",
       }
     })
 
-    mason_lspconfig.setup({
+    require("mason-lspconfig").setup({
-      -- LSP to be installed by default
-      -- Available LSP: https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
-      -- LSP can be installed with :Mason
-      -- But installing LSP through the following list is better
       ensure_installed = {
         "cssls",
         "html",
         "jsonls",
         "lua_ls",
         "marksman",
-        "pylsp",
+        "ty",
+        "ruff",
         "yamlls",
       },
-      handlers = {
-        -- Function called for each LSP from the ensure_installed list loaded
-        function(server_name)
-          -- Activate all LSP from the ensure_installed list with its default
-          -- configuration
-          lspconfig[server_name].setup({})
-        end,
-
-        -- Then, configure each LSP as needed
-        --  See https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
-        --
-        -- To deactivate a LSP:
-        -- lsp_name = require("lsp-zero").noop,
-
-        -- The LSP name before`= function()` has to be the same than after
-        --  `lspconfig.`
-        -- The first one is the mason_lspconfig key, the seconde one is the
-        --  lspconfig key. They are identical to the ensure_installed entries.
-
-        -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#pylsp
-        pylsp = function()
-          lspconfig.pylsp.setup({
-            settings = {
-              pylsp = {
-                plugins = {
-                  pyflakes = { enabled = false },
-                  pycodestyle = {
-                    enabled = true,
-                    ignore = { "E501" },
-                  },
-                },
-              },
-            },
     })
-        end,
 
-        lua_ls = function()
+    vim.lsp.config.marksman = {
-          lspconfig.lua_ls.setup({
+        filetypes = { "markdown", "quarto" },
-            settings = {
+        root_dir = vim.fs.root(0, {
-              Lua = {
+          ".git",
-                diagnostics = {
+          ".marksman.toml",
-                  -- Force LSP to recognize global variable `vim`.
+          "._quarto.yml"
-                  globals = { "vim" },
-                  disable = { "missing-fields" },
-                }
-              }
-            }
         })
-        end,
+      }
 
-        jsonls = function()
+    vim.lsp.config.jsonls = {
-            lspconfig.jsonls.setup({
       settings = {
         json = {
-                  schemas = require("schemastore").json.schemas(),
+          schemas = require('schemastore').json.schemas(),
           validate =  { enable = true },
         }
       }
-            })
+    }
-        end,
 
-        marksman = function()
+    vim.lsp.config('*', {
-          lspconfig.marksman.setup({
+      capabilities = require('cmp_nvim_lsp').default_capabilities(),
-            setting = {
-              filetypes = {
-                "markdown",
-                "quarto",
-              },
-            root_dir = util.root_pattern(
-              '.git',
-              '.marksman.toml',
-              '_quarto.yml'
-              ),
-            }
     })
+
   end
-      },
-    })
-  end,
 }

lua/plugins/nvim-cmp.lua

@@ -110,6 +110,8 @@ return {
           },
         },
         { name = "path" },
+        { name = "ty" },
+        { name = "ruff" },
         { name = "emoji" },
       }),
 
@@ -128,10 +130,14 @@ return {
             nvim_lua = "[Lua]",
             lazydev = "[Lazydev]",
             path = "[Path]",
+            ty = "[Ty]",
+            ruff = "[Ruff]",
             emoji = "[Emoji]",
           },
         }),
       },
+
+
     })
 
   end,

lua/plugins/nvim-tree.lua

@@ -19,7 +19,7 @@ return {
     -- <leader>e to toggle the explorer buffer 
     vim.keymap.set(
       "n",
-      "<leader>e",
+      "<leader>n",
       "<cmd>NvimTreeFindFileToggle<CR>",
       { desc = "[nvim-tree] Toggle the file explorer" }
     )

lua/plugins/telescope.lua

@@ -131,5 +131,14 @@ return {
       "<cmd>Telescope keymaps<cr>",
       { desc = "[Telescope] [S]earch [K]eymaps" }
     )
+
+    --  <leader>ss to search for keymaps
+    vim.keymap.set(
+      "n",
+      "<leader>ss",
+      "<cmd>Telescope luasnip<cr>",
+      { desc = "[Telescope] [S]earch [S]nippets" }
+    )
+
   end,
 }

lua/plugins/treesitter.lua

@@ -1,19 +1,5 @@
 -- Diagnostic keymaps
 
-vim.keymap.set(
-  'n',
-  '[d',
-  vim.diagnostic.goto_prev,
-  { desc = "[Diagnostic] Go to previous diagnostic message" }
-)
-
-vim.keymap.set(
-  'n',
-  ']d',
-  vim.diagnostic.goto_next,
-  { desc = "[Diagnostic] Go to next diagnostic message" }
-)
-
 vim.keymap.set(
   'n',
   '<leader>e',

lua/plugins/venv-selector.lua

@@ -3,7 +3,7 @@
 
 return {
   'linux-cultist/venv-selector.nvim',
-  branch = 'regexp',
+  -- branch = 'regexp',
   dependencies = {
     'neovim/nvim-lspconfig',
     'nvim-telescope/telescope.nvim',

md.lua

@@ -0,0 +1,55 @@
+-- TODO: Rewrite it accordingly to new configuration.
+-- TODO: Also, make it actually minimal. 😉
+
+-- Set <space> as the leader key
+-- See `:help mapleader`
+--  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+
+-- Minimal options
+--  Display relative line numbers
+--  Except to the active line
+vim.opt.relativenumber = true
+vim.opt.number = true
+
+-- Enable mouse mode
+vim.opt.mouse = 'a'
+
+-- 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)
+
+require('lazy').setup({
+
+  {
+    "Mofiqul/adwaita.nvim",
+    lazy = false,
+    priority = 1000,
+    config = function()
+      vim.cmd('colorscheme adwaita')
+    end
+  },
+  {
+    "iamcco/markdown-preview.nvim",
+    ft = {
+      'pandoc',
+      'markdown',
+    },
+    lazy = true,
+    build = "cd app && npm install && git reset --hard",
+  },
+
+})

minit.lua

@@ -34,13 +34,13 @@ vim.opt.rtp:prepend(lazypath)
 
 require('lazy').setup({
 
-  -- {
+  {
-  --   "Mofiqul/adwaita.nvim",
+    "Mofiqul/adwaita.nvim",
-  --   lazy = false,
+    lazy = false,
-  --   priority = 1000,
+    priority = 1000,
-  --   config = function()
+    config = function()
-  --     vim.cmd('colorscheme adwaita')
+      vim.cmd('colorscheme adwaita')
-  --   end
+    end
-  -- },
+  },
 
 })

my_snippets/markdown.lua

@@ -71,7 +71,7 @@ return {
   s(
     {
       trig = "ie",
-      Name = "Inc entry",
+      Name = "[journal] Inc entry",
       dscr = "Insert an Inc entry for today (heading level 2)."
     },
     fmt(
@@ -97,7 +97,7 @@ return {
       title: {1}
       date: {3}
       id: {4}
-      tags: [{2}]
+      tags: ["{2}"]
       ---
 
       ]],
@@ -112,7 +112,7 @@ return {
   s(
     {
       trig = "inc",
-      name = "INC YAML frontmatter",
+      name = "[journal] INC YAML frontmatter",
       dscr = "Insert a YAML frontmatter for INC notes.\n\nIt has a datetime with the locale daylight saving time, prefilled title, author, categories and tags.\nAdjust the title manually."
     },
     fmt(
@@ -121,7 +121,7 @@ return {
         title: {1}
         date: {2}
         id: {4}
-        tags: [notes, quotidien, {3}]
+        tags: ["notes", "quotidien", "{3}"]
         ---
 
       ]],
@@ -145,7 +145,7 @@ return {
         title: {3}
         date: {4}
         id: {5}
-        tags: [{1}]
+        tags: ["{1}"]
         séance:
           - type: "{2}"
         données: