merge kubernetes.nix into devtools.nix

This commit is contained in:
Sean Buckley 2024-10-26 02:30:38 -04:00
parent a6dded78f8
commit e618ba481f
3 changed files with 13 additions and 13 deletions

View file

@ -1,7 +1,6 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
imports = [ imports = [
./kubernetes.nix
./powerline.nix ./powerline.nix
]; ];

View file

@ -1,18 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.bash.interactiveShellInit = ''
source <(kubectl completion bash)
complete -F __start_kubectl k
'';
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
kubectl
kubernetes-helm
stern
(google-cloud-sdk.withExtraComponents
[ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
# dedicated script, because bash aliases dont work with `watch` # dedicated script, because bash aliases dont work with `watch`
(writeShellScriptBin "k" "exec kubectl \"$@\"")
]; ];
} }

View file

@ -14,6 +14,8 @@ in
errcheck errcheck
go go
gopls gopls
kubectl
kubernetes-helm
lua-language-server lua-language-server
nil nil
nodePackages.prettier nodePackages.prettier
@ -23,8 +25,19 @@ in
rustc rustc
rustc.llvmPackages.lld rustc.llvmPackages.lld
rustfmt rustfmt
stern
vscode-langservers-extracted vscode-langservers-extracted
yaml-language-server yaml-language-server
# dedicated script, because bash aliases dont work with `watch`
(writeShellScriptBin "k" "exec kubectl \"$@\"")
(google-cloud-sdk.withExtraComponents
[ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
]; ];
programs.bash.interactiveShellInit = ''
source <(kubectl completion bash)
complete -F __start_kubectl k
'';
}; };
} }