summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hoang <enzime@users.noreply.github.com>2024-10-31 15:02:36 +1100
committerMichael Hoang <enzime@users.noreply.github.com>2024-10-31 15:09:11 +1100
commit470f87c1827b51169ed4f91cdbdfd48417bfff3d (patch)
treed4b9a3521ccd7e41c961ed568a0f29a4c2edea17
parentb379bd4d872d159e5189053ce9a4adf86d56db4b (diff)
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.
-rw-r--r--modules/examples/flake/flake.nix3
-rw-r--r--modules/examples/simple.nix3
-rw-r--r--modules/programs/zsh/default.nix2
3 files changed, 3 insertions, 5 deletions
diff --git a/modules/examples/flake/flake.nix b/modules/examples/flake/flake.nix
index 94c600e..e6eaefc 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 1133da8..5baf009 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 bfbfc59..1665fcd 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.";
};