From d0ced76a811896ddf02a40706659109ef0a84a0e Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Sat, 10 Jul 2021 14:12:30 -0400
Subject: [PATCH] Add nvim-lspconfig and several language servers

---
 common/packages.nix |  5 +++++
 flake.lock          |  6 +++---
 home/default.nix    |  5 +----
 home/nvim/init.vim  | 10 ++++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/common/packages.nix b/common/packages.nix
index 7eec49d..3b85df1 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -39,6 +39,11 @@ in
         starship
         tokei
 
+        # language servers
+        nodePackages.bash-language-server
+        nodePackages.yaml-language-server
+        nodePackages.pyright
+
         # productivity
         bat
         colordiff
diff --git a/flake.lock b/flake.lock
index 6fff9d1..d7cc052 100644
--- a/flake.lock
+++ b/flake.lock
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1625694413,
-        "narHash": "sha256-goRLk1I/OMclS9i17g932wyHyjiKI+htbuFIWIkzTbw=",
+        "lastModified": 1625909913,
+        "narHash": "sha256-ZP3RCGYwPDu4I5rwLYER2/d4aHFxiMTQ5Ioc89WRTow=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "06ee8ec8dfc4554c374052cd7b7083765748af99",
+        "rev": "9ed7a73ae23f0d905bd098c6ce71c50289d37928",
         "type": "github"
       },
       "original": {
diff --git a/home/default.nix b/home/default.nix
index 8bc4c25..241f9ea 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -287,12 +287,9 @@ in
 
       extraConfig = builtins.readFile ./nvim/init.vim;
       plugins = with pkgs.vimPlugins; [
-        coc-go
-        coc-json
-        coc-nvim
-        coc-rls
         gruvbox
         nerdtree
+        nvim-lspconfig
         rust-vim
         supertab
         syntastic
diff --git a/home/nvim/init.vim b/home/nvim/init.vim
index 4783bd7..f0830bc 100644
--- a/home/nvim/init.vim
+++ b/home/nvim/init.vim
@@ -132,4 +132,14 @@ autocmd FileType java setlocal omnifunc=javacomplete#Complete
 " vim-prettier
 let g:prettier#autoformat = 1
 
+lua << EOF
+require'lspconfig'.bashls.setup{}
+require'lspconfig'.pyright.setup{}
+require'lspconfig'.rls.setup{}
+require'lspconfig'.rnix.setup{}
+require'lspconfig'.terraformls.setup{}
+require'lspconfig'.tflint.setup{}
+require'lspconfig'.yamlls.setup{}
+EOF
+
 source ~/.config/nvim/statusline.vim