From c820c191fdfc3d1dc47ad22973f0053049106f07 Mon Sep 17 00:00:00 2001
From: buffet <dev@buffet.sh>
Date: Fri, 2 Dec 2022 16:55:53 +0000
Subject: [PATCH] chore: update to 22.11

---
 flake.lock        | 40 ++++++++++++++++++++++++++++------------
 flake.nix         |  4 ++--
 programs/nvim.nix | 11 ++++++-----
 system.nix        |  6 ++++--
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 51f31b5..2d9c3a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,19 +56,20 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1667907331,
-        "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
+        "lastModified": 1669724862,
+        "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
+        "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.05",
+        "ref": "release-22.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -106,27 +107,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1669418739,
-        "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=",
+        "lastModified": 1669834992,
+        "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "695b3515251873e0a7e2021add4bba643c56cde3",
+        "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.05",
+        "ref": "nixos-22.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nur": {
       "locked": {
-        "lastModified": 1669616578,
-        "narHash": "sha256-uwecFtN1CMoUEaIKiGxK1t6h7RZUtZn5gmcInoptSl8=",
+        "lastModified": 1669805596,
+        "narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "1d081971f9b7ae7f902628e30c7c6e58c3c4e8d6",
+        "rev": "c81b1e527f3a220abfa9bf8096153d52784c5007",
         "type": "github"
       },
       "original": {
@@ -146,6 +147,21 @@
         "nixpkgs": "nixpkgs",
         "nur": "nur"
       }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 97b9f96..0f4442d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     impermanence.url = "github:nix-community/impermanence";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
     nur.url = "github:nix-community/NUR";
 
     agenix = {
@@ -20,7 +20,7 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-22.05";
+      url = "github:nix-community/home-manager/release-22.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/programs/nvim.nix b/programs/nvim.nix
index cc94026..d2a2b1a 100644
--- a/programs/nvim.nix
+++ b/programs/nvim.nix
@@ -13,10 +13,11 @@
     in {
       enable = true;
       plugins = let
-        buildPlugin = name:
-          pkgs.vimUtils.buildNeovimPluginFrom2Nix {
-            inherit name;
-            src = inputs."${name}";
+        buildPlugin = pname:
+          pkgs.vimUtils.buildVimPluginFrom2Nix {
+            inherit pname;
+            version = "unknown";
+            src = inputs."${pname}";
           };
         buildPlugins = names: lib.attrsets.genAttrs names buildPlugin;
         plugins = buildPlugins [
@@ -225,7 +226,7 @@
             in ''
               lua <<EOF
                 local lspconfig = require 'lspconfig'
-                local caps = require 'cmp_nvim_lsp'.update_capabilities(
+                local caps = require 'cmp_nvim_lsp'.default_capabilities(
                   vim.lsp.protocol.make_client_capabilities()
                 )
                 ${serverConfigs}
diff --git a/system.nix b/system.nix
index cf0e1ef..132902d 100644
--- a/system.nix
+++ b/system.nix
@@ -34,9 +34,11 @@
   };
 
   nix = {
-    autoOptimiseStore = true;
-    trustedUsers = ["root" "buffet"];
     registry.nixpkgs.flake = nixpkgs;
+    settings = {
+      auto-optimise-store = true;
+      trusted-users = ["root" "buffet"];
+    };
 
     gc = {
       automatic = true;