From 47fbd07ef1a04c04f939df2ad6e6d2f0a160ff4d Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 24 Sep 2023 17:29:35 +0000
Subject: [PATCH] Snippets and more language servers for nvim

---
 flake.lock    | 18 +++++++++---------
 sets/nvim.nix |  8 +++++++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4bef615..1dbab8a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695224363,
-        "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=",
+        "lastModified": 1695550077,
+        "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00",
+        "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091",
         "type": "github"
       },
       "original": {
@@ -245,11 +245,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1695109627,
-        "narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=",
+        "lastModified": 1695541019,
+        "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a",
+        "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296",
         "type": "github"
       },
       "original": {
@@ -260,11 +260,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695145219,
-        "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=",
+        "lastModified": 1695360818,
+        "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96",
+        "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
         "type": "github"
       },
       "original": {
diff --git a/sets/nvim.nix b/sets/nvim.nix
index d0d6884..25a36b4 100644
--- a/sets/nvim.nix
+++ b/sets/nvim.nix
@@ -19,6 +19,7 @@
       fugitive.enable = true;
       gitgutter.enable = true;
       lualine.enable = true;
+      typst-vim.enable = true;
       telescope = {
         enable = true;
         keymaps = {
@@ -74,10 +75,12 @@
       servers = {
         clangd.enable = true;
         java-language-server.enable = true;
+        jsonls.enable = true;
         nil_ls.enable = true;
         pylsp.enable = true;
         texlab.enable = true;
-        jsonls.enable = true;
+        tsserver.enable = true;
+        typst-lsp.enable = true;
       };
 
       keymaps = {
@@ -119,12 +122,15 @@
 
     # Autocomplete
     plugins = {
+      luasnip.enable = true;
       cmp-cmdline.enable = true;
       cmp-git.enable = true;
       cmp-buffer.enable = true;
       nvim-cmp = {
         enable = true;
+        snippet.expand = "luasnip";
         sources = [
+          { name = "luasnip"; }
           { name = "nvim_lsp"; }
           { name = "path"; }
           { name = "calc"; }