Skip to content

Commit 61bd7cc

Browse files
committed
nix develop: add tools + clean up
added to default shell: - nix-du - nix-tree - nix-eval-jobs - nix-output-monitor
1 parent 94a0732 commit 61bd7cc

1 file changed

Lines changed: 30 additions & 17 deletions

File tree

flake.nix

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -355,30 +355,43 @@
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 = [
364+
pkgs.colmenaPkg
373365
pkgs.git
374366
pkgs.openssh
375367
pkgs.wol
376368
pkgs.nixfmt-tree
377369
pkgs.nix-fast-build
378-
colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena
379370
];
380-
};
381-
});
371+
in
372+
{
373+
# for development/debugging
374+
default = pkgs.mkShell {
375+
packages =
376+
# explicitly use pkgs so it doesnt collide with flake inputs
377+
[
378+
pkgs.age
379+
pkgs.agenix-rekey
380+
pkgs.age-plugin-fido2-hmac
381+
pkgs.nix-du
382+
pkgs.nix-tree
383+
pkgs.nix-eval-jobs
384+
pkgs.nix-output-monitor
385+
]
386+
++ deployPkgs;
387+
};
388+
389+
# for ci/cd
390+
deploy = pkgs.mkShell {
391+
packages = deployPkgs;
392+
};
393+
}
394+
);
382395

383396
nixosConfigurations = builtins.mapAttrs (
384397
host: colmenaConfig:

0 commit comments

Comments
 (0)