From f5fc33abb93e058b943e5ef0dc8c8a3c02255804 Mon Sep 17 00:00:00 2001 From: Linnnus Date: Sat, 18 Jan 2025 13:14:31 +0100 Subject: Move NixOS-specific options from shared/{nixos-and-darwin => nixos} --- shared/nixos/common-nix-settings/default.nix | 10 ++++++++++ shared/nixos/common-shell-settings/default.nix | 14 ++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 shared/nixos/common-nix-settings/default.nix create mode 100644 shared/nixos/common-shell-settings/default.nix (limited to 'shared/nixos') diff --git a/shared/nixos/common-nix-settings/default.nix b/shared/nixos/common-nix-settings/default.nix new file mode 100644 index 0000000..a5e4fda --- /dev/null +++ b/shared/nixos/common-nix-settings/default.nix @@ -0,0 +1,10 @@ +# This module sets common settings related to Nix. Most of the logic is shared +# between NixOS and Darwin, and is found in `shared/nixos-and-darwin/common-nix-options/`. +{ + imports = [ + ../../nixos-and-darwin/common-nix-settings + ]; + + # There is not nix-darwin equivalent to this NixOS option. + nix.enable = true; +} diff --git a/shared/nixos/common-shell-settings/default.nix b/shared/nixos/common-shell-settings/default.nix new file mode 100644 index 0000000..ce3b52e --- /dev/null +++ b/shared/nixos/common-shell-settings/default.nix @@ -0,0 +1,14 @@ +# This module sets options to ensure a consistent Baseline Shell Experince™ +# across the entire fleet. +# +# Most of the heavy lifting is done in `shared/nixos-and-darwin/common-shell-settings`. +# This module is limited to NixOS-specific settings. +{pkgs, ...}: { + imports = [ + ../../nixos-and-darwin/common-shell-settings + ]; + + # There is not nix-darwin equivalent to this NixOS option. + # The default shell on MacOS is already ZSH. + users.defaultUserShell = pkgs.zsh; +} -- cgit v1.2.3