From 539646493ac3c05470a44650794d36228894110c Mon Sep 17 00:00:00 2001
From: Bad <bad@badat.dev>
Date: Sat, 20 Aug 2022 00:04:16 +0200
Subject: [PATCH] Switch over to nvim-lsp

---
 flake.lock                    | 42 +++++++++++++++++------------------
 users/modules/neovim/html.nix | 15 +++++++++++++
 users/modules/neovim/rust.nix |  5 ++++-
 3 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 users/modules/neovim/html.nix

diff --git a/flake.lock b/flake.lock
index fa3b9bb..c7522ea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1657835815,
-        "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
+        "lastModified": 1660649317,
+        "narHash": "sha256-16sWaj3cTZOQQgrmzlvBSRaBFKLrHJrfYh1k7/sSWok=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "54a24f042f93c79f5679f133faddedec61955cf2",
+        "rev": "80871c71edb3da76d40bdff9cae007a2a035c074",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1645603310,
-        "narHash": "sha256-/CTQuJzFK8pO2d4S5uKhHwT+QiNfnbCKSx7O2tW0GXQ=",
+        "lastModified": 1660857879,
+        "narHash": "sha256-1ch9zkr3tgU/q3OLBy7m3KefVlKrQIWDRYcb9aFmOJ0=",
         "owner": "input-output-hk",
         "repo": "deploy-rs",
-        "rev": "feb44f80c634c799a661bf27c5cb4a905640fe93",
+        "rev": "f81eb2b23291a0e3430703d92b6cbcefac7734d7",
         "type": "github"
       },
       "original": {
@@ -169,11 +169,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1660458418,
-        "narHash": "sha256-vBWAv4QhXa9VmyaJUsTfQmKs+uw83Pfv/FmN5GD3KkE=",
+        "lastModified": 1660890677,
+        "narHash": "sha256-Pjo7boTFANtflin0ESiwhFIrtCfss0z2DjEbKMjeFh8=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "54253fb23a5871466ada5c0334b6e39a0bcdb4db",
+        "rev": "dca822b67ddf0af52f9b63feaeefc1668c8635c0",
         "type": "github"
       },
       "original": {
@@ -379,11 +379,11 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1660396586,
-        "narHash": "sha256-ePuWn7z/J5p2lO7YokOG1o01M0pDDVL3VrStaPpS5Ig=",
+        "lastModified": 1660819943,
+        "narHash": "sha256-TRZV/mlW1eYuojqDC3ueYWj7jsTKXJCtyMLNYX/Ybtw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e105167e98817ba9fe079c6c3c544c6ef188e276",
+        "rev": "8ea014acc33da95ea56c902229957d8225005163",
         "type": "github"
       },
       "original": {
@@ -415,11 +415,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1660406417,
-        "narHash": "sha256-ekKl2IWxAEjwrAtE//PgR95UcvqFK+FaT4kR5XFcdjQ=",
+        "lastModified": 1660749083,
+        "narHash": "sha256-GHLFMGH+r3OmI4tV0x/RtxN7DkHcH2ZOhK8uzQeSLiY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d816f474aa79d020a75cc3e69113759e32aabc2e",
+        "rev": "a55a7db823959cf509d55325201f1864af4574b9",
         "type": "github"
       },
       "original": {
@@ -446,11 +446,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1660305968,
-        "narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=",
+        "lastModified": 1660646295,
+        "narHash": "sha256-V4G+egGRc3elXPTr7QLJ7r7yrYed0areIKDiIAlMLC8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d",
+        "rev": "762b003329510ea855b4097a37511eb19c7077f0",
         "type": "github"
       },
       "original": {
@@ -567,11 +567,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1660416638,
-        "narHash": "sha256-DllHrfAUUjg0tBYvj32jr4NQZrH0dC9sRiBPqN8C03w=",
+        "lastModified": 1660838778,
+        "narHash": "sha256-SpV0kKZ5b0+w6y15x7ZvBTjxOiAfqgyPq5SWpHDxoV4=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "010f68cacfdddcc50234b54965e1326d7ad925ab",
+        "rev": "917bd68b37de4e60e7203061a0a9c23b74d2b5c2",
         "type": "github"
       },
       "original": {
diff --git a/users/modules/neovim/html.nix b/users/modules/neovim/html.nix
new file mode 100644
index 0000000..60ac5b0
--- /dev/null
+++ b/users/modules/neovim/html.nix
@@ -0,0 +1,15 @@
+{ lib, pkgs, config, ... }:
+let
+  cfg = config.mae.nvim.html;
+in
+with lib;
+{
+  options.mae.nvim.html.enable = mkEnableOption "Enable html/css support in nvim";
+  config = mkIf cfg.nix.enable {
+    programs.neovim = {
+      plugins = with pkgs.vimPlugins; [
+        emmet-vim
+      ];
+    };
+  };
+}
diff --git a/users/modules/neovim/rust.nix b/users/modules/neovim/rust.nix
index b4972bd..1de4c8f 100644
--- a/users/modules/neovim/rust.nix
+++ b/users/modules/neovim/rust.nix
@@ -11,7 +11,10 @@ with lib;
       enable = true;
       script = ''
         {
-          cmd = { "${pkgs.rust-analyzer}/bin/rust-analyzer" }
+          cmd = { "${pkgs.rust-analyzer}/bin/rust-analyzer" },
+          settings = {
+            ["rust-analyzer"] = { cargo = { features = "all" } }
+          }
         }
       '';
     };