update: neovim config instructions (#58)

* update: neovim install instructions

* update: neovim configuration instructions

* chore: styling

* suggested neovim config changes as per DrKJeff

* update link for learning more about neovim config

Author: carsakiller

src/content/wiki/configuration.mdx

@@ -44,7 +44,7 @@ Other settings like [`workspace.library`](/wiki/settings#workspace-library) _sho
 
 ### Neovim
 
-Below are some examples for getting set up in Neovim in different environments.
+Below are some examples for getting set up in Neovim using different tools:
 
 <AccordionGroup>
   <Accordion>
@@ -55,21 +55,45 @@ Below are some examples for getting set up in Neovim in different environments.
 Below is a minimal example showing how to set the runtime version of the language server.
 
 ```Lua
-require'lspconfig'.lua_ls.setup{
+vim.lsp.config('lua_ls', {
+  cmd = { 'lua-language-server' },
+  filetypes = { 'lua' },
+  -- Sets the "workspace" to the directory where any of these files is found.
+  root_markers = {
+    ".luarc.json",
+    ".luarc.jsonc",
+    ".luacheckrc",
+    ".stylua.toml",
+    ".git",
+  },
   settings = {
     Lua = {
       runtime = {
-        version = "LuaJIT"
+        version = 'LuaJIT',
       }
     }
   }
-}
+})
+
+-- Now that the language server is configured, it must be enabled
+vim.lsp.enable('lua_ls')
 ```
 
+See [github.com/neovim/nvim-lspconfig](https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#lua_ls) for a more detailed example.
+
 And here is an example that can be used when using Luarocks:
 
 ```Lua
-require'lspconfig'.lua_ls.setup{
+vim.lsp.config('lua_ls', {
+  cmd = { 'lua-language-server' },
+  filetypes = { 'lua' },
+  root_markers = {
+    ".luarc.json",
+    ".luarc.jsonc",
+    ".luacheckrc",
+    ".stylua.toml",
+    ".git",
+  },
   settings = {
     Lua = {
       runtime = {
@@ -91,7 +115,10 @@ require'lspconfig'.lua_ls.setup{
       }
     }
   }
-}
+})
+
+-- Now that the language server is configured, it must be enabled
+vim.lsp.enable('lua_ls')
 ```
 
   </Accordion>

src/pages/index.astro

@@ -217,57 +217,56 @@ const annotationCount = annotationsPage
         <div id="neovim-install">
           <h3>Neovim</h3>
           <div class="instructions">
-            <ol>
-              <li>
-                Install lua-language-server
-                <ol type="A">
-                  <li>
-                    From package manager
-                    <ul>
-                      <li>
-                        Scoop: <code>scoop install lua-language-server</code>
-                      </li>
+            <div>
+              <ol>
+                <li>
+                  Install lua-language-server
+                  <ol type="A">
+                    <li>
+                      From package manager
+                      <ul>
+                        <li>
+                          Scoop: <code>scoop install lua-language-server</code>
+                        </li>
+                        <li>
+                          Homebrew: <code>brew install lua-language-server</code
+                          >
+                        </li>
+                        <li>
+                          Macports: <code
+                            >sudo port install lua-language-server</code
+                          >
+                        </li>
+                      </ul>
                       <li>
-                        Homebrew: <code>brew install lua-language-server</code>
+                        From <ExternalLink
+                          url="https://github.com/LuaLS/lua-language-server/releases/latest"
+                        >
+                          latest release
+                        </ExternalLink>
                       </li>
                       <li>
-                        Macports: <code
-                          >sudo port install lua-language-server</code
+                        <a href="/wiki/build/" target="_blank"
+                          >Build from scratch</a
                         >
                       </li>
-                    </ul>
-                    <li>
-                      From <ExternalLink
-                        url="https://github.com/LuaLS/lua-language-server/releases/latest"
-                      >
-                        latest release
-                      </ExternalLink>
                     </li>
-                    <li>
-                      <a href="/wiki/build/" target="_blank"
-                        >Build from scratch</a
-                      >
-                    </li>
-                  </li>
-                </ol>
-              </li>
-              <li>
-                Ensure that the <code>lua-language-server</code> is executable from
-                the command line. It may need to be added to <code>$PATH</code>.
-              </li>
-              <li>
-                In your Neovim configuration file, add the following:
-                <!-- prettier-ignore -->
-                <CodeBlock language="Lua"><pre>require'lspconfig'.lua_ls.setup&#123;&#125;</pre></CodeBlock>
-              </li>
-              <li>
-                See the <ExternalLink
-                  url="https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#lua_ls"
-                >
-                  Neovim documentation for more
-                </ExternalLink>
-              </li>
-            </ol>
+                  </ol>
+                </li>
+                <li>
+                  Ensure that the <code>lua-language-server</code> is executable
+                  from the command line. It may need to be added to <code
+                    >$PATH</code
+                  >.
+                </li>
+                <li>
+                  See <ExternalLink
+                    url="https://neovim.io/doc/user/lsp.html#lsp-quickstart"
+                    >Neovim's quickstart guide for language servers</ExternalLink
+                  >
+                </li>
+              </ol>
+            </div>
           </div>
         </div>
         <div id="jetbrains-install">