From 155e675fe9f8d9c4aaee463afda16971e3a2c0bc Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Thu, 11 Jun 2020 14:08:47 -0400
Subject: [PATCH] Update awscli v2 nix overlay (#13)

---
 .config/nixpkgs/home.nix             |  6 ++++--
 .config/nixpkgs/overlays/awscli2.nix | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.config/nixpkgs/home.nix b/.config/nixpkgs/home.nix
index 2467fb2..be67a20 100644
--- a/.config/nixpkgs/home.nix
+++ b/.config/nixpkgs/home.nix
@@ -48,7 +48,7 @@
     zathura
     zip
     zsh-autosuggestions
-    zsh-fast-syntax-highlighting
+    zsh-syntax-highlighting
   ];
 
   programs.zsh = {
@@ -73,6 +73,8 @@
       eval "$(direnv hook zsh)"
       eval "$(_RFD_COMPLETE=source_zsh rfd)"
       eval "$(starship init zsh)"
+
+      source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
     '';
 
     shellAliases = {
@@ -93,7 +95,7 @@
 
     plugins = [
       {
-        name = "fast-syntax-highlighting";
+        name = "syntax-highlighting";
         src = "${pkgs.zsh-fast-syntax-highlighting}/share/zsh/site-functions";
       }
     ];
diff --git a/.config/nixpkgs/overlays/awscli2.nix b/.config/nixpkgs/overlays/awscli2.nix
index dba6c19..77d344c 100644
--- a/.config/nixpkgs/overlays/awscli2.nix
+++ b/.config/nixpkgs/overlays/awscli2.nix
@@ -3,12 +3,12 @@ rec {
   python3 = with super; super.python3.override {
     packageOverrides = self: super: {
       botocore = super.botocore.overridePythonAttrs (oldAttrs: rec {
-        version = "2.0.0dev19";
+        version = "2.0.0dev25";
         src = fetchFromGitHub {
           owner = "boto";
           repo = "botocore";
-          rev = "ce7b76d296b345d7647f50557606947ad857a786";
-          sha256 = "0g9pvcs94v2znjkzzjnz30021q9bm97fxmlhxvql6im3c6adrqb3";
+          rev = "bf9a885fa0bc0bba0c3c806eeeb60d9ad5f3e069";
+          sha256 = "1llshaxpnz9a7mw4kkz9msdgkzz3in5ws3rvd7l077ghj9jkfz9a";
         };
       });
       prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec {
@@ -25,13 +25,13 @@ rec {
 
   awscli2 = with self; pythonPackages.buildPythonApplication rec {
     pname = "awscli";
-    version = "2.0.15"; # N.B: if you change this, change botocore to a matching version too
+    version = "2.0.21"; # N.B: if you change this, change botocore to a matching version too
 
     src = fetchFromGitHub {
       owner = "aws";
       repo = "aws-cli";
       rev = version;
-      sha256 = "030pw7aa1y13awrpwlsq3ib633fh1z4rzkz8b31x7jg7s1hxrsvr";
+      sha256 = "1lxkdjsl3w9c621byy3gggadhfrw8xcw37x3xci9qszxqc10b467";
     };
 
     postPatch = ''