Merge remote-tracking branch 'origin/master' into single-statically-linked-binary

.github/workflows/continuous-integration.yml

@@ -36,7 +36,7 @@ jobs:
         fetch-depth: 0
 
     - name: Installing Nix
-      uses: cachix/install-nix-action@v14.1
+      uses: cachix/install-nix-action@v16
       with:
         nix_path: nixpkgs=channel:nixos-unstable
         extra_nix_config: |

.github/workflows/update-flake-lock.yml

@@ -16,4 +16,4 @@ jobs:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v3
+        uses: DeterminateSystems/update-flake-lock@v6

README.md

@@ -88,15 +88,13 @@ abstractions or just feel ad hoc. Nickel buys you more for less.
 2. Run your first program:
   ```console
   $ ./nickel <<< 'let x = 2 in x + x'
-  Typechecked: Ok(Types(Dyn))
-  Done: Num(4.0)
+  4
   ```
   Or load it from a file:
   ```console
   $ echo 'let s = "world" in "Hello, " ++ s' > program.ncl
   $ ./nickel -f program.ncl
-  Typechecked: Ok(Types(Dyn))
-  Done: Str("Hello, world")
+  "Hello, world"
   ```
 3. Start a REPL:
   ```console
@@ -119,6 +117,12 @@ abstractions or just feel ad hoc. Nickel buys you more for less.
 Use `nickel help` for a list of subcommands, and `nickel help <subcommand>`
 for help about a specific subcommand.
 
+#### Editor Setup
+
+Nickel has syntax highlighting plugins for Vim/Neovim, and VSCode.
+In-editor diagnostics, type hints, and auto-completion are provided by the Nickel Language Server.
+Please follow [this guide](https://github.com/tweag/nickel/tree/master/lsp) to setup syntax highlighting and NLS.
+
 ### Build
 
 [rust-guide]: https://doc.rust-lang.org/cargo/getting-started/installation.html

lsp/README.md

@@ -103,6 +103,14 @@ The VS Code extension offers three configuration options:
 
 ### (Neo)Vim
 
+Before proceeding install the [Nickel syntax highlighting plugin](https://github.com/nickel-lang/vim-nickel) using your Vim plugin manager.
+Without this plugin your LSP client may not start NLS on nickel source files.
+
+With Vim-Plug:
+```vim
+Plug 'nickel-lang/vim-nickel'
+```
+
 #### Neovim builtin LSP
 
 `nls` is supported in