defaults/shell: add guards for pulling in fish and direnv
This commit is contained in:
parent
1c6a2788c4
commit
984baab731
1 changed files with 5 additions and 5 deletions
|
|
@ -48,8 +48,8 @@ in
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
# use Fish, the nicest shell :)
|
# use Fish, the nicest shell :)
|
||||||
programs.fish.enable = true;
|
programs.fish.enable = lib.mkIf config.nixowos.allowAddingPackages true;
|
||||||
users.defaultUserShell = pkgs.fish;
|
users.defaultUserShell = lib.mkIf config.nixowos.allowAddingPackages pkgs.fish;
|
||||||
# avoid generating caches (enabled by fish) due to slowdowns during nixos-rebuild
|
# avoid generating caches (enabled by fish) due to slowdowns during nixos-rebuild
|
||||||
# this may degrade autocompletion
|
# this may degrade autocompletion
|
||||||
documentation.man.generateCaches = false;
|
documentation.man.generateCaches = false;
|
||||||
|
|
@ -64,11 +64,11 @@ in
|
||||||
environment.systemPackages = lib.mkIf config.nixowos.allowAddingPackages cfg.extraPackages;
|
environment.systemPackages = lib.mkIf config.nixowos.allowAddingPackages cfg.extraPackages;
|
||||||
|
|
||||||
# enter dev env on cd
|
# enter dev env on cd
|
||||||
programs.direnv = lib.mkDefault {
|
programs.direnv = {
|
||||||
enable = true;
|
enable = lib.mkIf config.nixowos.allowAddingPackages (lib.mkDefault true);
|
||||||
# hide extra logging, that isn't particularly useful
|
# hide extra logging, that isn't particularly useful
|
||||||
# (for only using nix at least)
|
# (for only using nix at least)
|
||||||
settings.global.hide_env_diff = true;
|
settings.global.hide_env_diff = lib.mkDefault true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue