diff options
| author | seth <[email protected]> | 2024-09-20 13:09:50 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2024-09-20 13:13:22 -0400 |
| commit | f04eddf7fd7b070422611ebd90a3c17f15369ead (patch) | |
| tree | ed283dca304d8879c85da4f65e6602c471059422 /dev/dev-shells.nix | |
| parent | f742454914c94ab185eedcf8a0a94d194b04db78 (diff) | |
Revert "treewide: use lix-module for lix"
This reverts commit f77aeb0db935f60590aa5b6975857b528c8f6a51.
Diffstat (limited to 'dev/dev-shells.nix')
| -rw-r--r-- | dev/dev-shells.nix | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/dev/dev-shells.nix b/dev/dev-shells.nix index 211ddfd..9461970 100644 --- a/dev/dev-shells.nix +++ b/dev/dev-shells.nix @@ -7,36 +7,37 @@ self', ... }: + let + nixos-rebuild = pkgs.nixos-rebuild.override { nix = pkgs.lix; }; + darwin-rebuild = inputs'.nix-darwin.packages.darwin-rebuild.override { nix = pkgs.lix; }; + in { - devShells = { - default = pkgs.mkShellNoCC { - packages = - [ - # we want to make sure we have the same - # nix behavior across machines - pkgs.nix + devShells.default = pkgs.mkShellNoCC { + packages = + [ + # we want to make sure we have the same + # nix behavior across machines + pkgs.lix - # format + lint - pkgs.actionlint - self'.formatter - pkgs.nixfmt-rfc-style - pkgs.nil - pkgs.statix + # format + lint + pkgs.actionlint + self'.formatter + pkgs.nixfmt-rfc-style + pkgs.nil + pkgs.statix - # utils - pkgs.fzf # for just - pkgs.just + # utils + pkgs.fzf # for just + pkgs.just - # terranix - self'.packages.opentofu - ] - # see above comment about nix - ++ lib.optional pkgs.stdenv.isDarwin inputs'.nix-darwin.packages.darwin-rebuild - ++ lib.optionals pkgs.stdenv.isLinux [ - pkgs.nixos-rebuild # ditto - inputs'.agenix.packages.agenix - ]; - }; + # terranix + self'.packages.opentofu + ] + ++ lib.optional pkgs.stdenv.isDarwin darwin-rebuild # see above comment about {l,n}ix + ++ lib.optionals pkgs.stdenv.isLinux [ + nixos-rebuild # ditto + inputs'.agenix.packages.agenix + ]; }; }; } |