summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2019-10-22 14:08:30 +0200
committerAlan Pearce2019-10-23 11:59:54 +0200
commite790af5945e38ab65fb75c105ad292b8da440d34 (patch)
treeeaec0ad0eb0d9e08aeca0a172a7e98a74f9dec6f
parent29ad3be5d41963493ab36341cb6a058099757535 (diff)
downloadnixfiles-e790af5945e38ab65fb75c105ad292b8da440d34.tar.lz
nixfiles-e790af5945e38ab65fb75c105ad292b8da440d34.tar.zst
nixfiles-e790af5945e38ab65fb75c105ad292b8da440d34.zip
Simplify gcloud completion setup
-rw-r--r--user/settings/zsh.nix2
-rw-r--r--user/zsh/.config/zsh/.zshrc7
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