Use ZSH on all Linux hosts too

1 files changed, 45 insertions, 35 deletions

diff --git a/shared/nixos-and-darwin/common-shell-settings/default.nix b/shared/nixos-and-darwin/common-shell-settings/default.nix
index 982296d..1fcb05e 100644
--- a/shared/nixos-and-darwin/common-shell-settings/default.nix
+++ b/shared/nixos-and-darwin/common-shell-settings/default.nix
@@ -3,42 +3,52 @@
 #
 # NOTE: This lives under `shared/nixos-and-darwin`. The configuration in here
 # should be compatible with both nixos and nix-darwin!!
-{pkgs, ...}: {
-  # Set ZSH as the shell.
-  # https://nixos.wiki/wiki/Command_Shell#Changing_default_shelltrue
-  programs.zsh.enable = true;
-  environment.shells = [pkgs.zsh];
 
-  # Very basic system administration tools.
-  environment.systemPackages = with pkgs; [
-    curl
-    jq
-    moreutils
-    neovim
-    tree
-  ];
+{pkgs, lib, ...}:
 
-  # Aliases that are burned into my muscle memory.
-  environment.shellAliases = {
-    "mv" = "mv -i";
-    "rm" = "rm -i";
-    "cp" = "cp -i";
-    "ls" = "ls -F -G -A --color=auto";
-    "grep" = "grep --color=auto";
-    "file" = "file --no-dereference";
-    "tree" = "tree --dirsfirst --gitignore";
+lib.mkMerge [
+  {
+    # Set ZSH as the shell.
+    # https://nixos.wiki/wiki/Command_Shell#Changing_default_shelltrue
+    programs.zsh.enable = true;
+    environment.shells = [pkgs.zsh];
 
-    # See: https://github.com/NixOS/nix/issues/5858
-    "nix" = "nix --print-build-logs";
+    # Very basic system administration tools.
+    environment.systemPackages = with pkgs; [
+      curl
+      jq
+      moreutils
+      neovim
+      tree
+    ];
 
-    ".." = "cd ../";
-    "..." = "cd ../../";
-    "...." = "cd ../../../";
-    "....." = "cd ../../../../";
-    "......" = "cd ../../../../../";
-    "......." = "cd ../../../../../../";
-    "........" = "cd ../../../../../../../";
-    "........." = "cd ../../../../../../../../";
-    ".........." = "cd ../../../../../../../../../";
-  };
-}
+    # Aliases that are burned into my muscle memory.
+    environment.shellAliases = {
+      "mv" = "mv -i";
+      "rm" = "rm -i";
+      "cp" = "cp -i";
+      "ls" = "ls -F -G -A --color=auto";
+      "grep" = "grep --color=auto";
+      "file" = "file --no-dereference";
+      "tree" = "tree --dirsfirst --gitignore";
+
+      # See: https://github.com/NixOS/nix/issues/5858
+      "nix" = "nix --print-build-logs";
+
+      ".." = "cd ../";
+      "..." = "cd ../../";
+      "...." = "cd ../../../";
+      "....." = "cd ../../../../";
+      "......" = "cd ../../../../../";
+      "......." = "cd ../../../../../../";
+      "........" = "cd ../../../../../../../";
+      "........." = "cd ../../../../../../../../";
+      ".........." = "cd ../../../../../../../../../";
+    };
+  }
+  (lib.mkIf pkgs.stdenv.isLinux {
+    # There is not nix-darwin equivalent to this NixOS option.
+    # The default shell on MacOS is already ZSH.
+    users.defaultUserShell = pkgs.zsh;
+  })
+]