From 470f87c1827b51169ed4f91cdbdfd48417bfff3d Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Thu, 31 Oct 2024 15:02:36 +1100 Subject: [PATCH] zsh: enable by default as zsh is the default shell on macOS Historically this was a footgun because users would not always have this enabled leading to `darwin-rebuild` and other programs not being found. --- modules/examples/flake/flake.nix | 3 +-- modules/examples/simple.nix | 3 +-- modules/programs/zsh/default.nix | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix index 94c600ed..e6eaefc7 100644 --- a/modules/examples/flake/flake.nix +++ b/modules/examples/flake/flake.nix @@ -23,8 +23,7 @@ # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; - # Create /etc/zshrc that loads the nix-darwin environment. - programs.zsh.enable = true; # default shell on catalina + # Enable alternative shell support in nix-darwin. # programs.fish.enable = true; # Set Git commit hash for darwin-version. diff --git a/modules/examples/simple.nix b/modules/examples/simple.nix index 1133da82..5baf009f 100644 --- a/modules/examples/simple.nix +++ b/modules/examples/simple.nix @@ -15,8 +15,7 @@ # services.nix-daemon.enable = true; # nix.package = pkgs.nix; - # Create /etc/zshrc that loads the nix-darwin environment. - programs.zsh.enable = true; # default shell on catalina + # Enable alternative shell support in nix-darwin. # programs.fish.enable = true; # Used for backwards compatibility, please read the changelog before changing. diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix index bfbfc59e..1665fcd8 100644 --- a/modules/programs/zsh/default.nix +++ b/modules/programs/zsh/default.nix @@ -18,7 +18,7 @@ in options = { programs.zsh.enable = mkOption { type = types.bool; - default = false; + default = true; description = "Whether to configure zsh as an interactive shell."; };