chore(3p/nixpkgs): Bump channels to 2021-09-20

Included fixes:

* grfn/mugwump: removed superfluous Buildkite agent user
* tazjin/camden: Disabled bitlbee (user config is broken)
* grfn/home/vim: vimUtils expects a `pname`
* 3p/nixpkgs: Pick awscli2 from stable channel

Change-Id: I64ed726b3350f75c7a8a0e6552bcf1d8d9ba7d46

third_party/nixpkgs/default.nix

@@ -13,16 +13,16 @@ let
   # nixos-unstable, and the current stable channel of the latest NixOS
   # release.
 
-  # Tracking nixos-unstable as of 2021-09-11.
+  # Tracking nixos-unstable as of 2021-09-20.
   unstableHashes = {
-    commit = "bbbe2b35f736d039884e082ecc6d6e631e126029";
-    sha256 = "09356lp9r1wx311ak6d94bx35xnvj8cabvwqirklylql8q7f52lc";
+    commit = "bc9b956714ed6eac5f8888322aac5bc41389defa";
+    sha256 = "1wbd66h3hszlmdh0mpj0a51jk580aq2xal30wc0lgk78s6sf0rw7";
   };
 
-  # Tracking nixos-21.05 as of 2021-09-11.
+  # Tracking nixos-21.05 as of 2021-09-20.
   stableHashes = {
-    commit = "8b0b81dab17753ab344a44c04be90a61dc55badf";
-    sha256 = "0rj17jpjxjcibcd4qygpxbq79m4px6b35nqq9353pns8w7a984xx";
+    commit = "6120ac5cd201f6cb593d1b80e861be0342495be9";
+    sha256 = "04mrjxr1qsdcgcryx7yy72cgcw14c0770gfcgzrdfpnvmjdgbi9i";
   };
 
   # import the nixos-unstable package set, or optionally use the
@@ -47,7 +47,8 @@ let
   # Overlay for packages that should come from the stable channel
   # instead (e.g. because something is broken in unstable).
   stableOverlay = self: super: {
-    # nothing picked from stable currently
+    # awscli2 broken in unstable (nixpkgs#138470)
+    awscli2 = stableNixpkgs.awscli2;
   };
 
   # Overlay to expose the nixpkgs commits we are using to other Nix code.

users/grfn/system/home/modules/vim.nix

@@ -16,7 +16,8 @@
       # vim-colors-solarized
       # solarized
       (pkgs.vimUtils.buildVimPlugin {
-        name = "vim-colors-solarized";
+        pname = "vim-colors-solarized";
+        version = "git";
         src = pkgs.fetchFromGitHub {
           owner = "glittershark";
           repo = "vim-colors-solarized";

users/grfn/system/system/machines/mugwump.nix

@@ -248,8 +248,4 @@ with lib;
     isSystemUser = true;
     extraGroups = [ "docker" ];
   };
-  users.users."buildkite-agent-mugwump-2" = {
-    isSystemUser = true;
-    extraGroups = [ "docker" ];
-  };
 }

users/tazjin/nixos/camden/default.nix

@@ -235,7 +235,7 @@ in lib.fix(self: {
   };
 
   services.bitlbee = {
-    enable = true;
+    enable = false;
     portNumber = 2337; # bees
   };