diff --git a/home/darwin/default.nix b/home/darwin/default.nix index 2c6bd1b3..ae635910 100644 --- a/home/darwin/default.nix +++ b/home/darwin/default.nix @@ -6,7 +6,6 @@ ./alacritty ./core.nix - ./nushell.nix ]; # Home Manager needs a bit of information about you and the diff --git a/home/darwin/nushell.nix b/home/darwin/nushell.nix deleted file mode 100644 index ea49671b..00000000 --- a/home/darwin/nushell.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ ... }: { - # nushell's PATH do not include nix-darwin's PATH - # this is a workaround to add nix-darwin's PATH to nushell's PATH - programs.nushell.extraConfig = '' - let-env PATH = ([ - - "~/.nix-profile/bin" - "/etc/profiles/per-user/admin/bin" - "/run/current-system/sw/bin" - "/nix/var/nix/profiles/default/bin" - - ($env.PATH | split row (char esep)) - ] | flatten) - ''; -} \ No newline at end of file diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix index 67ebe77e..9d157166 100644 --- a/modules/darwin/apps.nix +++ b/modules/darwin/apps.nix @@ -48,6 +48,7 @@ brews = [ # `brew install` "httpie" + "wireguard-tools" ]; # `brew install --cask` @@ -59,6 +60,13 @@ "telegram" "discord" + "wechat" + "qq" + "neteasemusic" + "qqmusic" + "microsoft-remote-desktop" + "wechatwork" + "tencent-meeting" # "anki" "clashx" @@ -67,8 +75,9 @@ "syncthing" "raycast" "iglance" + "eudic" + # "reaper" - "iterm2" "insomnia" "wireshark" "jdk-mission-control" diff --git a/modules/darwin/core.nix b/modules/darwin/core.nix index 11f00d19..7f6de620 100644 --- a/modules/darwin/core.nix +++ b/modules/darwin/core.nix @@ -1,5 +1,5 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { ################################################################################### # @@ -72,10 +72,10 @@ home = "/Users/admin"; description = "admin"; - # set user's default shell to nushell - # this may not work, to change the default shell manually, use - # `chsh -s /run/current-system/sw/bin/nu` - shell = pkgs.nushell; + # set user's default shell back to zsh + # `chsh -s /bin/zsh` + # DO NOT change the system's default shell to nushell! it will break some apps! + # It's better to change only starship/alacritty/vscode's shell to nushell! }; # Create /etc/zshrc that loads the nix-darwin environment.