From e790af5945e38ab65fb75c105ad292b8da440d34 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 22 Oct 2019 14:08:30 +0200
Subject: Simplify gcloud completion setup

---
 user/settings/zsh.nix       | 2 ++
 user/zsh/.config/zsh/.zshrc | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/user/settings/zsh.nix b/user/settings/zsh.nix
index a2c14586..5966928d 100644
--- a/user/settings/zsh.nix
+++ b/user/settings/zsh.nix
@@ -268,6 +268,8 @@ in
 
       source ${pkgs.fzf}/share/fzf/key-bindings.zsh
 
+      source ${pkgs.google-cloud-sdk}/google-cloud-sdk/completion.zsh.inc
+
     '' + builtins.readFile ../zsh/.config/zsh/.zshrc;
   };
 }
diff --git a/user/zsh/.config/zsh/.zshrc b/user/zsh/.config/zsh/.zshrc
index fdc6b108..f20c3825 100644
--- a/user/zsh/.config/zsh/.zshrc
+++ b/user/zsh/.config/zsh/.zshrc
@@ -68,13 +68,6 @@ zstyle ':completion:*' completer _expand _complete _match
 
 # Plugins
 
-if [[ -n $commands[gcloud] ]]
-then
-   autoload bashcompinit
-   bashcompinit
-   source ${$(readlink =gcloud):h}/../etc/bash_completion.d/gcloud.inc
-fi
-
 if [[ -n $commands[helm] ]]
 then
   autoload _helm
-- 
cgit 1.4.1