starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-04-24 01:38:28 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix(darwin): nix-darwin - activation option & zsh option

Browse Source
This commit is contained in:
Ryan Yin
2025-05-21 12:44:33 +08:00
parent 69e0572df1
commit 19faab32f7
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
home/darwin/shell.nix
View File

@@ -3,7 +3,7 @@
export PATH="$PATH:/opt/homebrew/bin:/usr/local/bin" export PATH="$PATH:/opt/homebrew/bin:/usr/local/bin"
''; '';
# copied from the content generated by `conda init bash` # copied from the content generated by `conda init bash`
initExtra = '' initContent = ''
arch=$(uname -m) arch=$(uname -m)
if [ "aarch64" = "$arch" ] || [ "arm64" = "$arch" ]; then 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. # in /opt/homebrew for Apple Silicon and /usr/local for Rosetta 2 to coexist and use bottles.
programs.bash = { programs.bash = {
enable = true; enable = true;
bashrcExtra = lib.mkAfter (envExtra + initExtra); bashrcExtra = lib.mkAfter (envExtra + initContent);
}; };
programs.zsh = { programs.zsh = {
enable = true; enable = true;
inherit envExtra initExtra; inherit envExtra initContent;
}; };
} }

9
modules/darwin/system.nix
View File

@@ -1,4 +1,4 @@
{pkgs, ...}: {pkgs, myvars, ...}:
################################################################################### ###################################################################################
# #
# macOS's System configuration # macOS's System configuration
@@ -22,12 +22,7 @@
time.timeZone = "Asia/Shanghai"; time.timeZone = "Asia/Shanghai";
system = { system = {
# activationScripts are executed every time you boot the system or run `nixos-rebuild` / `darwin-rebuild`. primaryUser = myvars.username;
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
'';
defaults = { defaults = {
menuExtraClock.Show24Hour = true; # show 24 hour clock menuExtraClock.Show24Hour = true; # show 24 hour clock