From 36ac1b51da0c302ad0f6875fc5d2bce6e74a53be Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Mon, 5 Feb 2024 00:52:11 +0800 Subject: [PATCH] feat: darwin - proxy & README, update brew apps --- README.md | 13 ++++++++----- modules/darwin/apps.nix | 2 +- scripts/darwin_set_proxy.py | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9217dbea..8cfceec2 100644 --- a/README.md +++ b/README.md @@ -110,12 +110,15 @@ just i3 debug For macOS: ```bash -# deploy harmonica's configuration(macOS Intel) -just ha - # If you are deploying for the first time, -# enter a shell with essential packages available -# nix shell nixpkgs#just nixpkgs#git +# 1. install nix & homebrew manually. +# 2. prepare the deployment environment with essential packages available +nix-shell -p just nushell +# 3. comment home-manager's code in lib/macosSystem.nix to speed up the first deplyment. +# 4. comment out the proxy settings in scripts/darwin_set_proxy.py if the proxy is not ready yet. + +# 4. deploy harmonica's configuration(macOS Intel) +just ha # deploy fern's configuration(Apple Silicon) just fe diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix index 90770e1b..63cb5c28 100644 --- a/modules/darwin/apps.nix +++ b/modules/darwin/apps.nix @@ -104,7 +104,6 @@ in { QQ = 451108668; WeCom = 1189898970; # Wechat for Work TecentMetting = 1484048379; - NeteaseCloudMusic = 944848654; QQMusic = 595615424; }; @@ -167,6 +166,7 @@ in { # "reaper" # audio editor "sonic-pi" # music programming "tencent-lemon" # macOS cleaner + "neteasemusic" # music # Development "mitmproxy" # HTTP/HTTPS traffic inspector diff --git a/scripts/darwin_set_proxy.py b/scripts/darwin_set_proxy.py index cc3c0c2d..73ce8e97 100644 --- a/scripts/darwin_set_proxy.py +++ b/scripts/darwin_set_proxy.py @@ -14,7 +14,7 @@ from pathlib import Path NIX_DAEMON_PLIST = Path("/Library/LaunchDaemons/org.nixos.nix-daemon.plist") NIX_DAEMON_NAME = "org.nixos.nix-daemon" # http proxy provided by clash or other proxy tools -HTTP_PROXY = "http://127.0.0.1:7890" +HTTP_PROXY = "http://192.168.5.201:7890" pl = plistlib.loads(NIX_DAEMON_PLIST.read_bytes())