nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

colima: add kubectl to the service's $PATH

Browse source
This commit is contained in:
Vinicius Deolindo 2026-02-20 16:41:14 -03:00 • committed by Austin Horstman
parent 9c8b3cc2d5
commit f140aa04d7
7 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/services/colima.nix
View file

@ -62,6 +62,9 @@ in
bashPackage = lib.mkPackageOption pkgs "bashNonInteractive" {
extraDescription = "Used by colima's internal scripts.";
};
kubectlPackage = lib.mkPackageOption pkgs "kubectl" {
extraDescription = "Used by colima when kubernetes is enabled in the profile.";
};
profiles = lib.mkOption {
default = {
@ -285,6 +288,7 @@ in
cfg.coreutilsPackage
cfg.curlPackage
cfg.bashPackage
cfg.kubectlPackage
pkgs.darwin.DarwinTools
];
}
@ -331,6 +335,7 @@ in
cfg.coreutilsPackage
cfg.curlPackage
cfg.bashPackage
cfg.kubectlPackage
]
}"
]

4
tests/modules/services/colima/darwin/colima-default-config.nix
View file

@ -47,6 +47,10 @@
name = "bashNonInteractive";
outPath = "@bashNonInteractive@";
};
kubectlPackage = config.lib.test.mkStubPackage {
name = "kubectl";
outPath = "@kubectl@";
};
};
nmt.script = ''

2
tests/modules/services/colima/darwin/colima-docker-cli-expected.plist
View file

@ -11,7 +11,7 @@
<key>LIMA_HOME</key>
<string>/home/hm-user/.local/share/lima</string>
<key>PATH</key>
<string>@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@DarwinTools@/bin</string>
<string>@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@kubectl@/bin:@DarwinTools@/bin</string>
<key>XDG_CACHE_HOME</key>
<string>/home/hm-user/.cache</string>
</dict>

4
tests/modules/services/colima/darwin/colima-docker-cli.nix
View file

@ -54,6 +54,10 @@
name = "bashNonInteractive";
outPath = "@bashNonInteractive@";
};
kubectlPackage = config.lib.test.mkStubPackage {
name = "kubectl";
outPath = "@kubectl@";
};
};
nmt.script =

2
tests/modules/services/colima/darwin/expected-agent.plist
View file

@ -7,7 +7,7 @@
<key>COLIMA_HOME</key>
<string>/home/hm-user/.colima</string>
<key>PATH</key>
<string>@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@DarwinTools@/bin</string>
<string>@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@kubectl@/bin:@DarwinTools@/bin</string>
<key>XDG_CACHE_HOME</key>
<string>/home/hm-user/.cache</string>
</dict>

2
tests/modules/services/colima/linux/colima-docker-cli-expected.service
View file

@ -3,7 +3,7 @@ WantedBy=default.target
[Service]
Environment=COLIMA_HOME=/home/hm-user/.config/colima
Environment=PATH=@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin
Environment=PATH=@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@kubectl@/bin
Environment=LIMA_HOME=/home/hm-user/.local/share/lima
Environment=DOCKER_CONFIG=/home/hm-user/.config/docker
ExecStart=@colima@/bin/colima start default \

2
tests/modules/services/colima/linux/expected-service.service
View file

@ -3,7 +3,7 @@ WantedBy=default.target
[Service]
Environment=COLIMA_HOME=/home/hm-user/.colima
Environment=PATH=@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin
Environment=PATH=@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@kubectl@/bin
ExecStart=@colima@/bin/colima start default \
-f \
--activate=true \