mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-03-20 00:24:28 +01:00
fix(darwin): nix-darwin - activation option & zsh option
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
export PATH="$PATH:/opt/homebrew/bin:/usr/local/bin"
|
||||
'';
|
||||
# copied from the content generated by `conda init bash`
|
||||
initExtra = ''
|
||||
initContent = ''
|
||||
arch=$(uname -m)
|
||||
|
||||
if [ "aarch64" = "$arch" ] || [ "arm64" = "$arch" ]; then
|
||||
@@ -28,10 +28,10 @@ in {
|
||||
# in /opt/homebrew for Apple Silicon and /usr/local for Rosetta 2 to coexist and use bottles.
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
bashrcExtra = lib.mkAfter (envExtra + initExtra);
|
||||
bashrcExtra = lib.mkAfter (envExtra + initContent);
|
||||
};
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
inherit envExtra initExtra;
|
||||
inherit envExtra initContent;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{pkgs, ...}:
|
||||
{pkgs, myvars, ...}:
|
||||
###################################################################################
|
||||
#
|
||||
# macOS's System configuration
|
||||
@@ -22,12 +22,7 @@
|
||||
time.timeZone = "Asia/Shanghai";
|
||||
|
||||
system = {
|
||||
# activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`.
|
||||
activationScripts.postUserActivation.text = ''
|
||||
# activateSettings -u will reload the settings from the database and apply them to the current session,
|
||||
# so we do not need to logout and login again to make the changes take effect.
|
||||
/System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
|
||||
'';
|
||||
primaryUser = myvars.username;
|
||||
|
||||
defaults = {
|
||||
menuExtraClock.Show24Hour = true; # show 24 hour clock
|
||||
|
||||
Reference in New Issue
Block a user