From f8d9432295f5fe85a480b39d931658ea7b979dc8 Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Tue, 18 Oct 2022 23:50:59 -0400
Subject: [PATCH] Add vscode and fix nvim config

---
 home/default.nix       | 16 ++++++----------
 home/nvim/lua/init.lua |  2 +-
 packages/common.nix    |  3 ---
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index f0e5d53..79b563e 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -392,20 +392,16 @@ in {
         vim-surround
       ];
     };
+
+    vscode = {
+      enable = true;
+      extensions = with pkgs.vscode-extensions;
+        [] ++ lib.optionals stdenv.isLinux [ms-vsliveshare.vsliveshare];
+    };
   };
 
   home.file.".config/nvim/lua".source = ./nvim/lua;
   home.file.".config/srv".source = ./srv;
 
   home.file."..aws/config".source = ./.aws/config;
-
-  # https://github.com/foucault/nvfancontrol#use-and-configure
-  home.file.".config/nvfancontrol.conf".text = ''
-    25    45
-    45    50
-    50    60
-    60    75
-    70    80
-    80    90
-  '';
 }
diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua
index 4fea520..4c34c1e 100644
--- a/home/nvim/lua/init.lua
+++ b/home/nvim/lua/init.lua
@@ -167,7 +167,7 @@ cmp.setup {
 
 local lspconfig = require "lspconfig"
 
-local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
+local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
 
 lspconfig.ansiblels.setup({
   capabilities = capabilities,
diff --git a/packages/common.nix b/packages/common.nix
index 9512b15..ea12a69 100644
--- a/packages/common.nix
+++ b/packages/common.nix
@@ -27,9 +27,6 @@ in {
 
       # productivity
       bat
-      /*
-       checkov
-       */
       drone-cli
       exa
       fd