Skip to content

Commit aac80f8

Browse files
authored
add nix tools (#354)
* nix develop: add tools + clean up added to default shell: - nix-du - nix-tree - nix-eval-jobs - nix-output-monitor * cli/apps: add nix-tree, nix-eval-jobs, nix-fast-build * nix develop: use gssapi version of openssh this is more relevant to the default devShell, since deploy uses ssh keys. someone using nix develop may wish to use their kerberos ticket.
1 parent 776f5ec commit aac80f8

2 files changed

Lines changed: 36 additions & 19 deletions

File tree

flake.nix

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -355,30 +355,42 @@
355355
nixosConfigurations = self.colmenaHive.nodes;
356356
};
357357

358-
devShells = forAllSystems (pkgs: {
359-
default = pkgs.mkShell {
360-
packages = [
361-
pkgs.git
362-
pkgs.age
363-
pkgs.agenix-rekey
364-
pkgs.age-plugin-fido2-hmac
365-
pkgs.wol
366-
pkgs.nixfmt-tree
367-
pkgs.nix-fast-build
358+
devShells = forAllSystems (
359+
pkgs:
360+
let
361+
# explicitly use pkgs so it doesnt collide with flake inputs
362+
deployPkgs = [
368363
colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena
369-
];
370-
};
371-
deploy = pkgs.mkShell {
372-
packages = [
373364
pkgs.git
374-
pkgs.openssh
365+
pkgs.openssh_gssapi
375366
pkgs.wol
376367
pkgs.nixfmt-tree
377368
pkgs.nix-fast-build
378-
colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena
379369
];
380-
};
381-
});
370+
in
371+
{
372+
# for development/debugging
373+
default = pkgs.mkShell {
374+
packages =
375+
# explicitly use pkgs so it doesnt collide with flake inputs
376+
[
377+
pkgs.age
378+
pkgs.agenix-rekey
379+
pkgs.age-plugin-fido2-hmac
380+
pkgs.nix-du
381+
pkgs.nix-tree
382+
pkgs.nix-eval-jobs
383+
pkgs.nix-output-monitor
384+
]
385+
++ deployPkgs;
386+
};
387+
388+
# for ci/cd
389+
deploy = pkgs.mkShell {
390+
packages = deployPkgs;
391+
};
392+
}
393+
);
382394

383395
nixosConfigurations = builtins.mapAttrs (
384396
host: colmenaConfig:

modules/cli/apps.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,15 @@ in
9797
flex
9898
nasm
9999

100+
claude-code
101+
102+
# nix
100103
nix-du
104+
nix-tree
105+
nix-eval-jobs
101106
nix-output-monitor
107+
nix-fast-build
102108
devenv
103-
claude-code
104109

105110
# languages & runtimes
106111
graphviz

0 commit comments

Comments
 (0)